Merge lp:~kamstrup/dee/commit-transaction-leaks into lp:dee

[Mikkel Kamstrup Erlandsen]

See bug description. I was able to reproduce the leak by making the dee master/slave example commit and clear 1000 rows each second which exacerbated the problem enough to make it very obvious.

With these fixes a 10min torture run as described does leak anything.

[Gord Allott (gordallott)]

looks good to me and works well :)

review: Approve

=== modified file 'dee/dee-shared-model.c'
--- dee/dee-shared-model.c	2011-03-06 09:42:20 +0000
+++ dee/dee-shared-model.c	2011-04-11 19:07:25 +0000
@@ -965,11 +965,10 @@
                   dee_peer_get_swarm_name (priv->swarm));
       g_variant_unref (transaction);
       return;
-    }
+    }  
 
+  /* If the model has no schema then use the one received in the transaction */
   schema = g_variant_iter_next_value (&iter);
-
-  /* If the model has no schema then use the one received in the transaction */
   n_cols = dee_model_get_n_columns (DEE_MODEL (self));
   if (n_cols == 0)
     {
@@ -979,16 +978,17 @@
           n_cols = column_schemas_len;
           dee_model_set_schema_full (DEE_MODEL(self), column_schemas, n_cols);
           g_free (column_schemas);
-          g_variant_unref (schema);
         }
       else
         {
           g_warning ("Received transaction before the model schema has been set"
                       " and none received from leader");
           g_variant_unref (transaction);
+          g_variant_unref (schema);
           return;
         }
     }
+  g_variant_unref (schema);
 
   /* Parse the rest of the transaction */
   aav = g_variant_iter_next_value (&iter);
@@ -1122,6 +1122,9 @@
   priv->suppress_remote_signals = FALSE;
 
   g_variant_unref (transaction);
+  g_variant_unref (aav);
+  g_variant_unref (au);
+  g_variant_unref (ay);
 
   dee_serializable_model_set_seqnum (DEE_MODEL (self), seqnum_after);
 }
@@ -1134,13 +1137,13 @@
   guint32                pos;
   GVariant             **row;
 
-  priv = DEE_SHARED_MODEL (self)->priv;
-
-  row_slice_size = dee_model_get_n_columns(self) * sizeof (gpointer);
-  row = g_slice_alloc (row_slice_size);
+  priv = DEE_SHARED_MODEL (self)->priv;  
 
   if (!priv->suppress_remote_signals)
     {
+      row_slice_size = dee_model_get_n_columns(self) * sizeof (gpointer);
+      row = g_slice_alloc (row_slice_size);
+      
       pos = dee_model_get_position (self, iter);
       enqueue_revision (self,
                         CHANGE_TYPE_ADD,
@@ -1177,13 +1180,13 @@
   gsize                  row_slice_size;
   GVariant             **row;
   
-  priv = DEE_SHARED_MODEL (self)->priv;
-
-  row_slice_size = dee_model_get_n_columns(self) * sizeof (gpointer);
-  row = g_slice_alloc (row_slice_size);
+  priv = DEE_SHARED_MODEL (self)->priv;  
 
   if (!priv->suppress_remote_signals)
     {
+      row_slice_size = dee_model_get_n_columns(self) * sizeof (gpointer);
+      row = g_slice_alloc (row_slice_size);
+      
       pos = dee_model_get_position (self, iter);
       enqueue_revision (self,
                         CHANGE_TYPE_CHANGE,