r36412 - in /desktop/unstable/gnome-shell/debian: changelog patches/30_lockup_gc.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Sun Dec  2 12:56:02 2012
New Revision: 36412

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=36412
Log:
30_lockup_gc.patch: backported from 3.6. Remove a forced garbage 
collection which triggers deadlocks. Closes: #683880.

Added:
    desktop/unstable/gnome-shell/debian/patches/30_lockup_gc.patch
Modified:
    desktop/unstable/gnome-shell/debian/changelog
    desktop/unstable/gnome-shell/debian/patches/series

Modified: desktop/unstable/gnome-shell/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/changelog?rev=36412&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/changelog [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/changelog [utf-8] Sun Dec  2 12:56:02 2012
@@ -1,3 +1,10 @@
+gnome-shell (3.4.2-4) unstable; urgency=low
+
+  * 30_lockup_gc.patch: backported from 3.6. Remove a forced garbage 
+    collection which triggers deadlocks. Closes: #683880.
+
+ -- Josselin Mouette <joss at debian.org>  Sun, 02 Dec 2012 13:55:57 +0100
+
 gnome-shell (3.4.2-3) unstable; urgency=low
 
   * Recommend unzip. Closes: #680978.

Added: desktop/unstable/gnome-shell/debian/patches/30_lockup_gc.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/30_lockup_gc.patch?rev=36412&op=file
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/30_lockup_gc.patch (added)
+++ desktop/unstable/gnome-shell/debian/patches/30_lockup_gc.patch [utf-8] Sun Dec  2 12:56:02 2012
@@ -1,0 +1,31 @@
+From 6f605598de1eb4361ef912e85edb27a8b7b96b21 Mon Sep 17 00:00:00 2001
+From: Cosimo Cecchi <cosimoc at gnome.org>
+Date: Fri, 13 Jul 2012 00:01:51 +0000
+Subject: global: don't run a garbage collection on tweeners end
+
+This currently causes the shell to freeze very often in a thread
+deadlock, and the gjs garbage collector behavior is currently getting
+fixed at the right level in gjs itself.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=679832
+---
+diff --git a/src/shell-global.c b/src/shell-global.c
+index bb32a01..28127ab 100644
+--- a/src/shell-global.c
++++ b/src/shell-global.c
+@@ -1482,13 +1482,6 @@ run_leisure_functions (gpointer data)
+   if (global->work_count > 0)
+     return FALSE;
+ 
+-  /* Previously we called gjs_maybe_gc().  However, it simply doesn't
+-   * trigger often enough.  Garbage collection is very fast here, so
+-   * let's just aggressively GC.  This will help avoid both heap
+-   * fragmentation, and the GC kicking in when we don't want it to.
+-   */
+-  gjs_context_gc (global->js_context);
+-
+   /* No leisure closures, so we are done */
+   if (global->leisure_closures == NULL)
+     return FALSE;
+--
+cgit v0.9.0.2

Modified: desktop/unstable/gnome-shell/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-shell/debian/patches/series?rev=36412&op=diff
==============================================================================
--- desktop/unstable/gnome-shell/debian/patches/series [utf-8] (original)
+++ desktop/unstable/gnome-shell/debian/patches/series [utf-8] Sun Dec  2 12:56:02 2012
@@ -9,5 +9,6 @@
 25-close-the-recorder-instead-of-pausing-it.patch
 26-networkAgent-use-absolute-path-if-configured.patch
 27-nm-libexec-path.patch
+30_lockup_gc.patch
 32-enable-the-screen-reader-menu-item.patch
 33-screen-reader-l10n.patch