Author: sewardj
Date: 2007-10-27 01:22:03 +0100 (Sat, 27 Oct 2007)
New Revision: 7041
Log:
Update expected outputs.
Modified:
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/tc05_simple_race.stderr.exp
branches/THRCHECK/thrcheck/tests/tc06_two_races.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.stderr.exp
branches/THRCHECK/thrcheck/tests/tc16_byterace.stderr.exp
branches/THRCHECK/thrcheck/tests/tc17_sembar.stderr.exp
Modified: branches/THRCHECK/thrcheck/tests/hg02_deadlock.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/hg02_deadlock.stderr.exp 2007-10-27
00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/hg02_deadlock.stderr.exp 2007-10-27
00:22:03 UTC (rev 7041)
@@ -6,11 +6,23 @@
by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (hg02_deadlock.c:36)
-Thread #3: Lock acquisition order is inconsistent with previously observed
ordering
+Thread #3: lock order "0x........ before 0x........" violated
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........: ...
+ Required order was established by acquisition of lock at 0x........
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
+ by 0x........: t1 (hg02_deadlock.c:9)
+ by 0x........: mythread_wrapper (tc_intercepts.c:...)
+ by 0x........: ...
+ by 0x........: ...
+ followed by a later acquisition of lock at 0x........
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
+ by 0x........: t1 (hg02_deadlock.c:10)
+ 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-27
00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/hg03_inherit.stderr.exp 2007-10-27
00:22:03 UTC (rev 7041)
@@ -8,7 +8,7 @@
by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (hg03_inherit.c:46)
-Possible data race during write to 0x........
+Possible data race during write of size 4 at 0x........
at 0x........: t2 (hg03_inherit.c:28)
by 0x........: mythread_wrapper (tc_intercepts.c:...)
by 0x........: ...
Modified: branches/THRCHECK/thrcheck/tests/hg04_race.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/hg04_race.stderr.exp 2007-10-27
00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/hg04_race.stderr.exp 2007-10-27
00:22:03 UTC (rev 7041)
@@ -13,7 +13,7 @@
by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (hg04_race.c:21)
-Possible data race during write to 0x........
+Possible data race during write of size 4 at 0x........
at 0x........: th (hg04_race.c:10)
by 0x........: mythread_wrapper (tc_intercepts.c:...)
by 0x........: ...
Modified: branches/THRCHECK/thrcheck/tests/hg05_race2.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/hg05_race2.stderr.exp 2007-10-27
00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/hg05_race2.stderr.exp 2007-10-27
00:22:03 UTC (rev 7041)
@@ -13,7 +13,7 @@
by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (hg05_race2.c:29)
-Possible data race during write to 0x........
+Possible data race during write of size 4 at 0x........
at 0x........: th (hg05_race2.c:17)
by 0x........: mythread_wrapper (tc_intercepts.c:...)
by 0x........: ...
Modified: branches/THRCHECK/thrcheck/tests/tc01_simple_race.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc01_simple_race.stderr.exp
2007-10-27 00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/tc01_simple_race.stderr.exp
2007-10-27 00:22:03 UTC (rev 7041)
@@ -8,7 +8,7 @@
by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (tc01_simple_race.c:22)
-Possible data race during write to 0x........
+Possible data race during write of size 4 at 0x........
at 0x........: main (tc01_simple_race.c:28)
Old state: shared-readonly by threads #1, #2
New state: shared-modified by threads #1, #2
Modified: branches/THRCHECK/thrcheck/tests/tc05_simple_race.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc05_simple_race.stderr.exp
2007-10-27 00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/tc05_simple_race.stderr.exp
2007-10-27 00:22:03 UTC (rev 7041)
@@ -8,7 +8,7 @@
by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (tc05_simple_race.c:27)
-Possible data race during write to 0x........
+Possible data race during write of size 4 at 0x........
at 0x........: main (tc05_simple_race.c:33)
Old state: shared-readonly by threads #1, #2
New state: shared-modified by threads #1, #2
Modified: branches/THRCHECK/thrcheck/tests/tc06_two_races.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc06_two_races.stderr.exp 2007-10-27
00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/tc06_two_races.stderr.exp 2007-10-27
00:22:03 UTC (rev 7041)
@@ -8,14 +8,14 @@
by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (tc06_two_races.c:26)
-Possible data race during write to 0x........
+Possible data race during write of size 4 at 0x........
at 0x........: main (tc06_two_races.c:31)
Old state: shared-readonly by threads #1, #2
New state: shared-modified by threads #1, #2
Reason: this thread, #1, holds no consistent locks
Location 0x........ has never been protected by any lock
-Possible data race during write to 0x........
+Possible data race during write of size 4 at 0x........
at 0x........: main (tc06_two_races.c:35)
Old state: shared-readonly by threads #1, #2
New state: shared-modified by threads #1, #2
Modified: branches/THRCHECK/thrcheck/tests/tc13_laog1.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc13_laog1.stderr.exp 2007-10-27
00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/tc13_laog1.stderr.exp 2007-10-27
00:22:03 UTC (rev 7041)
@@ -1,8 +1,14 @@
Thread #1 is the program's root thread
-Thread #1: Lock acquisition order is inconsistent with previously observed
ordering
+Thread #1: lock order "0x........ before 0x........" violated
at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
by 0x........: main (tc13_laog1.c:24)
+ Required order was established by acquisition of lock at 0x........
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
+ by 0x........: main (tc13_laog1.c:17)
+ followed by a later acquisition of lock at 0x........
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
+ by 0x........: main (tc13_laog1.c:18)
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-27 00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/tc14_laog_dinphils.stderr.exp
2007-10-27 00:22:03 UTC (rev 7041)
@@ -6,11 +6,23 @@
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
+Thread #6: lock order "0x........ before 0x........" violated
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........: ...
+ Required order was established by acquisition of lock at 0x........
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
+ by 0x........: dine (tc14_laog_dinphils.c:18)
+ by 0x........: mythread_wrapper (tc_intercepts.c:...)
+ by 0x........: ...
+ by 0x........: ...
+ followed by a later acquisition of lock at 0x........
+ 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.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc15_laog_lockdel.stderr.exp
2007-10-27 00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/tc15_laog_lockdel.stderr.exp
2007-10-27 00:22:03 UTC (rev 7041)
@@ -3,9 +3,15 @@
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
+Thread #1: lock order "0x........ before 0x........" violated
at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
by 0x........: main (tc15_laog_lockdel.c:36)
+ Required order was established by acquisition of lock at 0x........
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
+ by 0x........: main (tc15_laog_lockdel.c:27)
+ followed by a later acquisition of lock at 0x........
+ at 0x........: pthread_mutex_lock (tc_intercepts.c:...)
+ by 0x........: main (tc15_laog_lockdel.c:28)
Free 2 and re-allocate it. This gives it a new identity,
so a second locking sequence 2 -> 1 should now be OK.
done
Modified: branches/THRCHECK/thrcheck/tests/tc16_byterace.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc16_byterace.stderr.exp 2007-10-27
00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/tc16_byterace.stderr.exp 2007-10-27
00:22:03 UTC (rev 7041)
@@ -8,7 +8,7 @@
by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
by 0x........: main (tc16_byterace.c:22)
-Possible data race during write to 0x........
+Possible data race during write of size 1 at 0x........
at 0x........: main (tc16_byterace.c:34)
Old state: shared-readonly by threads #1, #2
New state: shared-modified by threads #1, #2
Modified: branches/THRCHECK/thrcheck/tests/tc17_sembar.stderr.exp
===================================================================
--- branches/THRCHECK/thrcheck/tests/tc17_sembar.stderr.exp 2007-10-27
00:09:25 UTC (rev 7040)
+++ branches/THRCHECK/thrcheck/tests/tc17_sembar.stderr.exp 2007-10-27
00:22:03 UTC (rev 7041)
@@ -5,32 +5,32 @@
by 0x........: ...
by 0x........: pthread_create@@GLIBC_2.2.5 (in /lib/libpthread...)
by 0x........: [EMAIL PROTECTED] (tc_intercepts.c:...)
- by 0x........: main (tc17_sembar.c:164)
+ by 0x........: main (tc17_sembar.c:195)
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 (tc17_sembar.c:164)
+ by 0x........: main (tc17_sembar.c:195)
Thread #4 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 (tc17_sembar.c:164)
+ by 0x........: main (tc17_sembar.c:195)
Thread #5 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 (tc17_sembar.c:164)
+ by 0x........: main (tc17_sembar.c:195)
Possible data race during read of size 4 at 0x........
at 0x........: gomp_barrier_wait (tc17_sembar.c:122)
- by 0x........: child (tc17_sembar.c:140)
+ by 0x........: child (tc17_sembar.c:161)
by 0x........: mythread_wrapper (tc_intercepts.c:...)
by 0x........: ...
by 0x........: ...
@@ -40,7 +40,7 @@
Last consistently used lock for 0x........ was first observed
at 0x........: pthread_mutex_init (tc_intercepts.c:...)
by 0x........: gomp_barrier_init (tc17_sembar.c:46)
- by 0x........: main (tc17_sembar.c:161)
-done
+ by 0x........: main (tc17_sembar.c:192)
+done, result is 88, should be 88
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
[email protected]
https://lists.sourceforge.net/lists/listinfo/valgrind-developers
