DRD: Added command-line option --trace-hb for tracing ANNOTATE_HAPPENS_BEFORE()/AFTER().

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

diff --git a/drd/drd_hb.c b/drd/drd_hb.c
index 6b7151f0f709ed4fe3db929a03d1ea71f5667919..af02033441ca0629ddb6ba879e5a3f7f22815403 100644 (file)
--- a/drd/drd_hb.c
+++ b/drd/drd_hb.c
@@ -204,7 +204,7 @@ void DRD_(hb_happens_after)(const DrdThreadId tid, const Addr hb)
 
    if (DRD_(s_trace_hb))
    {
-      VG_(message)(Vg_UserMsg, "[%d] happens_after 0x%lx\n",
+      VG_(message)(Vg_UserMsg, "[%d] happens_after  0x%lx\n",
                    DRD_(thread_get_running_tid)(), hb);
    }
 

diff --git a/drd/drd_main.c b/drd/drd_main.c
index dd9f558c32944406ac483cf992e4cf1d7cbbbebb..51fd3373783dc43fe66f2cce417d13136f598a4c 100644 (file)
--- a/drd/drd_main.c
+++ b/drd/drd_main.c
@@ -28,6 +28,7 @@
 #include "drd_clientreq.h"
 #include "drd_cond.h"
 #include "drd_error.h"
+#include "drd_hb.h"
 #include "drd_load_store.h"
 #include "drd_malloc_wrappers.h"
 #include "drd_mutex.h"
@@ -80,6 +81,7 @@ static Bool DRD_(process_cmd_line_option)(Char* arg)
    int trace_cond             = -1;
    int trace_csw              = -1;
    int trace_fork_join        = -1;
+   int trace_hb               = -1;
    int trace_conflict_set     = -1;
    int trace_conflict_set_bm  = -1;
    int trace_mutex            = -1;
@@ -107,6 +109,7 @@ static Bool DRD_(process_cmd_line_option)(Char* arg)
    else if VG_BOOL_CLO(arg, "--trace-conflict-set-bm", trace_conflict_set_bm){}
    else if VG_BOOL_CLO(arg, "--trace-csw",           trace_csw) {}
    else if VG_BOOL_CLO(arg, "--trace-fork-join",     trace_fork_join) {}
+   else if VG_BOOL_CLO(arg, "--trace-hb",            trace_hb) {}
    else if VG_BOOL_CLO(arg, "--trace-mutex",         trace_mutex) {}
    else if VG_BOOL_CLO(arg, "--trace-rwlock",        trace_rwlock) {}
    else if VG_BOOL_CLO(arg, "--trace-segment",       trace_segment) {}
@@ -159,6 +162,8 @@ static Bool DRD_(process_cmd_line_option)(Char* arg)
       DRD_(thread_trace_context_switches)(trace_csw);
    if (trace_fork_join != -1)
       DRD_(thread_set_trace_fork_join)(trace_fork_join);
+   if (trace_hb != -1)
+      DRD_(hb_set_trace)(trace_hb);
    if (trace_conflict_set != -1)
       DRD_(thread_trace_conflict_set)(trace_conflict_set);
    if (trace_conflict_set_bm != -1)