From: Bart Van Assche Date: Wed, 17 Dec 2008 07:32:09 +0000 (+0000) Subject: Fixed regression test tc20_verifywrap2, which was broken through r8829. X-Git-Tag: svn/VALGRIND_3_4_0~67 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7535e7be943c2926a81fad45a523f05a2b515430;p=thirdparty%2Fvalgrind.git Fixed regression test tc20_verifywrap2, which was broken through r8829. git-svn-id: svn://svn.valgrind.org/valgrind/trunk@8830 --- diff --git a/drd/drd_clientobj.h b/drd/drd_clientobj.h index 19a361535f..39e97f94f3 100644 --- a/drd/drd_clientobj.h +++ b/drd/drd_clientobj.h @@ -88,7 +88,7 @@ struct semaphore_info ObjType type; void (*cleanup)(union drd_clientobj*); ExeContext* first_observed_at; - UWord value; // Semaphore value. + UInt value; // Semaphore value. UWord waiters; // Number of threads inside sem_wait(). DrdThreadId last_sem_post_tid; // Thread ID associated with last sem_post(). Segment* last_sem_post_segment; diff --git a/drd/drd_semaphore.c b/drd/drd_semaphore.c index 8f585d8731..0f163053d0 100644 --- a/drd/drd_semaphore.c +++ b/drd/drd_semaphore.c @@ -110,14 +110,14 @@ static struct semaphore_info* semaphore_get(const Addr semaphore) /** Called before sem_init(). */ struct semaphore_info* semaphore_init(const Addr semaphore, - const Word pshared, const UWord value) + const Word pshared, const UInt value) { struct semaphore_info* p; if (s_trace_semaphore) { VG_(message)(Vg_UserMsg, - "[%d/%d] semaphore_init 0x%lx value %ld", + "[%d/%d] semaphore_init 0x%lx value %u", VG_(get_running_tid)(), thread_get_running_tid(), semaphore, @@ -153,7 +153,7 @@ void semaphore_destroy(const Addr semaphore) if (s_trace_semaphore) { VG_(message)(Vg_UserMsg, - "[%d/%d] semaphore_destroy 0x%lx value %ld", + "[%d/%d] semaphore_destroy 0x%lx value %u", VG_(get_running_tid)(), thread_get_running_tid(), semaphore, @@ -183,7 +183,7 @@ void semaphore_pre_wait(const Addr semaphore) if (s_trace_semaphore) { VG_(message)(Vg_UserMsg, - "[%d/%d] semaphore_pre_wait 0x%lx value %ld", + "[%d/%d] semaphore_pre_wait 0x%lx value %u", VG_(get_running_tid)(), thread_get_running_tid(), semaphore, @@ -208,7 +208,7 @@ void semaphore_post_wait(const DrdThreadId tid, const Addr semaphore, if (s_trace_semaphore) { VG_(message)(Vg_UserMsg, - "[%d/%d] semaphore_post_wait 0x%lx value %ld", + "[%d/%d] semaphore_post_wait 0x%lx value %u", VG_(get_running_tid)(), thread_get_running_tid(), semaphore, @@ -251,7 +251,7 @@ void semaphore_pre_post(const DrdThreadId tid, const Addr semaphore) if (s_trace_semaphore) { VG_(message)(Vg_UserMsg, - "[%d/%d] semaphore_post 0x%lx value %ld", + "[%d/%d] semaphore_post 0x%lx value %u", VG_(get_running_tid)(), thread_get_running_tid(), semaphore, diff --git a/drd/drd_semaphore.h b/drd/drd_semaphore.h index 2b5107fa67..80dde06ddb 100644 --- a/drd/drd_semaphore.h +++ b/drd/drd_semaphore.h @@ -40,7 +40,7 @@ struct semaphore_info; void semaphore_set_trace(const Bool trace_semaphore); struct semaphore_info* semaphore_init(const Addr semaphore, - const Word pshared, const UWord value); + const Word pshared, const UInt value); void semaphore_destroy(const Addr semaphore); void semaphore_pre_wait(const Addr semaphore); void semaphore_post_wait(const DrdThreadId tid, const Addr semaphore, diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 index e33af90848..987a55b4cd 100644 --- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 +++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 @@ -128,7 +128,7 @@ rwlock 0x........ was first observed at: ---------------- sem_* ---------------- -[1/1] semaphore_init 0x........ value -1 +[1/1] semaphore_init 0x........ value 4294967295 [1/1] semaphore_init 0x........ value 0 Semaphore reinitialization: semaphore 0x........ @@ -141,7 +141,7 @@ semaphore 0x........ was first observed at: FIXME: can't figure out how to verify wrap of sem_destroy [1/1] semaphore_pre_wait 0x........ value 0 -[1/1] semaphore_post_wait 0x........ value -1 +[1/1] semaphore_post_wait 0x........ value 4294967295 Invalid semaphore: semaphore 0x........ at 0x........: sem_wait* (drd_pthread_intercepts.c:?) diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b index b50c673e3a..9cf6853256 100644 --- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b +++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b @@ -128,7 +128,7 @@ rwlock 0x........ was first observed at: ---------------- sem_* ---------------- -[1/1] semaphore_init 0x........ value -1 +[1/1] semaphore_init 0x........ value 4294967295 [1/1] semaphore_init 0x........ value 0 Semaphore reinitialization: semaphore 0x........ @@ -141,7 +141,7 @@ semaphore 0x........ was first observed at: FIXME: can't figure out how to verify wrap of sem_destroy [1/1] semaphore_pre_wait 0x........ value 0 -[1/1] semaphore_post_wait 0x........ value -1 +[1/1] semaphore_post_wait 0x........ value 4294967295 Invalid semaphore: semaphore 0x........ at 0x........: sem_wait* (drd_pthread_intercepts.c:?) diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 index 5584e5382b..5eff6ac6bc 100644 --- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 +++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 @@ -134,7 +134,7 @@ rwlock 0x........ was first observed at: ---------------- sem_* ---------------- -[1/1] semaphore_init 0x........ value -1 +[1/1] semaphore_init 0x........ value 4294967295 [1/1] semaphore_init 0x........ value 0 Semaphore reinitialization: semaphore 0x........ @@ -147,7 +147,7 @@ semaphore 0x........ was first observed at: FIXME: can't figure out how to verify wrap of sem_destroy [1/1] semaphore_pre_wait 0x........ value 0 -[1/1] semaphore_post_wait 0x........ value -1 +[1/1] semaphore_post_wait 0x........ value 4294967295 Invalid semaphore: semaphore 0x........ at 0x........: sem_wait* (drd_pthread_intercepts.c:?) diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc index f79d69a885..427e3f2e07 100644 --- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc +++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc @@ -134,7 +134,7 @@ rwlock 0x........ was first observed at: ---------------- sem_* ---------------- -[1/1] semaphore_init 0x........ value -1 +[1/1] semaphore_init 0x........ value 4294967295 [1/1] semaphore_init 0x........ value 0 Semaphore reinitialization: semaphore 0x........ @@ -147,7 +147,7 @@ semaphore 0x........ was first observed at: FIXME: can't figure out how to verify wrap of sem_destroy [1/1] semaphore_pre_wait 0x........ value 0 -[1/1] semaphore_post_wait 0x........ value -1 +[1/1] semaphore_post_wait 0x........ value 4294967295 Invalid semaphore: semaphore 0x........ at 0x........: sem_wait* (drd_pthread_intercepts.c:?) diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 index e551bada2f..accfaef18e 100644 --- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 +++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 @@ -134,13 +134,13 @@ rwlock 0x........ was first observed at: ---------------- sem_* ---------------- -[1/1] semaphore_init 0x........ value -1 +[1/1] semaphore_init 0x........ value 4294967295 [1/1] semaphore_init 0x........ value 0 FIXME: can't figure out how to verify wrap of sem_destroy [1/1] semaphore_pre_wait 0x........ value 0 -[1/1] semaphore_post_wait 0x........ value -1 +[1/1] semaphore_post_wait 0x........ value 4294967295 Invalid semaphore: semaphore 0x........ at 0x........: sem_wait* (drd_pthread_intercepts.c:?)