summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2009-08-23 19:28:22 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2009-08-23 19:28:22 +0200
commit2cddc873d21695166265d4c87c1939e5269a5108 (patch)
treefcdac2cee52935e2cc448333130a16a15da8c236
parentfa0f7d1afb65bf077edfcc0f8977f95fca5656b9 (diff)
Fix assertion failure in pthread_mutex_trylock
* sysdeps/generic/pt-mutex-trylock.c [!ALWAYS_TRACK_MUTEX_OWNER] (__pthread_mutex_trylock): Disable owner tracking.
-rw-r--r--sysdeps/generic/pt-mutex-trylock.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/sysdeps/generic/pt-mutex-trylock.c b/sysdeps/generic/pt-mutex-trylock.c
index 5264dc7b..3c8cd03c 100644
--- a/sysdeps/generic/pt-mutex-trylock.c
+++ b/sysdeps/generic/pt-mutex-trylock.c
@@ -34,6 +34,7 @@ __pthread_mutex_trylock (struct __pthread_mutex *mutex)
if (__pthread_spin_trylock (&mutex->__held) == 0)
/* Acquired the lock. */
{
+#if defined(ALWAYS_TRACK_MUTEX_OWNER)
#ifndef NDEBUG
self = _pthread_self ();
if (self)
@@ -45,6 +46,7 @@ __pthread_mutex_trylock (struct __pthread_mutex *mutex)
mutex->owner = _pthread_self ();
}
#endif
+#endif
if (mutex->attr)
switch (mutex->attr->mutex_type)