Merge lp:~mhr3/libunity/use-owned-models into lp:libunity

[Michal Hruby]

Switches the lenses to use leader-writable-only models.

This should prevent the crashes in lenses we are seeing from time to time.

The change in libunity is minor, current tests still pass and tests in dee make sure this works as expected. UNBLOCK

[lp:~mhr3/libunity/use-owned-models]

124. By Michal Hruby on 2012-02-28

Add a few comments explaining the dark magic

[Mikkel Kamstrup Erlandsen (kamstrup)]

Tried to do a lot of restarts of both unity and the apps lens without being able to reproduce the crasher (I could before on a stock system). Looks good!

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2012-02-24 09:30:13 +0000
+++ configure.ac	2012-02-28 15:06:17 +0000
@@ -133,7 +133,7 @@
 PKG_CHECK_MODULES(GIO2, [gio-2.0 >= $GLIB_REQUIRED ])
 PKG_CHECK_MODULES(GIO_UNIX2, [gio-unix-2.0])
 PKG_CHECK_MODULES(GEE, [gee-1.0 >= 0.6.0])
-PKG_CHECK_MODULES(DEE, [dee-1.0 >= 0.9.0])
+PKG_CHECK_MODULES(DEE, [dee-1.0 >= 1.0.4])
 PKG_CHECK_MODULES(DBUSMENU, [dbusmenu-glib-0.4 >= 0.3.93])
 
 LIBUNITY_CFLAGS="$GLIB2_CFLAGS $GOBJECT2_CFLAGS $GIO2_CFLAGS $GIO_UNIX2_CFLAGS $GEE_CFLAGS $DEE_CFLAGS $DBUSMENU_CFLAGS"

=== modified file 'src/unity-lens-private.vala'
--- src/unity-lens-private.vala	2012-01-31 18:24:51 +0000
+++ src/unity-lens-private.vala	2012-02-28 15:06:17 +0000
@@ -88,22 +88,40 @@
      * old instances, or Unity itself, from stopping the models we create be the
      * swarm leaders
      */
-    uint t = (uint)time_t ();
-    return "com.canonical.Unity.Lens" + "." + _owner.id + ".T%u".printf (t);
+    TimeVal tv = TimeVal ();
+    int64 milli = tv.tv_sec;
+    milli = milli * 1000 + tv.tv_usec / 1000;
+    return ("com.canonical.Unity.Lens.%s.T%" + int64.FORMAT + "").printf (
+      _owner.id, milli);
+  }
+
+  private Dee.SharedModel create_master_model (string swarm_name)
+  {
+    /* Create a peer instance that tries to grab the swarm leadership */
+    var peer = Object.@new (typeof (Dee.Peer),
+                            "swarm-name", swarm_name,
+                            "swarm-owner", true, null) as Dee.Peer;
+    /* This will create a SharedModel where only the leader can write to it */
+    var access_mode = Dee.SharedModelAccessMode.LEADER_WRITABLE;
+    return Object.@new (typeof (Dee.SharedModel),
+                        "peer", peer,
+                        "back-end", new Dee.SequenceModel (),
+                        "access-mode", access_mode, null) as Dee.SharedModel;
   }
 
   private void create_models (string dbus_name)
   {
     /* Schema definitions come from the Lens specification */
-    _results_model = new Dee.SharedModel (dbus_name + ".Results");
+    _results_model = create_master_model (dbus_name + ".Results");
     _results_model.set_schema ("s", "s", "u", "s", "s", "s", "s");
 
-    _global_results_model = new Dee.SharedModel (dbus_name + ".GlobalResults");
+    _global_results_model = create_master_model (dbus_name + ".GlobalResults");
     _global_results_model.set_schema ("s", "s", "u", "s", "s", "s", "s");
 
-    _categories_model = new Dee.SharedModel (dbus_name + ".Categories"); 
+    _categories_model = create_master_model (dbus_name + ".Categories");
     _categories_model.set_schema ("s", "s", "s", "a{sv}");
 
+    /* Filters are updated by unity, so we can't create a master model */
     _filters_model = new Dee.SharedModel (dbus_name + ".Filters");
     _filters_model.set_schema ("s", "s", "s", "s", "a{sv}", "b", "b", "b");
   }