commit b92ff0fd192dd05700f7d20db00795965e20b5c5
author bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Oct 08 08:29:29 2011 +0000
committer bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Sat Oct 08 08:29:29 2011 +0000
tree 07761449db9a8ce02fc2cba29c304a708c766d7a
parent ed52992a2ddc4be505b7a8a93a0b123cdc9a968b

DRD, refactoring: Introduce DRD_(trace_msg)()

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

drd/drd_barrier.c

diff --git a/drd/drd_barrier.c b/drd/drd_barrier.c
index 5df9423..26947cd 100644
--- a/drd/drd_barrier.c
+++ b/drd/drd_barrier.c
@@ -258,26 +258,16 @@
 
    p = DRD_(barrier_get_or_allocate)(barrier, barrier_type, count);
 
-   if (s_trace_barrier)
-   {
+   if (s_trace_barrier) {
       if (reinitialization)
-      {
-         VG_(message)(Vg_UserMsg,
-                      "[%d] barrier_reinit    %s 0x%lx count %ld -> %ld\n",
-                      DRD_(thread_get_running_tid)(),
-                      barrier_get_typename(p),
-                      barrier,
-                      p->count,
-                      count);
-      }
+         DRD_(trace_msg)("[%d] barrier_reinit    %s 0x%lx count %ld -> %ld\n",
+                         DRD_(thread_get_running_tid)(),
+                         barrier_get_typename(p), barrier, p->count, count);
       else
-      {
-         VG_(message)(Vg_UserMsg,
-                      "[%d] barrier_init      %s 0x%lx\n",
-                      DRD_(thread_get_running_tid)(),
-                      barrier_get_typename(p),
-                      barrier);
-      }
+         DRD_(trace_msg)("[%d] barrier_init      %s 0x%lx\n",
+                         DRD_(thread_get_running_tid)(),
+                         barrier_get_typename(p),
+                         barrier);
    }
 
    if (reinitialization && p->count != count)
@@ -304,13 +294,9 @@
    p = DRD_(barrier_get)(barrier);
 
    if (s_trace_barrier)
-   {
-      VG_(message)(Vg_UserMsg,
-                   "[%d] barrier_destroy   %s 0x%lx\n",
-                   DRD_(thread_get_running_tid)(),
-                   barrier_get_typename(p),
-                   barrier);
-   }
+      DRD_(trace_msg)("[%d] barrier_destroy   %s 0x%lx\n",
+                      DRD_(thread_get_running_tid)(),
+                      barrier_get_typename(p), barrier);
 
    if (p == 0)
    {
@@ -367,14 +353,9 @@
    tl_assert(p);
 
    if (s_trace_barrier)
-   {
-      VG_(message)(Vg_UserMsg,
-                   "[%d] barrier_pre_wait  %s 0x%lx iteration %ld\n",
-                   DRD_(thread_get_running_tid)(),
-                   barrier_get_typename(p),
-                   barrier,
-                   p->pre_iteration);
-   }
+      DRD_(trace_msg)("[%d] barrier_pre_wait  %s 0x%lx iteration %ld\n",
+                      DRD_(thread_get_running_tid)(),
+                      barrier_get_typename(p), barrier, p->pre_iteration);
 
    /* Clean up nodes associated with finished threads. */
    oset = p->oset[p->pre_iteration & 1];
@@ -433,15 +414,10 @@
    p = DRD_(barrier_get)(barrier);
 
    if (s_trace_barrier)
-   {
-      VG_(message)(Vg_UserMsg,
-                   "[%d] barrier_post_wait %s 0x%lx iteration %ld%s\n",
-                   tid,
-                   p ? barrier_get_typename(p) : "(?)",
-                   barrier,
-                   p ? p->post_iteration : -1,
-                   serializing ? " (serializing)" : "");
-   }
+      DRD_(trace_msg)("[%d] barrier_post_wait %s 0x%lx iteration %ld%s\n",
+                      tid, p ? barrier_get_typename(p) : "(?)",
+                      barrier, p ? p->post_iteration : -1,
+                      serializing ? " (serializing)" : "");
 
    /*
     * If p == 0, this means that the barrier has been destroyed after