From: Julian Seward <jseward@acm.org>
Date: Tue, 24 May 2005 14:21:45 +0000 (+0000)
Subject: XML output futzing-around-with.
X-Git-Tag: svn/VALGRIND_3_0_0~524
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=01017a2f82156edcfd2bdad91c3cff6d84f8c966;p=thirdparty%2Fvalgrind.git

XML output futzing-around-with.


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

diff --git a/README_XML_OUTPUT.txt b/README_XML_OUTPUT.txt
index b6865c96eb..44714741c5 100644
--- a/README_XML_OUTPUT.txt
+++ b/README_XML_OUTPUT.txt
@@ -328,7 +328,7 @@ Suppressions not mentioned were used zero times.
 
   <suppcounts>
      zero or more of
-        <supp> <count>INT</count> <name>TEXT</name> </supp>
+        <pair> <count>INT</count> <name>TEXT</name> </pair>
   </suppcounts>
 
 The <name> is as specified in the suppression name fields in .supp
diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c
index 260e4f5851..cb6d7313c1 100644
--- a/coregrind/m_errormgr.c
+++ b/coregrind/m_errormgr.c
@@ -648,6 +648,9 @@ static Bool show_used_suppressions ( void )
    Supp  *su;
    Bool  any_supp;
 
+   if (VG_(clo_xml))
+      VG_(message)(Vg_DebugMsg, "<suppcounts>");
+
    any_supp = False;
    for (su = suppressions; su != NULL; su = su->next) {
       if (su->count <= 0)
@@ -655,13 +658,16 @@ static Bool show_used_suppressions ( void )
       any_supp = True;
       if (VG_(clo_xml)) {
          VG_(message)(Vg_DebugMsg, 
-                      "<supp><count>%d</count><name>%s</name></supp>", 
+                      "  <pair><count>%d</count><name>%s</name></pair>", 
                       su->count, su->sname);
       } else {
          VG_(message)(Vg_DebugMsg, "supp: %4d %s", su->count, su->sname);
       }
    }
 
+   if (VG_(clo_xml))
+      VG_(message)(Vg_DebugMsg, "<suppcounts>");
+
    return any_supp;
 }
 
@@ -764,9 +770,9 @@ void VG_(show_error_counts_as_XML) ( void )
       if (err->count <= 0)
          continue;
       VG_(message)(
-         Vg_UserMsg, "  <pair><unique>0x%llx</unique>"
-                     "<count>%d</count></pair>",
-         Ptr_to_ULong(err), err->count
+         Vg_UserMsg, "  <pair><count>%d</count>"
+                     "<unique>0x%llx</unique></pair>",
+         err->count, Ptr_to_ULong(err)
       );
    }
    VG_(message)(Vg_UserMsg, "</errorcounts>");
diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index 5910e36fce..f577b3ee5f 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -2025,6 +2025,7 @@ static void process_cmd_line_options( UInt* client_auxv, const char* toolname )
       VG_(message)(Vg_UserMsg, "");
       VG_(message)(Vg_UserMsg, "<pid>%d</pid>", VG_(getpid)());
       VG_(message)(Vg_UserMsg, "<ppid>%d</ppid>", VG_(getppid)());
+      VG_(message)(Vg_UserMsg, "<tool>%s</tool>", toolname);
       VG_(message)(Vg_UserMsg, "");
       VG_(message)(Vg_UserMsg, "<argv>");   
       for (i = 0; i < VG_(client_argc); i++)