|
From: <sv...@va...> - 2008-12-17 07:32:16
|
Author: bart
Date: 2008-12-17 07:32:09 +0000 (Wed, 17 Dec 2008)
New Revision: 8830
Log:
Fixed regression test tc20_verifywrap2, which was broken through r8829.
Modified:
trunk/drd/drd_clientobj.h
trunk/drd/drd_semaphore.c
trunk/drd/drd_semaphore.h
trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
Modified: trunk/drd/drd_clientobj.h
===================================================================
--- trunk/drd/drd_clientobj.h 2008-12-17 01:21:06 UTC (rev 8829)
+++ trunk/drd/drd_clientobj.h 2008-12-17 07:32:09 UTC (rev 8830)
@@ -88,7 +88,7 @@
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;
Modified: trunk/drd/drd_semaphore.c
===================================================================
--- trunk/drd/drd_semaphore.c 2008-12-17 01:21:06 UTC (rev 8829)
+++ trunk/drd/drd_semaphore.c 2008-12-17 07:32:09 UTC (rev 8830)
@@ -110,14 +110,14 @@
/** 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 @@
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 @@
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 @@
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 @@
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,
Modified: trunk/drd/drd_semaphore.h
===================================================================
--- trunk/drd/drd_semaphore.h 2008-12-17 01:21:06 UTC (rev 8829)
+++ trunk/drd/drd_semaphore.h 2008-12-17 07:32:09 UTC (rev 8830)
@@ -40,7 +40,7 @@
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,
Modified: trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
===================================================================
--- trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 2008-12-17 01:21:06 UTC (rev 8829)
+++ trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 2008-12-17 07:32:09 UTC (rev 8830)
@@ -128,7 +128,7 @@
---------------- 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 @@
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:?)
Modified: trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
===================================================================
--- trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b 2008-12-17 01:21:06 UTC (rev 8829)
+++ trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b 2008-12-17 07:32:09 UTC (rev 8830)
@@ -128,7 +128,7 @@
---------------- 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 @@
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:?)
Modified: trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
===================================================================
--- trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 2008-12-17 01:21:06 UTC (rev 8829)
+++ trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 2008-12-17 07:32:09 UTC (rev 8830)
@@ -134,7 +134,7 @@
---------------- 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 @@
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:?)
Modified: trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
===================================================================
--- trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc 2008-12-17 01:21:06 UTC (rev 8829)
+++ trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc 2008-12-17 07:32:09 UTC (rev 8830)
@@ -134,7 +134,7 @@
---------------- 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 @@
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:?)
Modified: trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
===================================================================
--- trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 2008-12-17 01:21:06 UTC (rev 8829)
+++ trunk/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 2008-12-17 07:32:09 UTC (rev 8830)
@@ -134,13 +134,13 @@
---------------- 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:?)
|