Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=a0d9664ca7d175909d1a401eb840dcd061b35f05
commit a0d9664ca7d175909d1a401eb840dcd061b35f05 Author: Michel Hermier <[email protected]> Date: Thu Jun 5 20:06:03 2014 +0200 gamin-0.1.10-5-x86_64 * Add patch that should fix the deadlock visible in kde (for me). diff --git a/source/apps/gamin/18_gam_server_deadlocks.patch b/source/apps/gamin/18_gam_server_deadlocks.patch new file mode 100644 index 0000000..ef77496 --- /dev/null +++ b/source/apps/gamin/18_gam_server_deadlocks.patch @@ -0,0 +1,70 @@ +From cc14440eface093548cb3bc7814da11d9a99d283 Mon Sep 17 00:00:00 2001 +From: Anssi Hannula <[email protected]> +Date: Wed, 4 Jan 2012 00:23:55 +0200 +Subject: [PATCH] fix possible server deadlock in ih_sub_cancel + +ih_sub_foreach() calls ih_sub_cancel() while inotify_lock is locked. +However, ih_sub_cancel() locks it again, and locking GMutex recursively +causes undefined behaviour. + +Fix that by removing locking from ih_sub_cancel() as ih_sub_foreach() +is its only user. Also make the function static so that it won't +accidentally get used by other files without locking (inotify-helper.h +is an internal server header). + +This should fix the intermittent deadlocks I've been experiencing +causing KDE applications to no longer start, and probably also +http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361 + +Origin: http://bugzilla-attachments.gnome.org/attachment.cgi?id=204537 +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gamin/+bug/926862 +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=542361 + +--- + server/inotify-helper.c | 7 ++----- + server/inotify-helper.h | 1 - + 2 files changed, 2 insertions(+), 6 deletions(-) + +diff --git a/server/inotify-helper.c b/server/inotify-helper.c +index d77203e..0789fa4 100644 +--- a/server/inotify-helper.c ++++ b/server/inotify-helper.c +@@ -123,13 +123,11 @@ ih_sub_add (ih_sub_t * sub) + + /** + * Cancels a subscription which was being monitored. ++ * inotify_lock must be held when calling. + */ +-gboolean ++static gboolean + ih_sub_cancel (ih_sub_t * sub) + { +- G_LOCK(inotify_lock); +- +- + if (!sub->cancelled) + { + IH_W("cancelling %s\n", sub->pathname); +@@ -140,7 +138,6 @@ ih_sub_cancel (ih_sub_t * sub) + sub_list = g_list_remove (sub_list, sub); + } + +- G_UNLOCK(inotify_lock); + return TRUE; + } + +diff --git a/server/inotify-helper.h b/server/inotify-helper.h +index 5d3b6d0..d36b5fd 100644 +--- a/server/inotify-helper.h ++++ b/server/inotify-helper.h +@@ -34,7 +34,6 @@ gboolean ih_startup (event_callback_t ecb, + found_callback_t fcb); + gboolean ih_running (void); + gboolean ih_sub_add (ih_sub_t *sub); +-gboolean ih_sub_cancel (ih_sub_t *sub); + + /* Return FALSE from 'f' if the subscription should be cancelled */ + void ih_sub_foreach (void *callerdata, gboolean (*f)(ih_sub_t *sub, void *callerdata)); +-- +1.7.7.2 + diff --git a/source/apps/gamin/FrugalBuild b/source/apps/gamin/FrugalBuild index d7be425..7769249 100644 --- a/source/apps/gamin/FrugalBuild +++ b/source/apps/gamin/FrugalBuild @@ -4,7 +4,7 @@ pkgname=gamin pkgver=0.1.10 -pkgrel=4 +pkgrel=5 pkgdesc="Library providing the FAM File Alteration Monitor API" url="http://www.gnome.org/~veillard/gamin/"; depends=('glib2>=2.16.3') @@ -15,8 +15,11 @@ provides=('fam') options=('scriptlet') groups=('apps') archs=('i686' 'x86_64' 'arm') -up2date="lynx -dump 'http://www.gnome.org/~veillard/gamin/sources/?C=M;O=D'|grep tar.gz|sed -n 's/.*-\(.*\).tar.*/\1/;1 p'" -source=(http://www.gnome.org/~veillard/gamin/sources/$pkgname-$pkgver.tar.gz) +up2date="Flasttar 'http://www.gnome.org/~veillard/gamin/sources/'" +source=(http://www.gnome.org/~veillard/gamin/sources/$pkgname-$pkgver.tar.gz \ + 18_gam_server_deadlocks.patch) +sha1sums=('f4c6b9fe87757552ef58fef4abef9e42cd3142ac' \ + 'f98342b6f5322acf5b0202c296b57f1dfbcf6c68') build() { @@ -25,6 +28,5 @@ build() Fbuild --enable-docs --disable-dnotify --disable-debug Fdocrel doc/*.html } -sha1sums=('f4c6b9fe87757552ef58fef4abef9e42cd3142ac') # optimization OK _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
