From: Bart Van Assche Date: Sat, 8 Mar 2008 08:10:19 +0000 (+0000) Subject: More finetuning of output filtering. X-Git-Tag: svn/VALGRIND_3_4_0~949 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=7a2b2463ac51a76b267bc7d7a16f7b09f5e7f422;p=thirdparty%2Fvalgrind.git More finetuning of output filtering. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7591 --- diff --git a/exp-drd/tests/filter_stderr b/exp-drd/tests/filter_stderr index f18e8c70fb..a4b8e19cd4 100755 --- a/exp-drd/tests/filter_stderr +++ b/exp-drd/tests/filter_stderr @@ -17,8 +17,7 @@ sed \ -e "/^NOTE: This is an Experimental-Class Valgrind Tool.$/d" \ -e "/^Copyright (C) 2006-200., and GNU GPL'd, by Bart Van Assche.$/d" \ -e "s/\(pthread_create.c:[0-9]*\)/in libpthread-?.?.so/" \ --e "s/in [^ ]*libpthread-[0-9]*\.[0-9]*\.so/in libpthread-?.?.so/" \ --e "s/in [^ ]*libpthread-[0-9]*\.[0-9]*\.[0-9]*\.so/in libpthread-?.?.so/" \ +-e "s:[A-Za-z_]* (in [^ ]*libpthread-[0-9.]*\.so):(within libpthread-?.?.so):" \ -e "s/ (\([a-zA-Z_]*\.c\):[0-9]*)/ (\1:?)/" \ -e "s/ (\([a-zA-Z_]*\.cpp\):[0-9]*)/ (\1:?)/" | diff --git a/exp-drd/tests/hg03_inherit.stderr.exp b/exp-drd/tests/hg03_inherit.stderr.exp index f1d185e298..fbd7110887 100644 --- a/exp-drd/tests/hg03_inherit.stderr.exp +++ b/exp-drd/tests/hg03_inherit.stderr.exp @@ -3,7 +3,7 @@ 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........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Location 0x........ is 0 bytes inside shared[1], declared at hg03_inherit.c:11, in frame #? of thread 3 @@ -11,14 +11,14 @@ 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) + at 0x........: (within 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........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Location 0x........ is 0 bytes inside shared[1], declared at hg03_inherit.c:11, in frame #? of thread 3 @@ -26,7 +26,7 @@ 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) + at 0x........: (within /lib/ld-2.6.1.so) by 0x........: pthread_join (drd_intercepts.c:?) by 0x........: main (hg03_inherit.c:63) diff --git a/exp-drd/tests/hg04_race.stderr.exp b/exp-drd/tests/hg04_race.stderr.exp index abb00f2acc..c0dd806540 100644 --- a/exp-drd/tests/hg04_race.stderr.exp +++ b/exp-drd/tests/hg04_race.stderr.exp @@ -3,7 +3,7 @@ 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........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Location 0x........ is 0 bytes inside local var "shared" declared at hg04_race.c:6, in frame #? of thread 2 @@ -15,7 +15,7 @@ Other segment end (thread 2) 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........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Location 0x........ is 0 bytes inside local var "shared" declared at hg04_race.c:6, in frame #? of thread 2 diff --git a/exp-drd/tests/hg05_race2.stderr.exp b/exp-drd/tests/hg05_race2.stderr.exp index e83187204d..acf95304e0 100644 --- a/exp-drd/tests/hg05_race2.stderr.exp +++ b/exp-drd/tests/hg05_race2.stderr.exp @@ -3,7 +3,7 @@ Thread 2: Conflicting load by thread 2 at 0x........ size 4 at 0x........: th (hg05_race2.c:17) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Location 0x........ is 0 bytes inside foo.poot[5].plop[11], declared at hg05_race2.c:24, in frame #? of thread 1 @@ -15,7 +15,7 @@ Other segment end (thread 2) Conflicting store by thread 2 at 0x........ size 4 at 0x........: th (hg05_race2.c:17) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Location 0x........ is 0 bytes inside foo.poot[5].plop[11], declared at hg05_race2.c:24, in frame #? of thread 1 diff --git a/exp-drd/tests/pth_cond_race.stderr.exp b/exp-drd/tests/pth_cond_race.stderr.exp index a097b0a636..00746c9dbb 100644 --- a/exp-drd/tests/pth_cond_race.stderr.exp +++ b/exp-drd/tests/pth_cond_race.stderr.exp @@ -4,7 +4,7 @@ Race condition: condition variable 0x........ has been signalled but the associa at 0x........: pthread_cond_signal* (drd_intercepts.c:?) by 0x........: thread_func (pth_cond_race.c:?) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) ERROR SUMMARY: 1 errors from 1 contexts (suppressed: 0 from 0) diff --git a/exp-drd/tests/rwlock_race.stderr.exp b/exp-drd/tests/rwlock_race.stderr.exp index ef673b226c..211b727e5e 100644 --- a/exp-drd/tests/rwlock_race.stderr.exp +++ b/exp-drd/tests/rwlock_race.stderr.exp @@ -3,7 +3,7 @@ Thread 2: Conflicting load by thread 2 at 0x........ size 4 at 0x........: thread (rwlock_race.c:?) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Location 0x........ is 0 bytes inside local var "s_racy" declared at rwlock_race.c:17, in frame #? of thread 2 @@ -15,7 +15,7 @@ Other segment end (thread 2) Conflicting store by thread 2 at 0x........ size 4 at 0x........: thread (rwlock_race.c:?) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Location 0x........ is 0 bytes inside local var "s_racy" declared at rwlock_race.c:17, in frame #? of thread 2 diff --git a/exp-drd/tests/tc09_bad_unlock.stderr.exp b/exp-drd/tests/tc09_bad_unlock.stderr.exp index 052df38c19..ef78d36814 100644 --- a/exp-drd/tests/tc09_bad_unlock.stderr.exp +++ b/exp-drd/tests/tc09_bad_unlock.stderr.exp @@ -9,7 +9,7 @@ Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1 at 0x........: pthread_mutex_unlock (drd_intercepts.c:?) by 0x........: child_fn (tc09_bad_unlock.c:11) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Thread 1: @@ -32,7 +32,7 @@ Mutex not locked by calling thread: mutex 0x........, recursion count 1, owner 1 at 0x........: pthread_mutex_unlock (drd_intercepts.c:?) by 0x........: child_fn (tc09_bad_unlock.c:11) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Thread 1: diff --git a/exp-drd/tests/tc23_bogus_condwait.stderr.exp b/exp-drd/tests/tc23_bogus_condwait.stderr.exp index 379122a194..7b6853eec4 100644 --- a/exp-drd/tests/tc23_bogus_condwait.stderr.exp +++ b/exp-drd/tests/tc23_bogus_condwait.stderr.exp @@ -8,7 +8,7 @@ Race condition: condition variable 0x........ has been signalled but the associa at 0x........: pthread_cond_signal* (drd_intercepts.c:?) by 0x........: rescue_me (tc23_bogus_condwait.c:20) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Thread 1: @@ -21,7 +21,7 @@ Race condition: condition variable 0x........ has been signalled but the associa at 0x........: pthread_cond_signal* (drd_intercepts.c:?) by 0x........: rescue_me (tc23_bogus_condwait.c:24) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Thread 1: @@ -34,7 +34,7 @@ Race condition: condition variable 0x........ has been signalled but the associa at 0x........: pthread_cond_signal* (drd_intercepts.c:?) by 0x........: rescue_me (tc23_bogus_condwait.c:28) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) Thread 1: @@ -47,7 +47,7 @@ Race condition: condition variable 0x........ has been signalled but the associa at 0x........: pthread_cond_signal* (drd_intercepts.c:?) by 0x........: rescue_me (tc23_bogus_condwait.c:32) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) The impossible happened: mutex 0x........ is locked simultaneously by two threads (recursion count 1, owners 2 and 1) ! @@ -56,7 +56,7 @@ Mutex not locked by calling thread: mutex 0x........, recursion count 2, owner 1 at 0x........: pthread_mutex_unlock (drd_intercepts.c:?) by 0x........: grab_the_lock (tc23_bogus_condwait.c:42) by 0x........: vg_thread_wrapper (drd_intercepts.c:?) - by 0x........: start_thread (in libpthread-?.?.so) + by 0x........: (within libpthread-?.?.so) by 0x........: clone (in /...libc...) ERROR SUMMARY: 9 errors from 9 contexts (suppressed: 0 from 0)