3887781d07
- Apply patch from Thiago Macieira <thiago@kde.org> to fix failed assertion
in threading implementation
- Drop some crazy looking build time speed optimization
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
--- dbus-1.0.1/dbus/dbus-sysdeps-pthread.c 28 Oct 2006 01:41:37 -0000 1.5
|
|
+++ dbus-1.0.1/dbus/dbus-sysdeps-pthread.c 19 Nov 2006 12:40:47 -0000
|
|
@@ -153,6 +153,7 @@ _dbus_pthread_mutex_lock (DBusMutex *mut
|
|
{
|
|
/* 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
|
|
_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 (DBus
|
|
|
|
_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;
|
|
|