Merge lp:~vanvugt/compiz/fix-1057263 into lp:compiz/0.9.8

[Daniel van Vugt]

Some decoration pixmaps get leaked on window resize, due to race conditions
between gtk-window-decorator and the decor plugin.

That's a complex problem which requires a better interprocess communication
and resource ownership design. So I'm not trying to fix that directly.

Instead, what this does is limits pixmap leaks to the lifetime of the frame
window. So if any leaks do occur, they will be cleaned up and freed next
time the window is minimized or closed. Or to garbage collect for all windows,
just hit Ctrl+Alt+D twice.

(LP: #1057263)

See commit message.

[jenkins (martin-mrazik+qa)]

FAILED: Continuous integration, rev:3399
http://jenkins.qa.ubuntu.com/job/compiz-ci/137/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/compiz-ci/./build=pbuilder,distribution=quantal,flavor=amd64/137/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

Approved because it makes sense but we should get to the bottom of this.

review: Approve

=== modified file 'gtk/window-decorator/decorator.c'
--- gtk/window-decorator/decorator.c	2012-09-05 12:56:31 +0000
+++ gtk/window-decorator/decorator.c	2012-09-27 09:12:24 +0000
@@ -686,7 +686,16 @@
 
     /* Destroy the old pixmaps and pictures */
     if (d->pixmap)
-	g_hash_table_insert (destroyed_pixmaps_table, GINT_TO_POINTER (GDK_PIXMAP_XID (d->pixmap)), d->pixmap);
+    {
+	gpointer key = GINT_TO_POINTER (GDK_PIXMAP_XID (d->pixmap));
+
+	if (d->old_pixmaps == NULL)
+	    d->old_pixmaps = g_hash_table_new_full (NULL, NULL, NULL,
+	                                            g_object_unref);
+
+	g_hash_table_insert (destroyed_pixmaps_table, key, d);
+	g_hash_table_insert (d->old_pixmaps, key, d->pixmap);
+    }
 
     if (d->buffer_pixmap)
 	g_object_unref (G_OBJECT (d->buffer_pixmap));

=== modified file 'gtk/window-decorator/events.c'
--- gtk/window-decorator/events.c	2012-08-28 04:45:17 +0000
+++ gtk/window-decorator/events.c	2012-09-27 09:12:24 +0000
@@ -1094,7 +1094,14 @@
 	}
 	else if (xevent->xclient.message_type == decor_delete_pixmap_atom)
 	{
-	    g_hash_table_remove (destroyed_pixmaps_table, GINT_TO_POINTER (xevent->xclient.data.l[0]));
+	    gconstpointer key = GINT_TO_POINTER (xevent->xclient.data.l[0]);
+	    decor_t *d = g_hash_table_lookup (destroyed_pixmaps_table, key);
+
+	    if (d != NULL)
+	    {
+		g_hash_table_remove (d->old_pixmaps, key);
+		g_hash_table_remove (destroyed_pixmaps_table, key);
+	    }
 	}
     default:
 	break;

=== modified file 'gtk/window-decorator/gtk-window-decorator.c'
--- gtk/window-decorator/gtk-window-decorator.c	2012-09-08 00:00:34 +0000
+++ gtk/window-decorator/gtk-window-decorator.c	2012-09-27 09:12:24 +0000
@@ -342,7 +342,7 @@
     xformat_rgb  = XRenderFindStandardFormat (xdisplay, PictStandardRGB24);
 
     frame_table = g_hash_table_new (NULL, NULL);
-    destroyed_pixmaps_table = g_hash_table_new_full (NULL, NULL, NULL, g_object_unref);
+    destroyed_pixmaps_table = g_hash_table_new (NULL, NULL);
 
     if (!create_tooltip_window ())
     {

=== modified file 'gtk/window-decorator/gtk-window-decorator.h'
--- gtk/window-decorator/gtk-window-decorator.h	2012-09-08 00:10:56 +0000
+++ gtk/window-decorator/gtk-window-decorator.h	2012-09-27 09:12:24 +0000
@@ -401,6 +401,7 @@
     GtkWidget         *decor_window;
     GtkWidget	      *decor_event_box;
     GtkWidget         *decor_image;
+    GHashTable        *old_pixmaps;
     cairo_t	      *cr;
     decor_layout_t    border_layout;
     decor_context_t   *context;

=== modified file 'gtk/window-decorator/wnck.c'
--- gtk/window-decorator/wnck.c	2012-09-26 11:36:12 +0000
+++ gtk/window-decorator/wnck.c	2012-09-27 09:12:24 +0000
@@ -497,6 +497,12 @@
 	d->buffer_pixmap = NULL;
     }
 
+    if (d->old_pixmaps)
+    {
+	g_hash_table_destroy (d->old_pixmaps);
+	d->old_pixmaps = NULL;
+    }
+
     if (d->cr)
     {
 	cairo_destroy (d->cr);