|
From: <sv...@va...> - 2008-03-24 19:31:31
|
Author: bart
Date: 2008-03-24 19:31:33 +0000 (Mon, 24 Mar 2008)
New Revision: 7783
Log:
Modified error message that is printed when a mutex operation is attempted on an object that is not a mutex.
Modified:
trunk/exp-drd/drd_error.c
trunk/exp-drd/tests/tc09_bad_unlock.stderr.exp
trunk/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
trunk/exp-drd/tests/tc23_bogus_condwait.stderr.exp
Modified: trunk/exp-drd/drd_error.c
===================================================================
--- trunk/exp-drd/drd_error.c 2008-03-24 19:12:12 UTC (rev 7782)
+++ trunk/exp-drd/drd_error.c 2008-03-24 19:31:33 UTC (rev 7783)
@@ -145,8 +145,7 @@
else
{
VG_(message)(Vg_UserMsg,
- "%s: mutex 0x%lx.",
- VG_(get_error_string)(e),
+ "The object at address 0x%lx is not a mutex.",
p->mutex);
}
VG_(pp_ExeContext)(VG_(get_error_where)(e));
Modified: trunk/exp-drd/tests/tc09_bad_unlock.stderr.exp
===================================================================
--- trunk/exp-drd/tests/tc09_bad_unlock.stderr.exp 2008-03-24 19:12:12 UTC (rev 7782)
+++ trunk/exp-drd/tests/tc09_bad_unlock.stderr.exp 2008-03-24 19:31:33 UTC (rev 7783)
@@ -13,7 +13,7 @@
by 0x........: clone (in /...libc...)
Thread 1:
-Not a mutex: mutex 0x.........
+The object at address 0x........ is not a mutex.
at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
by 0x........: nearly_main (tc09_bad_unlock.c:41)
by 0x........: main (tc09_bad_unlock.c:49)
@@ -36,7 +36,7 @@
by 0x........: clone (in /...libc...)
Thread 1:
-Not a mutex: mutex 0x.........
+The object at address 0x........ is not a mutex.
at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
by 0x........: nearly_main (tc09_bad_unlock.c:41)
by 0x........: main (tc09_bad_unlock.c:50)
Modified: trunk/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3
===================================================================
--- trunk/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 2008-03-24 19:12:12 UTC (rev 7782)
+++ trunk/exp-drd/tests/tc20_verifywrap.stderr.exp-glibc2.3 2008-03-24 19:31:33 UTC (rev 7783)
@@ -17,7 +17,7 @@
---------------- pthread_mutex_lock et al ----------------
-Not a mutex
+The object at address 0x........ is not a mutex.
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:92)
@@ -28,15 +28,15 @@
make pthread_mutex_lock fail: skipped on glibc < 2.4
-Not a mutex
+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)
-Not a mutex
+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)
-Not a mutex
+The object at address 0x........ is not a mutex.
at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:125)
Modified: trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
===================================================================
--- trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b 2008-03-24 19:12:12 UTC (rev 7782)
+++ trunk/exp-drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b 2008-03-24 19:31:33 UTC (rev 7783)
@@ -18,7 +18,7 @@
[1/1] mutex_init invalid mutex 0x........
-Not a mutex
+The object at address 0x........ is not a mutex.
at 0x........: pthread_mutex_init (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:92)
[1/1] mutex_init mutex 0x........
@@ -34,19 +34,19 @@
[1/1] pre_mutex_lock invalid mutex 0x........ rc 0 owner 0
-Not a mutex
+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)
[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0
[1/1] pre_mutex_lock invalid mutex 0x........ rc 0 owner 0
-Not a mutex
+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)
[1/1] post_mutex_lock invalid mutex 0x........ rc 0 owner 0
[1/1] mutex_unlock invalid mutex 0x........ rc 0
-Not a mutex
+The object at address 0x........ is not a mutex.
at 0x........: pthread_mutex_unlock (drd_pthread_intercepts.c:?)
by 0x........: main (tc20_verifywrap.c:125)
Modified: trunk/exp-drd/tests/tc23_bogus_condwait.stderr.exp
===================================================================
--- trunk/exp-drd/tests/tc23_bogus_condwait.stderr.exp 2008-03-24 19:12:12 UTC (rev 7782)
+++ trunk/exp-drd/tests/tc23_bogus_condwait.stderr.exp 2008-03-24 19:31:33 UTC (rev 7783)
@@ -1,5 +1,5 @@
-Not a mutex: mutex 0x.........
+The object at address 0x........ is not a mutex.
at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:69)
@@ -7,7 +7,7 @@
at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:72)
-Not a mutex: mutex 0x.........
+The object at address 0x........ is not a mutex.
at 0x........: pthread_cond_wait* (drd_pthread_intercepts.c:?)
by 0x........: main (tc23_bogus_condwait.c:75)
|