From: Bart Van Assche Date: Mon, 25 Feb 2008 20:25:41 +0000 (+0000) Subject: Fixed most Fedora 8 regression test failures. X-Git-Tag: svn/VALGRIND_3_4_0~1033 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=e195c97628b8e2720597a9ba07ccd43b2bfb3a6e;p=thirdparty%2Fvalgrind.git Fixed most Fedora 8 regression test failures. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7464 --- diff --git a/exp-drd/tests/hg03_inherit.stderr.exp b/exp-drd/tests/hg03_inherit.stderr.exp index 274c6a726e..48eb19a371 100644 --- a/exp-drd/tests/hg03_inherit.stderr.exp +++ b/exp-drd/tests/hg03_inherit.stderr.exp @@ -5,7 +5,7 @@ Conflicting store by thread 3 at 0x........ size 4 by 0x........: vg_thread_wrapper (drd_intercepts.c:?) by 0x........: start_thread (in libpthread-?.?.so) by 0x........: clone (in /...libc...) -Allocation context: unknown +Allocation context: shared (offset 4, size 8) in hg03_inherit, NONE:BSS Other segment start (thread 1) at 0x........: pthread_join (drd_intercepts.c:?) by 0x........: main (hg03_inherit.c:49) @@ -19,7 +19,7 @@ Conflicting store by thread 3 at 0x........ size 4 by 0x........: vg_thread_wrapper (drd_intercepts.c:?) by 0x........: start_thread (in libpthread-?.?.so) by 0x........: clone (in /...libc...) -Allocation context: unknown +Allocation context: shared (offset 4, size 8) in hg03_inherit, NONE:BSS Other segment start (thread 1) at 0x........: pthread_join (drd_intercepts.c:?) by 0x........: main (hg03_inherit.c:49) diff --git a/exp-drd/tests/hg03_inherit.stderr.exp2 b/exp-drd/tests/hg03_inherit.stderr.exp2 new file mode 100644 index 0000000000..274c6a726e --- /dev/null +++ b/exp-drd/tests/hg03_inherit.stderr.exp2 @@ -0,0 +1,31 @@ + +Thread 3: +Conflicting store by thread 3 at 0x........ size 4 + at 0x........: t2 (hg03_inherit.c:28) + by 0x........: vg_thread_wrapper (drd_intercepts.c:?) + by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: clone (in /...libc...) +Allocation context: unknown +Other segment start (thread 1) + at 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (hg03_inherit.c:49) +Other segment end (thread 1) + at 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (hg03_inherit.c:63) + +Conflicting store by thread 3 at 0x........ size 4 + at 0x........: t2 (hg03_inherit.c:29) + by 0x........: vg_thread_wrapper (drd_intercepts.c:?) + by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: clone (in /...libc...) +Allocation context: unknown +Other segment start (thread 1) + at 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (hg03_inherit.c:49) +Other segment end (thread 1) + at 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (hg03_inherit.c:63) + +ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0) diff --git a/exp-drd/tests/hg04_race.stderr.exp b/exp-drd/tests/hg04_race.stderr.exp index c713aff4b9..9f41dc8642 100644 --- a/exp-drd/tests/hg04_race.stderr.exp +++ b/exp-drd/tests/hg04_race.stderr.exp @@ -5,7 +5,7 @@ Conflicting load by thread 2 at 0x........ size 4 by 0x........: vg_thread_wrapper (drd_intercepts.c:?) by 0x........: start_thread (in libpthread-?.?.so) by 0x........: clone (in /...libc...) -Allocation context: unknown +Allocation context: shared (offset 0, size 4) in hg04_race, NONE:BSS Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) @@ -16,7 +16,7 @@ Conflicting store by thread 2 at 0x........ size 4 by 0x........: vg_thread_wrapper (drd_intercepts.c:?) by 0x........: start_thread (in libpthread-?.?.so) by 0x........: clone (in /...libc...) -Allocation context: unknown +Allocation context: shared (offset 0, size 4) in hg04_race, NONE:BSS Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) diff --git a/exp-drd/tests/hg04_race.stderr.exp2 b/exp-drd/tests/hg04_race.stderr.exp2 new file mode 100644 index 0000000000..c713aff4b9 --- /dev/null +++ b/exp-drd/tests/hg04_race.stderr.exp2 @@ -0,0 +1,25 @@ + +Thread 2: +Conflicting load by thread 2 at 0x........ size 4 + at 0x........: th (hg04_race.c:10) + by 0x........: vg_thread_wrapper (drd_intercepts.c:?) + by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: clone (in /...libc...) +Allocation context: unknown +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 2 at 0x........ size 4 + at 0x........: th (hg04_race.c:10) + by 0x........: vg_thread_wrapper (drd_intercepts.c:?) + by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: clone (in /...libc...) +Allocation context: unknown +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0) diff --git a/exp-drd/tests/hg05_race2.stderr.exp b/exp-drd/tests/hg05_race2.stderr.exp index 4d57a297b3..c4999e2dda 100644 --- a/exp-drd/tests/hg05_race2.stderr.exp +++ b/exp-drd/tests/hg05_race2.stderr.exp @@ -5,7 +5,7 @@ Conflicting load by thread 2 at 0x........ size 4 by 0x........: vg_thread_wrapper (drd_intercepts.c:?) by 0x........: start_thread (in libpthread-?.?.so) by 0x........: clone (in /...libc...) -Allocation context: stack of thread 1, offset -5584 +Allocation context: stack of thread 1, offset ... Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) @@ -16,7 +16,7 @@ Conflicting store by thread 2 at 0x........ size 4 by 0x........: vg_thread_wrapper (drd_intercepts.c:?) by 0x........: start_thread (in libpthread-?.?.so) by 0x........: clone (in /...libc...) -Allocation context: stack of thread 1, offset -5584 +Allocation context: stack of thread 1, offset ... Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) diff --git a/exp-drd/tests/pth_barrier.stderr.exp-thread2b b/exp-drd/tests/pth_barrier.stderr.exp-thread2b new file mode 100644 index 0000000000..dbcead415a --- /dev/null +++ b/exp-drd/tests/pth_barrier.stderr.exp-thread2b @@ -0,0 +1,25 @@ + +Thread 2: +Conflicting store by thread 2 at 0x........ size 4 + at 0x........: threadfunc (pth_barrier.c:?) + by 0x........: vg_thread_wrapper (drd_intercepts.c:?) + by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: clone (in /...libc...) +Allocation context: heap, offset 0 in block at 0x........ of size 4 + at 0x........: malloc (vg_replace_malloc.c:...) + by 0x........: barriers_and_races (pth_barrier.c:?) + by 0x........: main (pth_barrier.c:?) +Other segment start (thread 3) + at 0x........: pthread_barrier_wait (drd_intercepts.c:?) + by 0x........: threadfunc (pth_barrier.c:?) + by 0x........: vg_thread_wrapper (drd_intercepts.c:?) + by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: clone (in /...libc...) +Other segment end (thread 3) + at 0x........: __lll_lock_wait (in libpthread-?.?.so) + by 0x........: threadfunc (pth_barrier.c:?) + by 0x........: vg_thread_wrapper (drd_intercepts.c:?) + by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: clone (in /...libc...) + +ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0) diff --git a/exp-drd/tests/tc01_simple_race.stderr.exp b/exp-drd/tests/tc01_simple_race.stderr.exp index 8a2b91a99b..a5b9d88558 100644 --- a/exp-drd/tests/tc01_simple_race.stderr.exp +++ b/exp-drd/tests/tc01_simple_race.stderr.exp @@ -1,7 +1,7 @@ Conflicting load by thread 1 at 0x........ size 4 at 0x........: main (tc01_simple_race.c:28) -Allocation context: unknown +Allocation context: x (offset 0, size 4) in tc01_simple_race, NONE:BSS Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) @@ -9,7 +9,7 @@ Other segment end (thread 2) Conflicting store by thread 1 at 0x........ size 4 at 0x........: main (tc01_simple_race.c:28) -Allocation context: unknown +Allocation context: x (offset 0, size 4) in tc01_simple_race, NONE:BSS Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) diff --git a/exp-drd/tests/tc01_simple_race.stderr.exp2 b/exp-drd/tests/tc01_simple_race.stderr.exp2 new file mode 100644 index 0000000000..8a2b91a99b --- /dev/null +++ b/exp-drd/tests/tc01_simple_race.stderr.exp2 @@ -0,0 +1,18 @@ + +Conflicting load by thread 1 at 0x........ size 4 + at 0x........: main (tc01_simple_race.c:28) +Allocation context: unknown +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 1 at 0x........ size 4 + at 0x........: main (tc01_simple_race.c:28) +Allocation context: unknown +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0) diff --git a/exp-drd/tests/tc07_hbl1.stderr.exp b/exp-drd/tests/tc07_hbl1.stderr.exp index 10f0ca1088..d74ef1c06d 100644 --- a/exp-drd/tests/tc07_hbl1.stderr.exp +++ b/exp-drd/tests/tc07_hbl1.stderr.exp @@ -1,7 +1,7 @@ Conflicting load by thread 1 at 0x........ size 4 at 0x........: main (tc07_hbl1.c:68) -Allocation context: unknown +Allocation context: x (offset 0, size 4) in tc07_hbl1, NONE:BSS Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) @@ -9,7 +9,7 @@ Other segment end (thread 2) Conflicting store by thread 1 at 0x........ size 4 at 0x........: main (tc07_hbl1.c:68) -Allocation context: unknown +Allocation context: x (offset 0, size 4) in tc07_hbl1, NONE:BSS Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) diff --git a/exp-drd/tests/tc07_hbl1.stderr.exp2 b/exp-drd/tests/tc07_hbl1.stderr.exp2 new file mode 100644 index 0000000000..10f0ca1088 --- /dev/null +++ b/exp-drd/tests/tc07_hbl1.stderr.exp2 @@ -0,0 +1,18 @@ + +Conflicting load by thread 1 at 0x........ size 4 + at 0x........: main (tc07_hbl1.c:68) +Allocation context: unknown +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 1 at 0x........ size 4 + at 0x........: main (tc07_hbl1.c:68) +Allocation context: unknown +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0) diff --git a/exp-drd/tests/tc11_XCHG.stderr.exp b/exp-drd/tests/tc11_XCHG.stderr.exp index f715e4b002..c99b1e9cec 100644 --- a/exp-drd/tests/tc11_XCHG.stderr.exp +++ b/exp-drd/tests/tc11_XCHG.stderr.exp @@ -1,7 +1,7 @@ Conflicting load by thread 1 at 0x........ size 4 at 0x........: main (tc11_XCHG.c:78) -Allocation context: unknown +Allocation context: x (offset 0, size 4) in tc11_XCHG, NONE:BSS Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) @@ -9,7 +9,7 @@ Other segment end (thread 2) Conflicting store by thread 1 at 0x........ size 4 at 0x........: main (tc11_XCHG.c:78) -Allocation context: unknown +Allocation context: x (offset 0, size 4) in tc11_XCHG, NONE:BSS Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) diff --git a/exp-drd/tests/tc11_XCHG.stderr.exp2 b/exp-drd/tests/tc11_XCHG.stderr.exp2 new file mode 100644 index 0000000000..f715e4b002 --- /dev/null +++ b/exp-drd/tests/tc11_XCHG.stderr.exp2 @@ -0,0 +1,18 @@ + +Conflicting load by thread 1 at 0x........ size 4 + at 0x........: main (tc11_XCHG.c:78) +Allocation context: unknown +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 1 at 0x........ size 4 + at 0x........: main (tc11_XCHG.c:78) +Allocation context: unknown +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0) diff --git a/exp-drd/tests/tc16_byterace.stderr.exp b/exp-drd/tests/tc16_byterace.stderr.exp index 84db3ce31f..00cbf56b24 100644 --- a/exp-drd/tests/tc16_byterace.stderr.exp +++ b/exp-drd/tests/tc16_byterace.stderr.exp @@ -1,7 +1,7 @@ Conflicting load by thread 1 at 0x........ size 1 at 0x........: main (tc16_byterace.c:34) -Allocation context: unknown +Allocation context: bytes (offset 4, size 10) in tc16_byterace, NONE:BSS Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) @@ -9,7 +9,7 @@ Other segment end (thread 2) Conflicting store by thread 1 at 0x........ size 1 at 0x........: main (tc16_byterace.c:34) -Allocation context: unknown +Allocation context: bytes (offset 4, size 10) in tc16_byterace, NONE:BSS Other segment start (thread 2) (thread finished, call stack no longer available) Other segment end (thread 2) diff --git a/exp-drd/tests/tc16_byterace.stderr.exp2 b/exp-drd/tests/tc16_byterace.stderr.exp2 new file mode 100644 index 0000000000..84db3ce31f --- /dev/null +++ b/exp-drd/tests/tc16_byterace.stderr.exp2 @@ -0,0 +1,18 @@ + +Conflicting load by thread 1 at 0x........ size 1 + at 0x........: main (tc16_byterace.c:34) +Allocation context: unknown +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 1 at 0x........ size 1 + at 0x........: main (tc16_byterace.c:34) +Allocation context: unknown +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +ERROR SUMMARY: 2 errors from 2 contexts (suppressed: 0 from 0) diff --git a/exp-drd/tests/tc22_exit_w_lock.stderr.exp-32bit b/exp-drd/tests/tc22_exit_w_lock.stderr.exp-32bit new file mode 100644 index 0000000000..c443f2f7d4 --- /dev/null +++ b/exp-drd/tests/tc22_exit_w_lock.stderr.exp-32bit @@ -0,0 +1,134 @@ + +Conflicting load by thread 1 at 0x........ size 4 + at 0x........: __deallocate_stack (in libpthread-?.?.so) + by 0x........: __free_tcb (in libpthread-?.?.so) + by 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (tc22_exit_w_lock.c:43) +Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 1 at 0x........ size 4 + at 0x........: __deallocate_stack (in libpthread-?.?.so) + by 0x........: __free_tcb (in libpthread-?.?.so) + by 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (tc22_exit_w_lock.c:43) +Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 1 at 0x........ size 4 + at 0x........: __deallocate_stack (in libpthread-?.?.so) + by 0x........: __free_tcb (in libpthread-?.?.so) + by 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (tc22_exit_w_lock.c:43) +Allocation context: stack_used (offset 4, size 8) in libpthread-?.?.so, libpthread.so.0:Data +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 1 at 0x........ size 4 + at 0x........: __deallocate_stack (in libpthread-?.?.so) + by 0x........: __free_tcb (in libpthread-?.?.so) + by 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (tc22_exit_w_lock.c:43) +Allocation context: stack_used (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting load by thread 1 at 0x........ size 4 + at 0x........: __deallocate_stack (in libpthread-?.?.so) + by 0x........: __free_tcb (in libpthread-?.?.so) + by 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (tc22_exit_w_lock.c:43) +Allocation context: stack_cache (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 1 at 0x........ size 4 + at 0x........: __deallocate_stack (in libpthread-?.?.so) + by 0x........: __free_tcb (in libpthread-?.?.so) + by 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (tc22_exit_w_lock.c:43) +Allocation context: stack_cache (offset 4, size 8) in libpthread-?.?.so, libpthread.so.0:Data +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting load by thread 1 at 0x........ size 4 + at 0x........: __deallocate_stack (in libpthread-?.?.so) + by 0x........: __free_tcb (in libpthread-?.?.so) + by 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (tc22_exit_w_lock.c:43) +Allocation context: stack_cache_actsize (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 1 at 0x........ size 4 + at 0x........: __deallocate_stack (in libpthread-?.?.so) + by 0x........: __free_tcb (in libpthread-?.?.so) + by 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (tc22_exit_w_lock.c:43) +Allocation context: stack_cache (offset 0, size 8) in libpthread-?.?.so, libpthread.so.0:Data +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 1 at 0x........ size 4 + at 0x........: __deallocate_stack (in libpthread-?.?.so) + by 0x........: __free_tcb (in libpthread-?.?.so) + by 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (tc22_exit_w_lock.c:43) +Allocation context: stack_cache_actsize (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting load by thread 1 at 0x........ size 4 + at 0x........: __deallocate_stack (in libpthread-?.?.so) + by 0x........: __free_tcb (in libpthread-?.?.so) + by 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (tc22_exit_w_lock.c:43) +Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +Conflicting store by thread 1 at 0x........ size 4 + at 0x........: __deallocate_stack (in libpthread-?.?.so) + by 0x........: __free_tcb (in libpthread-?.?.so) + by 0x........: pthread_join (in libpthread-?.?.so) + by 0x........: pthread_join (drd_intercepts.c:?) + by 0x........: main (tc22_exit_w_lock.c:43) +Allocation context: stack_cache_lock (offset 0, size 4) in libpthread-?.?.so, libpthread.so.0:BSS +Other segment start (thread 2) + (thread finished, call stack no longer available) +Other segment end (thread 2) + (thread finished, call stack no longer available) + +ERROR SUMMARY: 11 errors from 11 contexts (suppressed: 0 from 0)