aboutsummaryrefslogtreecommitdiffstats
path: root/src/main_notify.c
diff options
context:
space:
mode:
authorMax Kellermann <max@duempel.org>2008-09-26 09:57:11 +0200
committerMax Kellermann <max@duempel.org>2008-09-26 09:57:11 +0200
commit58554e14f9995fdafe2338a69a42d9192b96f712 (patch)
tree83881d1e2131795581c822aa5cd01ddce42cf80f /src/main_notify.c
parent323e86489fb9544b3a2faa9e9004ac0b72bf01ca (diff)
downloadmpd-58554e14f9995fdafe2338a69a42d9192b96f712.tar.gz
mpd-58554e14f9995fdafe2338a69a42d9192b96f712.tar.xz
mpd-58554e14f9995fdafe2338a69a42d9192b96f712.zip
notify: protect notify->pending with the mutex
There was a known deadlocking bug in the notify library: when the other thread set notify->pending after the according check in notify_wait(), the latter thread was deadlocked. Resolve this by synchronizing all accesses to notify->pending with the notify object's mutex. Since notify_signal_sync() was never used, we can remove it. As a consequence, we don't need notify_enter() and notify_leave() anymore; eliminate them, too.
Diffstat (limited to '')
-rw-r--r--src/main_notify.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/src/main_notify.c b/src/main_notify.c
index 4e5b786a2..96fb374b5 100644
--- a/src/main_notify.c
+++ b/src/main_notify.c
@@ -115,8 +115,6 @@ void wait_main_task(void)
{
assert(pthread_equal(main_task, pthread_self()));
- notify_enter(&main_notify);
notify_wait(&main_notify);
- notify_leave(&main_notify);
}