cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- fix a possible deadlock, from gnome svn

Browse Source 
ok ajacoutot@ mbalmer@
This commit is contained in:
jasper 2008-02-14 12:39:15 +00:00
parent 5186acea2b
commit 7c12499275
2 changed files with 54 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
x11/gnome/keyring/Makefile
View File

@ -1,11 +1,11 @@
# $OpenBSD: Makefile,v 1.21 2008/02/04 17:55:18 jasper Exp $
# $OpenBSD: Makefile,v 1.22 2008/02/14 12:39:15 jasper Exp $
COMMENT= password agent for the GNOME project
GNOME_PROJECT= gnome-keyring
GNOME_VERSION= 2.21.5
SHARED_LIBS += gnome-keyring 3.0 # .1.1
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
# GPL/LGPL
PERMIT_PACKAGE_CDROM= Yes

52
x11/gnome/keyring/patches/patch-common_gkr-async_c Normal file
View File

@ -0,0 +1,52 @@
$OpenBSD: patch-common_gkr-async_c,v 1.1 2008/02/14 12:39:15 jasper Exp $
--- common/gkr-async.c.orig Thu Feb 14 00:03:24 2008
+++ common/gkr-async.c Thu Feb 14 00:16:53 2008
@@ -34,6 +34,11 @@
#define DEBUG_LOCKS 0
+/*
+ * See comments on async_poll_func() on the order of the various
+ * gets and sets of waiting_on_* flags.
+ */
+
#if DEBUG_LOCKS
#define DO_LOCK(mtx) G_STMT_START { \
g_printerr ("%s LOCK %s\n", __func__, G_STRINGIFY(mtx)); \
@@ -93,8 +98,20 @@ async_poll_func (GPollFD *ufds, guint nfsd, gint timeo
gint ret;
g_assert (orig_poll_func);
+
+ /*
+ * These two atomic variables are interlocked in the
+ * opposite order from those in DO_LOCK which prevents
+ * race conditions in the if statements.
+ */
g_atomic_int_set (&waiting_on_poll, 1);
+
+ if (g_atomic_int_get (&waiting_on_lock))
+
+ timeout = 0;
+
ret = (orig_poll_func) (ufds, nfsd, timeout);
+
g_atomic_int_set (&waiting_on_poll, 0);
if (done_queue && !g_queue_is_empty (done_queue))
@@ -314,7 +331,6 @@ cleanup_done_thread (gpointer message, gpointer data)
running_workers = NULL;
g_assert (main_loop);
- gkr_wakeup_register (g_main_loop_get_context (main_loop));
return FALSE;
}
@@ -346,7 +362,6 @@ gkr_async_worker_start (GThreadFunc func, GkrAsyncWork
if (!done_queue) {
g_assert (main_loop);
- gkr_wakeup_register (g_main_loop_get_context (main_loop));
done_queue = g_queue_new ();
g_assert (!running_workers);