Labels printed with semaphore tracing enabled do now match the function names assigne...

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@10570

diff --git a/drd/drd_semaphore.c b/drd/drd_semaphore.c
index e064310b32b78e7e865869ccd76e0a4b34a2ea22..de686990b78c073037c6994bc2de58184def79a3 100644 (file)
--- a/drd/drd_semaphore.c
+++ b/drd/drd_semaphore.c
@@ -177,7 +177,7 @@ struct semaphore_info* DRD_(semaphore_init)(const Addr semaphore,
    if (s_trace_semaphore)
    {
       VG_(message)(Vg_UserMsg,
-                   "[%d] semaphore_init      0x%lx value %u\n",
+                   "[%d] sem_init      0x%lx value %u\n",
                    DRD_(thread_get_running_tid)(),
                    semaphore,
                    value);
@@ -229,7 +229,7 @@ void DRD_(semaphore_destroy)(const Addr semaphore)
    if (s_trace_semaphore)
    {
       VG_(message)(Vg_UserMsg,
-                   "[%d] semaphore_destroy   0x%lx value %u\n",
+                   "[%d] sem_destroy   0x%lx value %u\n",
                    DRD_(thread_get_running_tid)(),
                    semaphore,
                    p ? p->value : 0);
@@ -260,8 +260,8 @@ struct semaphore_info* DRD_(semaphore_open)(const Addr semaphore,
    if (s_trace_semaphore)
    {
       VG_(message)(Vg_UserMsg,
-                   "[%d] semaphore_open      0x%lx name %s"
-                   " oflag %ld mode 0%lo value %u\n",
+                   "[%d] sem_open      0x%lx name %s"
+                   " oflag %ld mode 0x%lx value %u\n",
                    DRD_(thread_get_running_tid)(),
                    semaphore, name, oflag, mode, value);
    }
@@ -306,7 +306,7 @@ void DRD_(semaphore_close)(const Addr semaphore)
    if (s_trace_semaphore)
    {
       VG_(message)(Vg_UserMsg,
-                   "[%d] semaphore_close     0x%lx value %u\n",
+                   "[%d] sem_close     0x%lx value %u\n",
                    DRD_(thread_get_running_tid)(),
                    semaphore,
                    p ? p->value : 0);
@@ -361,7 +361,7 @@ void DRD_(semaphore_post_wait)(const DrdThreadId tid, const Addr semaphore,
    if (s_trace_semaphore)
    {
       VG_(message)(Vg_UserMsg,
-                   "[%d] semaphore_wait      0x%lx value %u -> %u\n",
+                   "[%d] sem_wait      0x%lx value %u -> %u\n",
                    DRD_(thread_get_running_tid)(),
                    semaphore,
                    p ? p->value : 0,
@@ -425,7 +425,7 @@ void DRD_(semaphore_pre_post)(const DrdThreadId tid, const Addr semaphore)
    if (s_trace_semaphore)
    {
       VG_(message)(Vg_UserMsg,
-                   "[%d] semaphore_post      0x%lx value %u -> %u\n",
+                   "[%d] sem_post      0x%lx value %u -> %u\n",
                    DRD_(thread_get_running_tid)(),
                    semaphore,
                    p->value - 1, p->value);

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
index bf9571cb6d2b2918dcb15784cea5a177a86864aa..185f30b64d8d4b8bece65c02abf7143f2d75fcda 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3
@@ -117,8 +117,8 @@ rwlock 0x........ was first observed at:
 
 ---------------- sem_* ----------------
 
-[1] semaphore_init      0x........ value 4294967295
-[1] semaphore_init      0x........ value 0
+[1] sem_init      0x........ value 4294967295
+[1] sem_init      0x........ value 0
 
 Semaphore reinitialization: semaphore 0x........
    at 0x........: sem_init* (drd_pthread_intercepts.c:?)
@@ -129,7 +129,7 @@ semaphore 0x........ was first observed at:
 
 FIXME: can't figure out how to verify wrap of sem_destroy
 
-[1] semaphore_wait      0x........ value 0 -> 4294967295
+[1] sem_wait      0x........ value 0 -> 4294967295
 
 Invalid semaphore: semaphore 0x........
    at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
@@ -137,11 +137,11 @@ Invalid semaphore: semaphore 0x........
 semaphore 0x........ was first observed at:
    at 0x........: sem_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:228)
-[1] semaphore_post      0x........ value 4294967295 -> 0
+[1] sem_post      0x........ value 4294967295 -> 0
 
 FIXME: can't figure out how to verify wrap of sem_post
 
-[1] semaphore_destroy   0x........ value 0
+[1] sem_destroy   0x........ value 0
 
 ------------ dealloc of mem holding locks ------------
 

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
index 8791b8cb716dc05052f88f1da461cc7b55e42b7b..19d5156b4b63974bdbf1df56d1736313dc19b2f5 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.3-b
@@ -128,8 +128,8 @@ rwlock 0x........ was first observed at:
 
 ---------------- sem_* ----------------
 
-[1] semaphore_init      0x........ value 4294967295
-[1] semaphore_init      0x........ value 0
+[1] sem_init      0x........ value 4294967295
+[1] sem_init      0x........ value 0
 
 Semaphore reinitialization: semaphore 0x........
    at 0x........: sem_init* (drd_pthread_intercepts.c:?)
@@ -140,7 +140,7 @@ semaphore 0x........ was first observed at:
 
 FIXME: can't figure out how to verify wrap of sem_destroy
 
-[1] semaphore_wait      0x........ value 0 -> 4294967295
+[1] sem_wait      0x........ value 0 -> 4294967295
 
 Invalid semaphore: semaphore 0x........
    at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
@@ -148,11 +148,11 @@ Invalid semaphore: semaphore 0x........
 semaphore 0x........ was first observed at:
    at 0x........: sem_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:228)
-[1] semaphore_post      0x........ value 4294967295 -> 0
+[1] sem_post      0x........ value 4294967295 -> 0
 
 FIXME: can't figure out how to verify wrap of sem_post
 
-[1] semaphore_destroy   0x........ value 0
+[1] sem_destroy   0x........ value 0
 
 ------------ dealloc of mem holding locks ------------
 

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
index 3f78f2d4c9528cc04266da1f7e52bd975066420e..1ce5a7773db74497fd35772abc902e2ef773c1eb 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5
@@ -116,8 +116,8 @@ rwlock 0x........ was first observed at:
 
 ---------------- sem_* ----------------
 
-[1] semaphore_init      0x........ value 4294967295
-[1] semaphore_init      0x........ value 0
+[1] sem_init      0x........ value 4294967295
+[1] sem_init      0x........ value 0
 
 Semaphore reinitialization: semaphore 0x........
    at 0x........: sem_init* (drd_pthread_intercepts.c:?)
@@ -128,7 +128,7 @@ semaphore 0x........ was first observed at:
 
 FIXME: can't figure out how to verify wrap of sem_destroy
 
-[1] semaphore_wait      0x........ value 0 -> 4294967295
+[1] sem_wait      0x........ value 0 -> 4294967295
 
 Invalid semaphore: semaphore 0x........
    at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
@@ -136,11 +136,11 @@ Invalid semaphore: semaphore 0x........
 semaphore 0x........ was first observed at:
    at 0x........: sem_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:228)
-[1] semaphore_post      0x........ value 4294967295 -> 0
+[1] sem_post      0x........ value 4294967295 -> 0
 
 FIXME: can't figure out how to verify wrap of sem_post
 
-[1] semaphore_destroy   0x........ value 0
+[1] sem_destroy   0x........ value 0
 
 ------------ dealloc of mem holding locks ------------
 

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
index 83f3f8861f2cdd9a1ef30d09136a559f4270be0e..44e9c2dae62eeb6e4f36df30a95133243d9119c3 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.5-ppc
@@ -116,8 +116,8 @@ rwlock 0x........ was first observed at:
 
 ---------------- sem_* ----------------
 
-[1] semaphore_init      0x........ value 4294967295
-[1] semaphore_init      0x........ value 0
+[1] sem_init      0x........ value 4294967295
+[1] sem_init      0x........ value 0
 
 Semaphore reinitialization: semaphore 0x........
    at 0x........: sem_init* (drd_pthread_intercepts.c:?)
@@ -128,7 +128,7 @@ semaphore 0x........ was first observed at:
 
 FIXME: can't figure out how to verify wrap of sem_destroy
 
-[1] semaphore_wait      0x........ value 0 -> 4294967295
+[1] sem_wait      0x........ value 0 -> 4294967295
 
 Invalid semaphore: semaphore 0x........
    at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
@@ -136,11 +136,11 @@ Invalid semaphore: semaphore 0x........
 semaphore 0x........ was first observed at:
    at 0x........: sem_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:228)
-[1] semaphore_post      0x........ value 4294967295 -> 0
+[1] sem_post      0x........ value 4294967295 -> 0
 
 FIXME: can't figure out how to verify wrap of sem_post
 
-[1] semaphore_destroy   0x........ value 0
+[1] sem_destroy   0x........ value 0
 
 ------------ dealloc of mem holding locks ------------
 

diff --git a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8 b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
index 7d7c64a5b8f97072531b0b0efa2472bef7cb5a87..de73ec31cd079b3c05a9cce488f3ba1b76f2359d 100644 (file)
--- a/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
+++ b/drd/tests/tc20_verifywrap2.stderr.exp-glibc2.8
@@ -116,8 +116,8 @@ rwlock 0x........ was first observed at:
 
 ---------------- sem_* ----------------
 
-[1] semaphore_init      0x........ value 4294967295
-[1] semaphore_init      0x........ value 0
+[1] sem_init      0x........ value 4294967295
+[1] sem_init      0x........ value 0
 
 Semaphore reinitialization: semaphore 0x........
    at 0x........: sem_init* (drd_pthread_intercepts.c:?)
@@ -128,7 +128,7 @@ semaphore 0x........ was first observed at:
 
 FIXME: can't figure out how to verify wrap of sem_destroy
 
-[1] semaphore_wait      0x........ value 0 -> 4294967295
+[1] sem_wait      0x........ value 0 -> 4294967295
 
 Invalid semaphore: semaphore 0x........
    at 0x........: sem_wait* (drd_pthread_intercepts.c:?)
@@ -136,11 +136,11 @@ Invalid semaphore: semaphore 0x........
 semaphore 0x........ was first observed at:
    at 0x........: sem_init* (drd_pthread_intercepts.c:?)
    by 0x........: main (tc20_verifywrap.c:228)
-[1] semaphore_post      0x........ value 4294967295 -> 0
+[1] sem_post      0x........ value 4294967295 -> 0
 
 FIXME: can't figure out how to verify wrap of sem_post
 
-[1] semaphore_destroy   0x........ value 0
+[1] sem_destroy   0x........ value 0
 
 ------------ dealloc of mem holding locks ------------