|
From: <sv...@va...> - 2005-05-24 14:21:52
|
Author: sewardj
Date: 2005-05-24 15:21:45 +0100 (Tue, 24 May 2005)
New Revision: 3794
Modified:
trunk/README_XML_OUTPUT.txt
trunk/coregrind/m_errormgr.c
trunk/coregrind/vg_main.c
Log:
XML output futzing-around-with.
Modified: trunk/README_XML_OUTPUT.txt
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/README_XML_OUTPUT.txt 2005-05-24 14:17:41 UTC (rev 3793)
+++ trunk/README_XML_OUTPUT.txt 2005-05-24 14:21:45 UTC (rev 3794)
@@ -328,7 +328,7 @@
=20
<suppcounts>
zero or more of
- <supp> <count>INT</count> <name>TEXT</name> </supp>
+ <pair> <count>INT</count> <name>TEXT</name> </pair>
</suppcounts>
=20
The <name> is as specified in the suppression name fields in .supp
Modified: trunk/coregrind/m_errormgr.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/m_errormgr.c 2005-05-24 14:17:41 UTC (rev 3793)
+++ trunk/coregrind/m_errormgr.c 2005-05-24 14:21:45 UTC (rev 3794)
@@ -648,6 +648,9 @@
Supp *su;
Bool any_supp;
=20
+ if (VG_(clo_xml))
+ VG_(message)(Vg_DebugMsg, "<suppcounts>");
+
any_supp =3D False;
for (su =3D suppressions; su !=3D NULL; su =3D su->next) {
if (su->count <=3D 0)
@@ -655,13 +658,16 @@
any_supp =3D True;
if (VG_(clo_xml)) {
VG_(message)(Vg_DebugMsg,=20
- "<supp><count>%d</count><name>%s</name></supp>",=20
+ " <pair><count>%d</count><name>%s</name></pair>",=
=20
su->count, su->sname);
} else {
VG_(message)(Vg_DebugMsg, "supp: %4d %s", su->count, su->sname)=
;
}
}
=20
+ if (VG_(clo_xml))
+ VG_(message)(Vg_DebugMsg, "<suppcounts>");
+
return any_supp;
}
=20
@@ -764,9 +770,9 @@
if (err->count <=3D 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>");
Modified: trunk/coregrind/vg_main.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/vg_main.c 2005-05-24 14:17:41 UTC (rev 3793)
+++ trunk/coregrind/vg_main.c 2005-05-24 14:21:45 UTC (rev 3794)
@@ -2025,6 +2025,7 @@
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>"); =20
for (i =3D 0; i < VG_(client_argc); i++)=20
|