diff options
author | Thiago Macieira <thiago@kde.org> | 2006-11-19 18:23:27 +0000 |
---|---|---|
committer | Thiago Macieira <thiago@kde.org> | 2006-11-19 18:23:27 +0000 |
commit | c0dbd2a2b5ce42612b1bffe778d6127682cddb45 (patch) | |
tree | a321b694d2fa35006adbc0e412cdc024293ac034 /dbus | |
parent | 6d9173ad11c6e83befd45a3e0dc9aa4f2815ece5 (diff) |
* dbus/dbus-sysdeps-pthread.c (_dbus_pthread_mutex_lock,
_dbus_pthread_condvar_wait,
_dbus_pthread_condvar_wait_timeout): set pmutex->holder to
pthread_self() after coming back from a conditional variable
wait as well as in one codepath where it was forgotten.
Approved by: Havoc Pennington.
Diffstat (limited to 'dbus')
-rw-r--r-- | dbus/dbus-sysdeps-pthread.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/dbus/dbus-sysdeps-pthread.c b/dbus/dbus-sysdeps-pthread.c index 2f33b1c4..55d3ea28 100644 --- a/dbus/dbus-sysdeps-pthread.c +++ b/dbus/dbus-sysdeps-pthread.c @@ -153,6 +153,7 @@ _dbus_pthread_mutex_lock (DBusMutex *mutex) { /* Wait for the lock */ PTHREAD_CHECK ("pthread_mutex_lock", pthread_mutex_lock (&pmutex->lock)); + pmutex->holder = self; _dbus_assert (pmutex->count == 0); } @@ -222,10 +223,11 @@ _dbus_pthread_condvar_wait (DBusCondVar *cond, _dbus_assert (pthread_equal (pmutex->holder, pthread_self ())); old_count = pmutex->count; - pmutex->count = 0; + pmutex->count = 0; /* allow other threads to lock */ PTHREAD_CHECK ("pthread_cond_wait", pthread_cond_wait (&pcond->cond, &pmutex->lock)); _dbus_assert (pmutex->count == 0); pmutex->count = old_count; + pmutex->holder = pthread_self(); /* other threads may have locked the mutex in the meantime */ } static dbus_bool_t @@ -264,6 +266,7 @@ _dbus_pthread_condvar_wait_timeout (DBusCondVar *cond, _dbus_assert (pmutex->count == 0); pmutex->count = old_count; + pmutex->holder = pthread_self(); /* other threads may have locked the mutex in the meantime */ /* return true if we did not time out */ return result != ETIMEDOUT; |