commit aa97a546a0824285dfb8488edafb4fa9a14677b2
author bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Mar 16 17:57:01 2008 +0000
committer bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sun Mar 16 17:57:01 2008 +0000
tree 103a639e3b3298b2a6cb4ceec0370d7339dab605
parent 2afbd9b0af16a6e27fa595bf7f9a1f0f979d354f

All error and trace messages now show both Valgrind's and DRD's thread ID.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@7716 a5019735-40e9-0310-863c-91ae7b9d1cf9

exp-drd/drd_error.c

diff --git a/exp-drd/drd_error.c b/exp-drd/drd_error.c
index 21a8e2f..ef72522 100644
--- a/exp-drd/drd_error.c
+++ b/exp-drd/drd_error.c
@@ -81,10 +81,10 @@
     describe_malloced_addr(dri->addr, dri->size, &ai);
   }
   VG_(message)(Vg_UserMsg,
-               "Conflicting %s by thread %d at 0x%08lx size %ld",
+               "Conflicting %s by thread %d/%d at 0x%08lx size %ld",
                dri->access_type == eStore ? "store" : "load",
                DrdThreadIdToVgThreadId(dri->tid),
-               /*dri->tid,*/
+               dri->tid,
                dri->addr,
                dri->size);
   VG_(pp_ExeContext)(VG_(get_error_where)(err));
@@ -156,8 +156,9 @@
   case CondDestrErr: {
     CondDestrErrInfo* cdi = (CondDestrErrInfo*)(VG_(get_error_extra)(e));
     VG_(message)(Vg_UserMsg,
-                 "%s: cond 0x%lx, mutex 0x%lx locked by thread %d",
-                 cdi->cond, cdi->mutex, cdi->tid);
+                 "%s: cond 0x%lx, mutex 0x%lx locked by thread %d/%d",
+                 cdi->cond, cdi->mutex,
+                 DrdThreadIdToVgThreadId(cdi->tid), cdi->tid);
     VG_(pp_ExeContext)(VG_(get_error_where)(e));
     break;
   }