Rename tags in XML <status> block.

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

diff --git a/coregrind/m_main.c b/coregrind/m_main.c
index 17a5d01e06b26b1cfaa73cf03741d3e44e1904ae..96131f969fa8d71ceffe2f0e3d4b19327e6ea61f 100644 (file)
--- a/coregrind/m_main.c
+++ b/coregrind/m_main.c
@@ -2819,8 +2819,8 @@ int main(int argc, char **argv, char **envp)
    if (VG_(clo_xml)) {
       HChar buf[50];
       VG_(ctime)(buf);
-      VG_(message)(Vg_UserMsg, "<status> <what>RUNNING</what> "
-                               "<when>%t</when> </status>", buf);
+      VG_(message)(Vg_UserMsg, "<status> <state>RUNNING</state> "
+                               "<time>%t</time> </status>", buf);
       VG_(message)(Vg_UserMsg, "");
    }
 
@@ -2921,8 +2921,8 @@ void VG_(shutdown_actions_NORETURN) ( ThreadId tid,
          VG_(message)(Vg_UserMsg, "");
       }
       VG_(ctime)(buf);
-      VG_(message)(Vg_UserMsg, "<status> <what>FINISHED</what> "
-                               "<when>%t</when> </status>", buf);
+      VG_(message)(Vg_UserMsg, "<status> <state>FINISHED</state> "
+                               "<time>%t</time> </status>", buf);
       VG_(message)(Vg_UserMsg, "");
    }
 

diff --git a/docs/internals/xml-output.txt b/docs/internals/xml-output.txt
index ec8fa57a3fe24547db5478180e578a627f06d45a..b233e330381e46dadcd021d35cb2969bf2d5e71d 100644 (file)
--- a/docs/internals/xml-output.txt
+++ b/docs/internals/xml-output.txt
@@ -166,8 +166,8 @@ following in sequence:
 
 * The following, indicating that the program has now started:
 
-     <status> <what>RUNNING</what> 
-              <when>human-readable-time-string</when> 
+     <status> <state>RUNNING</state> 
+              <time>human-readable-time-string</time> 
      </status>
 
 * Zero or more of (either ERROR or ERRORCOUNTS).
@@ -175,8 +175,8 @@ following in sequence:
 * The following, indicating that the program has now finished, and
   that the wrapup (leak checking) is happening.
 
-     <status> <what>FINISHED</what> 
-              <when>human-readable-time-string</when> 
+     <status> <state>FINISHED</state> 
+              <time>human-readable-time-string</time> 
      </status>
 
 * SUPPCOUNTS, indicating how many times each suppression was used.

diff --git a/memcheck/tests/filter_xml b/memcheck/tests/filter_xml
index f9c566985908c94949ecaeb0c8d432eea738ec43..7044671e72fe4f68d96bf27800c177729e5de9d6 100755 (executable)
--- a/memcheck/tests/filter_xml
+++ b/memcheck/tests/filter_xml
@@ -9,7 +9,7 @@ sed "s/<line>.*<\/line>/<line>...<\/line>/" |
 sed "s/<dir>.*<\/dir>/<dir>...<\/dir>/" |
 sed "s/<count>.*<\/count>/<count>...<\/count>/" |
 perl -0 -p -e "s/<suppcounts>.*<\/suppcounts>/<suppcounts>...<\/suppcounts>/s" |
-perl    -p -e "s/<when>.*<\/when>/<when>...<\/when>/s" |
+perl    -p -e "s/<time>.*<\/time>/<time>...<\/time>/s" |
 perl -0 -p -e "s/<vargv>.*<\/vargv>/<vargv>...<\/vargv>/s"
 
 # Collected wisdom re Perl magic incantation:

diff --git a/memcheck/tests/xml1.stderr.exp b/memcheck/tests/xml1.stderr.exp
index 65e78c3b393a0457339ad7d3805e839b62b7f344..6087926eb4cce8027063497e59447c1269225e7b 100644 (file)
--- a/memcheck/tests/xml1.stderr.exp
+++ b/memcheck/tests/xml1.stderr.exp
@@ -24,7 +24,7 @@
   </argv>
 </args>
 
-<status> <what>RUNNING</what> <when>...</when> </status>
+<status> <state>RUNNING</state> <time>...</time> </status>
 
 <error>
   <unique>0x........</unique>
@@ -369,7 +369,7 @@
   <pair> <count>...</count> <unique>0x........</unique> </pair>
 </errorcounts>
 
-<status> <what>FINISHED</what> <when>...</when> </status>
+<status> <state>FINISHED</state> <time>...</time> </status>
 
 <suppcounts>...</suppcounts>
 

diff --git a/memcheck/tests/xml1.stderr.exp2 b/memcheck/tests/xml1.stderr.exp2
index 271e8d35dc56510769cfb698d093447a6f87aa79..d6f56e04a506d6041477e2de7e68993f3eeb4c6a 100644 (file)
--- a/memcheck/tests/xml1.stderr.exp2
+++ b/memcheck/tests/xml1.stderr.exp2
@@ -24,7 +24,7 @@
   </argv>
 </args>
 
-<status> <what>RUNNING</what> <when>...</when> </status>
+<status> <state>RUNNING</state> <time>...</time> </status>
 
 <error>
   <unique>0x........</unique>
@@ -366,7 +366,7 @@
   <pair> <count>...</count> <unique>0x........</unique> </pair>
 </errorcounts>
 
-<status> <what>FINISHED</what> <when>...</when> </status>
+<status> <state>FINISHED</state> <time>...</time> </status>
 
 <suppcounts>...</suppcounts>
 

diff --git a/memcheck/tests/xml1.stderr.exp64 b/memcheck/tests/xml1.stderr.exp64
index 92f400106ecbe10437f2208b3a844233f64c59e4..42eec34197e6a63a3d2c3ad7fcf234265ee41a17 100644 (file)
--- a/memcheck/tests/xml1.stderr.exp64
+++ b/memcheck/tests/xml1.stderr.exp64
@@ -24,7 +24,7 @@
   </argv>
 </args>
 
-<status> <what>RUNNING</what> <when>...</when> </status>
+<status> <state>RUNNING</state> <time>...</time> </status>
 
 <error>
   <unique>0x........</unique>
@@ -374,7 +374,7 @@
   <pair> <count>...</count> <unique>0x........</unique> </pair>
 </errorcounts>
 
-<status> <what>FINISHED</what> <when>...</when> </status>
+<status> <state>FINISHED</state> <time>...</time> </status>
 
 <suppcounts>...</suppcounts>