Author: sewardj
Date: 2007-10-03 22:09:17 +0100 (Wed, 03 Oct 2007)
New Revision: 6934
Log:
Improve anonymisation of regtest outputs, and update expected outputs.
Modified:
branches/THRCHECK/thrcheck/tests/filter_stderr
branches/THRCHECK/thrcheck/tests/hg02_deadlock.stderr.exp
branches/THRCHECK/thrcheck/tests/hg03_inherit.stderr.exp
branches/THRCHECK/thrcheck/tests/hg04_race.stderr.exp
branches/THRCHECK/thrcheck/tests/hg05_race2.stderr.exp
branches/THRCHECK/thrcheck/tests/tc01_simple_race.stderr.exp
branches/THRCHECK/thrcheck/tests/tc04_free_lock.stderr.exp
branches/THRCHECK/thrcheck/tests/tc05_simple_race.stderr.exp
branches/THRCHECK/thrcheck/tests/tc06_two_races.stderr.exp
branches/THRCHECK/thrcheck/tests/tc08_hbl2.c
branches/THRCHECK/thrcheck/tests/tc09_bad_unlock.stderr.exp
branches/THRCHECK/thrcheck/tests/tc10_rec_lock.stderr.exp
branches/THRCHECK/thrcheck/tests/tc12_rwl_trivial.stderr.exp
branches/THRCHECK/thrcheck/tests/tc13_laog1.stderr.exp
branches/THRCHECK/thrcheck/tests/tc14_laog_dinphils.stderr.exp
branches/THRCHECK/thrcheck/tests/tc15_laog_lockdel.c
branches/THRCHECK/thrcheck/tests/tc15_laog_lockdel.stderr.exp
Modified: branches/THRCHECK/thrcheck/tests/filter_stderr
===================================================================
--- branches/THRCHECK/thrcheck/tests/filter_stderr 2007-10-03 20:34:03 UTC
(rev 6933)
+++ branches/THRCHECK/thrcheck/tests/filter_stderr 2007-10-03 21:09:17 UTC
(rev 6934)
@@ -10,7 +10,11 @@
# Remove "Thrcheck, ..." line and the following copyright line.
sed "/^Thrcheck, a thread error detector/ , /./ d" |
-# Anonymise line numbers in mc_replace_strmem.c
-sed "s/mc_replace_strmem.c:[0-9]*/mc_replace_strmem.c:.../" |
+# Anonymise line numbers in tc_intercepts.c
+sed "s/tc_intercepts.c:[0-9]*/tc_intercepts.c:.../" |
+# Change (eg) "/lib64/libpthread-2.5.so" into "/lib/libpthread..."
+sed "s/lib64/lib/g" |
+sed "s/libpthread.*so/libpthread\.\.\./g" |
+
$dir/../../tests/filter_test_paths
Modified: branches/THRCHECK/thrcheck/tests/hg02_deadlock.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/hg02_deadlock.stderr.exp 2007-10-03
20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/hg02_deadlock.stderr.exp 2007-10-03
21:09:17 UTC (rev 6934)
@@ -1,3 +1,16 @@
+Thread #3 was created
+ at 0x........: clone (in /...libc...)
+ by 0x........: ...
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
+ by 0x........: main (hg02_deadlock.c:36)
-ERROR SUMMARY: 0 errors from 0 contexts (suppressed: 0 from 0)
+Thread #3: Lock acquisition order is inconsistent with previously observed
ordering
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
+ by 0x........: t2 (hg02_deadlock.c:20)
+ by 0x........: mythread_wrapper (tc_intercepts.c:...)
+ by 0x........: ...
+ by 0x........: ...
+
+ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
Modified: branches/THRCHECK/thrcheck/tests/hg03_inherit.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/hg03_inherit.stderr.exp 2007-10-03
20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/hg03_inherit.stderr.exp 2007-10-03
21:09:17 UTC (rev 6934)
@@ -4,13 +4,13 @@
Thread #3 was created
at 0x........: clone (in /...libc...)
by 0x........: ...
- by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.5.so)
- by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:184)
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (hg03_inherit.c:46)
Possible data race during write to 0x........
at 0x........: t2 (hg03_inherit.c:28)
- by 0x........: mythread_wrapper (tc_intercepts.c:164)
+ by 0x........: mythread_wrapper (tc_intercepts.c:...)
by 0x........: ...
by 0x........: ...
Old state: shared-readonly by threads #1, #3
Modified: branches/THRCHECK/thrcheck/tests/hg04_race.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/hg04_race.stderr.exp 2007-10-03
20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/hg04_race.stderr.exp 2007-10-03
21:09:17 UTC (rev 6934)
@@ -2,20 +2,20 @@
Thread #2 was created
at 0x........: clone (in /...libc...)
by 0x........: ...
- by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.5.so)
- by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:184)
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (hg04_race.c:19)
Thread #3 was created
at 0x........: clone (in /...libc...)
by 0x........: ...
- by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.5.so)
- by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:184)
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (hg04_race.c:21)
Possible data race during write to 0x........
at 0x........: th (hg04_race.c:10)
- by 0x........: mythread_wrapper (tc_intercepts.c:164)
+ by 0x........: mythread_wrapper (tc_intercepts.c:...)
by 0x........: ...
by 0x........: ...
Old state: shared-readonly by threads #2, #3
Modified: branches/THRCHECK/thrcheck/tests/hg05_race2.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/hg05_race2.stderr.exp 2007-10-03
20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/hg05_race2.stderr.exp 2007-10-03
21:09:17 UTC (rev 6934)
@@ -2,20 +2,20 @@
Thread #2 was created
at 0x........: clone (in /...libc...)
by 0x........: ...
- by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.5.so)
- by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:184)
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (hg05_race2.c:27)
Thread #3 was created
at 0x........: clone (in /...libc...)
by 0x........: ...
- by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.5.so)
- by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:184)
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (hg05_race2.c:29)
Possible data race during write to 0x........
at 0x........: th (hg05_race2.c:17)
- by 0x........: mythread_wrapper (tc_intercepts.c:164)
+ by 0x........: mythread_wrapper (tc_intercepts.c:...)
by 0x........: ...
by 0x........: ...
Old state: shared-readonly by threads #2, #3
Modified: branches/THRCHECK/thrcheck/tests/tc01_simple_race.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc01_simple_race.stderr.exp
2007-10-03 20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc01_simple_race.stderr.exp
2007-10-03 21:09:17 UTC (rev 6934)
@@ -4,8 +4,8 @@
Thread #2 was created
at 0x........: clone (in /...libc...)
by 0x........: ...
- by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.5.so)
- by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:184)
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (tc01_simple_race.c:22)
Possible data race during write to 0x........
Modified: branches/THRCHECK/thrcheck/tests/tc04_free_lock.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc04_free_lock.stderr.exp 2007-10-03
20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc04_free_lock.stderr.exp 2007-10-03
21:09:17 UTC (rev 6934)
@@ -5,14 +5,14 @@
at 0x........: free (vg_replace_malloc.c:...)
by 0x........: main (tc04_free_lock.c:24)
Lock at 0x........ was first observed
- at 0x........: pthread_mutex_init (tc_intercepts.c:299)
+ at 0x........: pthread_mutex_init (tc_intercepts.c:...)
by 0x........: main (tc04_free_lock.c:20)
Thread #1 deallocated location 0x........ containing a locked lock
at 0x........: bar (tc04_free_lock.c:40)
by 0x........: main (tc04_free_lock.c:26)
Lock at 0x........ was first observed
- at 0x........: pthread_mutex_lock (tc_intercepts.c:361)
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
by 0x........: bar (tc04_free_lock.c:38)
by 0x........: main (tc04_free_lock.c:26)
@@ -20,7 +20,7 @@
at 0x........: foo (tc04_free_lock.c:49)
by 0x........: main (tc04_free_lock.c:27)
Lock at 0x........ was first observed
- at 0x........: pthread_mutex_init (tc_intercepts.c:299)
+ at 0x........: pthread_mutex_init (tc_intercepts.c:...)
by 0x........: foo (tc04_free_lock.c:46)
by 0x........: main (tc04_free_lock.c:27)
@@ -28,7 +28,7 @@
at 0x........: bar (tc04_free_lock.c:40)
by 0x........: main (tc04_free_lock.c:28)
Lock at 0x........ was first observed
- at 0x........: pthread_mutex_lock (tc_intercepts.c:361)
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
by 0x........: bar (tc04_free_lock.c:38)
by 0x........: main (tc04_free_lock.c:28)
Modified: branches/THRCHECK/thrcheck/tests/tc05_simple_race.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc05_simple_race.stderr.exp
2007-10-03 20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc05_simple_race.stderr.exp
2007-10-03 21:09:17 UTC (rev 6934)
@@ -4,8 +4,8 @@
Thread #2 was created
at 0x........: clone (in /...libc...)
by 0x........: ...
- by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.5.so)
- by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:184)
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (tc05_simple_race.c:27)
Possible data race during write to 0x........
Modified: branches/THRCHECK/thrcheck/tests/tc06_two_races.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc06_two_races.stderr.exp 2007-10-03
20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc06_two_races.stderr.exp 2007-10-03
21:09:17 UTC (rev 6934)
@@ -4,8 +4,8 @@
Thread #2 was created
at 0x........: clone (in /...libc...)
by 0x........: ...
- by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.5.so)
- by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:184)
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (tc06_two_races.c:26)
Possible data race during write to 0x........
Modified: branches/THRCHECK/thrcheck/tests/tc08_hbl2.c
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc08_hbl2.c 2007-10-03 20:34:03 UTC
(rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc08_hbl2.c 2007-10-03 21:09:17 UTC
(rev 6934)
@@ -1,4 +1,17 @@
+/* FIXME: this is basically a bad test as it is scheduling-
+ sensitive. Sometimes the output is:
+
+ child: new value 6
+ child: new value 10
+ done, x = 10
+
+ and sometimes
+
+ child: new value 10
+ done, x = 10
+*/
+
#include <pthread.h>
#include <stdio.h>
#include <stdlib.h>
Modified: branches/THRCHECK/thrcheck/tests/tc09_bad_unlock.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc09_bad_unlock.stderr.exp 2007-10-03
20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc09_bad_unlock.stderr.exp 2007-10-03
21:09:17 UTC (rev 6934)
@@ -2,40 +2,41 @@
Thread #1 is the program's root thread
Thread #1 unlocked a not-locked lock at 0x........
- at 0x........: pthread_mutex_unlock (tc_intercepts.c:423)
+ at 0x........: pthread_mutex_unlock (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:27)
by 0x........: main (tc09_bad_unlock.c:49)
Lock at 0x........ was first observed
- at 0x........: pthread_mutex_init (tc_intercepts.c:299)
+ at 0x........: pthread_mutex_init (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:23)
by 0x........: main (tc09_bad_unlock.c:49)
Thread #2 was created
at 0x........: clone (in /...libc...)
by 0x........: ...
- by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.5.so)
- by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:184)
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:35)
by 0x........: main (tc09_bad_unlock.c:49)
Thread #2 unlocked lock at 0x........ currently held by thread #1
- at 0x........: pthread_mutex_unlock (tc_intercepts.c:423)
+ at 0x........: pthread_mutex_unlock (tc_intercepts.c:...)
by 0x........: child_fn (tc09_bad_unlock.c:11)
- by 0x........: mythread_wrapper (tc_intercepts.c:164)
+ by 0x........: mythread_wrapper (tc_intercepts.c:...)
by 0x........: ...
by 0x........: ...
Lock at 0x........ was first observed
- at 0x........: pthread_mutex_init (tc_intercepts.c:299)
+ at 0x........: pthread_mutex_init (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:31)
by 0x........: main (tc09_bad_unlock.c:49)
Thread #1 unlocked an invalid lock at 0x........
- at 0x........: pthread_mutex_unlock (tc_intercepts.c:423)
+ at 0x........: pthread_mutex_unlock (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:41)
by 0x........: main (tc09_bad_unlock.c:49)
-Thread #1's call to pthread_mutex_unlock failed with error 22 (EINVAL: Invalid
argument)
- at 0x........: pthread_mutex_unlock (tc_intercepts.c:432)
+Thread #1's call to pthread_mutex_unlock failed
+ with error code 22 (EINVAL: Invalid argument)
+ at 0x........: pthread_mutex_unlock (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:41)
by 0x........: main (tc09_bad_unlock.c:49)
@@ -43,45 +44,46 @@
at 0x........: nearly_main (tc09_bad_unlock.c:45)
by 0x........: main (tc09_bad_unlock.c:49)
Lock at 0x........ was first observed
- at 0x........: pthread_mutex_init (tc_intercepts.c:299)
+ at 0x........: pthread_mutex_init (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:31)
by 0x........: main (tc09_bad_unlock.c:49)
Thread #1 unlocked a not-locked lock at 0x........
- at 0x........: pthread_mutex_unlock (tc_intercepts.c:423)
+ at 0x........: pthread_mutex_unlock (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:27)
by 0x........: main (tc09_bad_unlock.c:50)
Lock at 0x........ was first observed
- at 0x........: pthread_mutex_init (tc_intercepts.c:299)
+ at 0x........: pthread_mutex_init (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:23)
by 0x........: main (tc09_bad_unlock.c:50)
Thread #3 was created
at 0x........: clone (in /...libc...)
by 0x........: ...
- by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib64/libpthread-2.5.so)
- by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:184)
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:35)
by 0x........: main (tc09_bad_unlock.c:50)
Thread #3 unlocked lock at 0x........ currently held by thread #1
- at 0x........: pthread_mutex_unlock (tc_intercepts.c:423)
+ at 0x........: pthread_mutex_unlock (tc_intercepts.c:...)
by 0x........: child_fn (tc09_bad_unlock.c:11)
- by 0x........: mythread_wrapper (tc_intercepts.c:164)
+ by 0x........: mythread_wrapper (tc_intercepts.c:...)
by 0x........: ...
by 0x........: ...
Lock at 0x........ was first observed
- at 0x........: pthread_mutex_init (tc_intercepts.c:299)
+ at 0x........: pthread_mutex_init (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:31)
by 0x........: main (tc09_bad_unlock.c:50)
Thread #1 unlocked an invalid lock at 0x........
- at 0x........: pthread_mutex_unlock (tc_intercepts.c:423)
+ at 0x........: pthread_mutex_unlock (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:41)
by 0x........: main (tc09_bad_unlock.c:50)
-Thread #1's call to pthread_mutex_unlock failed with error 22 (EINVAL: Invalid
argument)
- at 0x........: pthread_mutex_unlock (tc_intercepts.c:432)
+Thread #1's call to pthread_mutex_unlock failed
+ with error code 22 (EINVAL: Invalid argument)
+ at 0x........: pthread_mutex_unlock (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:41)
by 0x........: main (tc09_bad_unlock.c:50)
@@ -89,7 +91,7 @@
at 0x........: nearly_main (tc09_bad_unlock.c:45)
by 0x........: main (tc09_bad_unlock.c:50)
Lock at 0x........ was first observed
- at 0x........: pthread_mutex_init (tc_intercepts.c:299)
+ at 0x........: pthread_mutex_init (tc_intercepts.c:...)
by 0x........: nearly_main (tc09_bad_unlock.c:31)
by 0x........: main (tc09_bad_unlock.c:50)
Modified: branches/THRCHECK/thrcheck/tests/tc10_rec_lock.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc10_rec_lock.stderr.exp 2007-10-03
20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc10_rec_lock.stderr.exp 2007-10-03
21:09:17 UTC (rev 6934)
@@ -9,16 +9,17 @@
Thread #1 is the program's root thread
Thread #1 unlocked a not-locked lock at 0x........
- at 0x........: pthread_mutex_unlock (tc_intercepts.c:423)
+ at 0x........: pthread_mutex_unlock (tc_intercepts.c:...)
by 0x........: nearly_main (tc10_rec_lock.c:53)
by 0x........: main (tc10_rec_lock.c:58)
Lock at 0x........ was first observed
- at 0x........: pthread_mutex_init (tc_intercepts.c:299)
+ at 0x........: pthread_mutex_init (tc_intercepts.c:...)
by 0x........: nearly_main (tc10_rec_lock.c:35)
by 0x........: main (tc10_rec_lock.c:58)
-Thread #1's call to pthread_mutex_unlock failed with error 1 (EPERM: Operation
not permitted)
- at 0x........: pthread_mutex_unlock (tc_intercepts.c:432)
+Thread #1's call to pthread_mutex_unlock failed
+ with error code 1 (EPERM: Operation not permitted)
+ at 0x........: pthread_mutex_unlock (tc_intercepts.c:...)
by 0x........: nearly_main (tc10_rec_lock.c:53)
by 0x........: main (tc10_rec_lock.c:58)
Modified: branches/THRCHECK/thrcheck/tests/tc12_rwl_trivial.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc12_rwl_trivial.stderr.exp
2007-10-03 20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc12_rwl_trivial.stderr.exp
2007-10-03 21:09:17 UTC (rev 6934)
@@ -0,0 +1,11 @@
+
+Thread #1 is the program's root thread
+
+Thread #1 unlocked a not-locked lock at 0x........
+ at 0x........: pthread_rwlock_unlock (tc_intercepts.c:...)
+ by 0x........: main (tc12_rwl_trivial.c:24)
+ Lock at 0x........ was first observed
+ at 0x........: pthread_rwlock_init (tc_intercepts.c:...)
+ by 0x........: main (tc12_rwl_trivial.c:13)
+
+ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
Modified: branches/THRCHECK/thrcheck/tests/tc13_laog1.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc13_laog1.stderr.exp 2007-10-03
20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc13_laog1.stderr.exp 2007-10-03
21:09:17 UTC (rev 6934)
@@ -0,0 +1,8 @@
+
+Thread #1 is the program's root thread
+
+Thread #1: Lock acquisition order is inconsistent with previously observed
ordering
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
+ by 0x........: main (tc13_laog1.c:24)
+
+ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
Modified: branches/THRCHECK/thrcheck/tests/tc14_laog_dinphils.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc14_laog_dinphils.stderr.exp
2007-10-03 20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc14_laog_dinphils.stderr.exp
2007-10-03 21:09:17 UTC (rev 6934)
@@ -0,0 +1,16 @@
+
+Thread #6 was created
+ at 0x........: clone (in /...libc...)
+ by 0x........: ...
+ by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
+ by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
+ by 0x........: main (tc14_laog_dinphils.c:34)
+
+Thread #6: Lock acquisition order is inconsistent with previously observed
ordering
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
+ by 0x........: dine (tc14_laog_dinphils.c:19)
+ by 0x........: mythread_wrapper (tc_intercepts.c:...)
+ by 0x........: ...
+ by 0x........: ...
+
+ERROR SUMMARY: 1000 errors from 1 contexts (suppressed: 0 from 0)
Modified: branches/THRCHECK/thrcheck/tests/tc15_laog_lockdel.c
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc15_laog_lockdel.c 2007-10-03
20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc15_laog_lockdel.c 2007-10-03
21:09:17 UTC (rev 6934)
@@ -4,8 +4,9 @@
#include <stdlib.h>
#include <assert.h>
-/* The simplest possible test that triggers a lock order acquisition
- error. */
+/* Test that locks, having entered the lock acquisition tracking
+ machinery, are forgotten by it when the memory they reside in
+ becomes inaccessible. */
int main ( void )
{
Modified: branches/THRCHECK/thrcheck/tests/tc15_laog_lockdel.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc15_laog_lockdel.stderr.exp
2007-10-03 20:34:03 UTC (rev 6933)
+++ branches/THRCHECK/thrcheck/tests/tc15_laog_lockdel.stderr.exp
2007-10-03 21:09:17 UTC (rev 6934)
@@ -0,0 +1,13 @@
+
+Establish order 1 -> 2
+Try order 2 -> 1. This gives an error.
+Thread #1 is the program's root thread
+
+Thread #1: Lock acquisition order is inconsistent with previously observed
ordering
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
+ by 0x........: main (tc15_laog_lockdel.c:36)
+Free 2 and re-allocate it. This gives it a new identity,
+so a second locking sequence 2 -> 1 should now be OK.
+done
+
+ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0)
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Valgrind-developers mailing list
Valgrind-developers@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/valgrind-developers
