commit e7086000dc09e5486e42206ad524fefe09f7cc72
author bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Oct 11 19:08:39 2011 +0000
committer bart <bart@a5019735-40e9-0310-863c-91ae7b9d1cf9> Tue Oct 11 19:08:39 2011 +0000
tree c7fd6f81f32a0a922ad3df0f4cf88a15805acdcf
parent 6c63f5cd48a55ef1946ba67582312bc5aa27255e

drd: Enable XML output. See also #282949. To do: document the output format.

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

drd/drd_thread.c

diff --git a/drd/drd_thread.c b/drd/drd_thread.c
index a9cd5fb..c50dd4c 100644
--- a/drd/drd_thread.c
+++ b/drd/drd_thread.c
@@ -390,7 +390,7 @@
                        ", new vc: %s", vc);
          VG_(free)(vc);
       }
-      DRD_(trace_msg)("%s\n", msg);
+      DRD_(trace_msg)("%pS\n", msg);
       VG_(free)(msg);
    }
 
@@ -1249,29 +1249,19 @@
 }
 
 /** Show a call stack involved in a data race. */
-static void show_call_stack(const DrdThreadId tid,
-                            const Char* const msg,
-                            ExeContext* const callstack)
+static void show_call_stack(const DrdThreadId tid, ExeContext* const callstack)
 {
    const ThreadId vg_tid = DRD_(DrdThreadIdToVgThreadId)(tid);
 
-   VG_(message)(Vg_UserMsg, "%s (thread %d)\n", msg, tid);
-
-   if (vg_tid != VG_INVALID_THREADID)
-   {
+   if (vg_tid != VG_INVALID_THREADID) {
       if (callstack)
-      {
          VG_(pp_ExeContext)(callstack);
-      }
       else
-      {
          VG_(get_and_pp_StackTrace)(vg_tid, VG_(clo_backtrace_size));
-      }
-   }
-   else
-   {
-      VG_(message)(Vg_UserMsg,
-                   "   (thread finished, call stack no longer available)\n");
+   } else {
+      if (!VG_(clo_xml))
+         VG_(message)(Vg_UserMsg,
+                      "   (thread finished, call stack no longer available)\n");
    }
 }
 
@@ -1310,10 +1300,21 @@
                                               access_type))
                {
                   tl_assert(q->stacktrace);
-                  show_call_stack(i,        "Other segment start",
-                                  q->stacktrace);
-                  show_call_stack(i,        "Other segment end",
-                                  q->next ? q->next->stacktrace : 0);
+                  if (VG_(clo_xml))
+                     VG_(printf_xml)("  <other_segment_start>\n");
+                  else
+                     VG_(message)(Vg_UserMsg,
+                                  "Other segment start (thread %d)\n", i);
+                  show_call_stack(i, q->stacktrace);
+                  if (VG_(clo_xml))
+                     VG_(printf_xml)("  </other_segment_start>\n"
+                                     "  <other_segment_end>\n");
+                  else
+                     VG_(message)(Vg_UserMsg,
+                                  "Other segment end (thread %d)\n", i);
+                  show_call_stack(i, q->next ? q->next->stacktrace : 0);
+                  if (VG_(clo_xml))
+                     VG_(printf_xml)("  </other_segment_end>\n");
                }
             }
          }