[Valgrind-developers] valgrind: r9404 - in branches/DARWIN/drd: . tests

[<sv...@va...>]

Author: njn
Date: 2009-03-13 22:24:57 +0000 (Fri, 13 Mar 2009)
New Revision: 9404

Log:
Merge r9388..r9400 (DRD tweaks) from the trunk.



Added:
   branches/DARWIN/drd/tests/pth_process_shared_mutex.c
   branches/DARWIN/drd/tests/pth_process_shared_mutex.stderr.exp
   branches/DARWIN/drd/tests/pth_process_shared_mutex.vgtest
Modified:
   branches/DARWIN/drd/drd_pthread_intercepts.c
   branches/DARWIN/drd/tests/Makefile.am
   branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5
   branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc
   branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
   branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
   branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
   branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
   branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
   branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8


Modified: branches/DARWIN/drd/drd_pthread_intercepts.c
===================================================================
--- branches/DARWIN/drd/drd_pthread_intercepts.c	2009-03-13 20:08:03 UTC (rev 9403)
+++ branches/DARWIN/drd/drd_pthread_intercepts.c	2009-03-13 22:24:57 UTC (rev 9404)
@@ -156,15 +156,18 @@
  *   which the mutex type is stored.
  * @note The function mutex_type() has been declared inline in order
  *   to avoid that it shows up in call stacks (drd/tests/...exp* files).
+ * @note glibc stores the mutex type in the lowest two bits, and uses the
+ *   higher bits for flags like PTHREAD_MUTEXATTR_FLAG_ROBUST and
+ *   PTHREAD_MUTEXATTR_FLAG_PSHARED.
  */
 static __inline__ MutexT DRD_(mutex_type)(pthread_mutex_t* mutex)
 {
 #if defined(HAVE_PTHREAD_MUTEX_T__M_KIND)
   /* glibc + LinuxThreads. */
-  const int kind = mutex->__m_kind;
+  const int kind = mutex->__m_kind & 3;
 #elif defined(HAVE_PTHREAD_MUTEX_T__DATA__KIND)
   /* glibc + NPTL. */
-  const int kind = mutex->__data.__kind;
+  const int kind = mutex->__data.__kind & 3;
 #else
   /* Another POSIX threads implementation. Regression tests will fail. */
   const int kind = PTHREAD_MUTEX_DEFAULT;

Modified: branches/DARWIN/drd/tests/Makefile.am
===================================================================
--- branches/DARWIN/drd/tests/Makefile.am	2009-03-13 20:08:03 UTC (rev 9403)
+++ branches/DARWIN/drd/tests/Makefile.am	2009-03-13 22:24:57 UTC (rev 9404)
@@ -109,6 +109,8 @@
 	pth_inconsistent_cond_wait.stderr.exp1      \
 	pth_inconsistent_cond_wait.stderr.exp2      \
 	pth_inconsistent_cond_wait.vgtest           \
+	pth_process_shared_mutex.vgtest             \
+	pth_process_shared_mutex.c                  \
 	pth_spinlock.stderr.exp                     \
 	pth_spinlock.vgtest                         \
 	qt4_mutex.stderr.exp                        \
@@ -210,6 +212,7 @@
   pth_create_chain    \
   pth_detached        \
   pth_detached_sem    \
+  pth_process_shared_mutex   \
   pth_inconsistent_cond_wait \
   recursive_mutex     \
   rwlock_race         \

Copied: branches/DARWIN/drd/tests/pth_process_shared_mutex.c (from rev 9400, trunk/drd/tests/pth_process_shared_mutex.c)
===================================================================
--- branches/DARWIN/drd/tests/pth_process_shared_mutex.c	                        (rev 0)
+++ branches/DARWIN/drd/tests/pth_process_shared_mutex.c	2009-03-13 22:24:57 UTC (rev 9404)
@@ -0,0 +1,30 @@
+/*
+ * Test program that locks and unlocks a process-shared mutex.
+ * See also https://bugs.kde.org/show_bug.cgi?id=187048.
+ */
+
+
+#define _GNU_SOURCE
+
+#include <stdio.h>
+#include <pthread.h>
+
+
+int main()
+{
+  pthread_mutex_t mutex;
+  pthread_mutexattr_t attr;
+
+  pthread_mutexattr_init(&attr);
+  pthread_mutexattr_setpshared(&attr, PTHREAD_PROCESS_SHARED);
+  pthread_mutex_init(&mutex, &attr);
+  pthread_mutexattr_destroy(&attr);
+
+  pthread_mutex_lock(&mutex);
+  pthread_mutex_unlock(&mutex);
+  pthread_mutex_destroy(&mutex);
+
+  fprintf(stderr, "Finished.\n");
+
+  return 0;
+}

Copied: branches/DARWIN/drd/tests/pth_process_shared_mutex.stderr.exp (from rev 9400, trunk/drd/tests/pth_process_shared_mutex.stderr.exp)
===================================================================
--- branches/DARWIN/drd/tests/pth_process_shared_mutex.stderr.exp	                        (rev 0)
+++ branches/DARWIN/drd/tests/pth_process_shared_mutex.stderr.exp	2009-03-13 22:24:57 UTC (rev 9404)
@@ -0,0 +1,4 @@
+
+Finished.
+
+ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)

Copied: branches/DARWIN/drd/tests/pth_process_shared_mutex.vgtest (from rev 9400, trunk/drd/tests/pth_process_shared_mutex.vgtest)
===================================================================
--- branches/DARWIN/drd/tests/pth_process_shared_mutex.vgtest	                        (rev 0)
+++ branches/DARWIN/drd/tests/pth_process_shared_mutex.vgtest	2009-03-13 22:24:57 UTC (rev 9404)
@@ -0,0 +1,3 @@
+prereq: ./supported_libpthread
+prog: pth_process_shared_mutex
+vgopts: --var-info=yes --check-stack-var=yes

Modified: branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5
===================================================================
--- branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5	2009-03-13 20:08:03 UTC (rev 9403)
+++ branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5	2009-03-13 22:24:57 UTC (rev 9404)
@@ -28,28 +28,7 @@
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
 
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:116)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:121)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-The object at address 0x........ is not a mutex.
+Mutex not locked: mutex 0x........, recursion count 0, owner 0.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 mutex 0x........ was first observed at:
@@ -149,4 +128,4 @@
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:145)
 
-ERROR SUMMARY: 16 errors from 16 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 13 errors from 13 contexts (suppressed: 0 from 0)

Modified: branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc
===================================================================
--- branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc	2009-03-13 20:08:03 UTC (rev 9403)
+++ branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.5-ppc	2009-03-13 22:24:57 UTC (rev 9404)
@@ -28,28 +28,7 @@
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
 
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:116)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:121)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-The object at address 0x........ is not a mutex.
+Mutex not locked: mutex 0x........, recursion count 0, owner 0.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 mutex 0x........ was first observed at:
@@ -149,4 +128,4 @@
    at 0x........: pthread_rwlock_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:216)
 
-ERROR SUMMARY: 16 errors from 16 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 13 errors from 13 contexts (suppressed: 0 from 0)

Modified: branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8
===================================================================
--- branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8	2009-03-13 20:08:03 UTC (rev 9403)
+++ branches/DARWIN/drd/tests/tc20_verifywrap.stderr.exp-glibc2.8	2009-03-13 22:24:57 UTC (rev 9404)
@@ -28,28 +28,7 @@
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
 
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:116)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:121)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-
-The object at address 0x........ is not a mutex.
+Mutex not locked: mutex 0x........, recursion count 0, owner 0.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 mutex 0x........ was first observed at:

Modified: branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
===================================================================
--- branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3	2009-03-13 20:08:03 UTC (rev 9403)
+++ branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3	2009-03-13 22:24:57 UTC (rev 9404)
@@ -169,7 +169,7 @@
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:145)
-[1/1] mutex_destroy   invalid mutex 0x........ rc 0 owner 0
+[1/1] mutex_destroy   mutex 0x........ rc 0 owner 0
 [1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 0
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 0
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1

Modified: branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
===================================================================
--- branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b	2009-03-13 20:08:03 UTC (rev 9403)
+++ branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b	2009-03-13 22:24:57 UTC (rev 9404)
@@ -169,7 +169,7 @@
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:145)
-[1/1] mutex_destroy   invalid mutex 0x........ rc 0 owner 0
+[1/1] mutex_destroy   mutex 0x........ rc 0 owner 0
 [1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 0
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 0
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1

Modified: branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
===================================================================
--- branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5	2009-03-13 20:08:03 UTC (rev 9403)
+++ branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5	2009-03-13 22:24:57 UTC (rev 9404)
@@ -32,36 +32,15 @@
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
-[1/1] mutex_trylock   invalid mutex 0x........ rc 0 owner 0
+[1/1] mutex_trylock   mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] pre_mutex_lock  mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] mutex_trylock   mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] mutex_unlock    mutex 0x........ rc 0
 
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
-[1/1] pre_mutex_lock  invalid mutex 0x........ rc 0 owner 0
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:116)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
-[1/1] mutex_trylock   invalid mutex 0x........ rc 0 owner 0
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:121)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
-[1/1] mutex_unlock    invalid mutex 0x........ rc 0
-
-The object at address 0x........ is not a mutex.
+Mutex not locked: mutex 0x........, recursion count 0, owner 0.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 mutex 0x........ was first observed at:
@@ -178,7 +157,7 @@
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:145)
-[1/1] mutex_destroy   invalid mutex 0x........ rc 0 owner 0
+[1/1] mutex_destroy   mutex 0x........ rc 0 owner 0
 [1/1] mutex_trylock   recursive mutex 0x........ rc 0 owner 0
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 0
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
@@ -228,4 +207,4 @@
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
 
-ERROR SUMMARY: 16 errors from 16 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 13 errors from 13 contexts (suppressed: 0 from 0)

Modified: branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
===================================================================
--- branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc	2009-03-13 20:08:03 UTC (rev 9403)
+++ branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc	2009-03-13 22:24:57 UTC (rev 9404)
@@ -32,36 +32,15 @@
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
-[1/1] mutex_trylock   invalid mutex 0x........ rc 0 owner 0
+[1/1] mutex_trylock   mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] pre_mutex_lock  mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] mutex_trylock   mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] mutex_unlock    mutex 0x........ rc 0
 
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
-[1/1] pre_mutex_lock  invalid mutex 0x........ rc 0 owner 0
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:116)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
-[1/1] mutex_trylock   invalid mutex 0x........ rc 0 owner 0
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:121)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
-[1/1] mutex_unlock    invalid mutex 0x........ rc 0
-
-The object at address 0x........ is not a mutex.
+Mutex not locked: mutex 0x........, recursion count 0, owner 0.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 mutex 0x........ was first observed at:
@@ -228,4 +207,4 @@
 [1/1] post_mutex_lock recursive mutex 0x........ rc 0 owner 1
 [1/1] mutex_unlock    recursive mutex 0x........ rc 1
 
-ERROR SUMMARY: 16 errors from 16 contexts (suppressed: 0 from 0)
+ERROR SUMMARY: 13 errors from 13 contexts (suppressed: 0 from 0)

Modified: branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
===================================================================
--- branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8	2009-03-13 20:08:03 UTC (rev 9403)
+++ branches/DARWIN/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8	2009-03-13 22:24:57 UTC (rev 9404)
@@ -32,36 +32,15 @@
 mutex 0x........ was first observed at:
    at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:100)
-[1/1] mutex_trylock   invalid mutex 0x........ rc 0 owner 0
+[1/1] mutex_trylock   mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] pre_mutex_lock  mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] mutex_trylock   mutex 0x........ rc 0 owner 0
+[1/1] post_mutex_lock mutex 0x........ rc 0 owner 0 (locking failed)
+[1/1] mutex_unlock    mutex 0x........ rc 0
 
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
-[1/1] pre_mutex_lock  invalid mutex 0x........ rc 0 owner 0
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_trylock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:116)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
-[1/1] mutex_trylock   invalid mutex 0x........ rc 0 owner 0
-
-The object at address 0x........ is not a mutex.
-   at 0x........: pthread_mutex_timedlock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:121)
-mutex 0x........ was first observed at:
-   at 0x........: pthread_mutex_lock (drd_pthread_intercepts.c:?)
-   by 0x........: main (tc20_verifywrap.c:108)
-[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0 (locking failed)
-[1/1] mutex_unlock    invalid mutex 0x........ rc 0
-
-The object at address 0x........ is not a mutex.
+Mutex not locked: mutex 0x........, recursion count 0, owner 0.
    at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:125)
 mutex 0x........ was first observed at: