Print error counts in the XML output.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3779 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_errormgr.c b/coregrind/m_errormgr.c
index 79b2d15..260e4f5 100644
--- a/coregrind/m_errormgr.c
+++ b/coregrind/m_errormgr.c
@@ -253,6 +253,8 @@
{
if (VG_(clo_xml)) {
VG_(message)(Vg_UserMsg, "<error>");
+ VG_(message)(Vg_UserMsg, " <unique>0x%llx</unique>",
+ Ptr_to_ULong(err));
VG_(message)(Vg_UserMsg, " <tid>%d</tid>", err->tid);
}
@@ -664,7 +666,8 @@
}
-/* This is called not from generated code but from the scheduler */
+/* Show all the errors that occurred, and possibly also the
+ suppressions used. */
void VG_(show_all_errors) ( void )
{
Int i, n_min;
@@ -749,6 +752,27 @@
}
}
+
+/* Show occurrence counts of all errors, in XML form. */
+void VG_(show_error_counts_as_XML) ( void )
+{
+ Error* err;
+ VG_(message)(Vg_UserMsg, "<errorcounts>");
+ for (err = errors; err != NULL; err = err->next) {
+ if (err->supp != NULL)
+ continue;
+ 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_(message)(Vg_UserMsg, "</errorcounts>");
+}
+
+
/*------------------------------------------------------------*/
/*--- Standard suppressions ---*/
/*------------------------------------------------------------*/
diff --git a/coregrind/pub_core_errormgr.h b/coregrind/pub_core_errormgr.h
index 460297c..a40cddd 100644
--- a/coregrind/pub_core_errormgr.h
+++ b/coregrind/pub_core_errormgr.h
@@ -49,13 +49,15 @@
}
CoreErrorKind;
-extern void VG_(load_suppressions) ( void );
+extern void VG_(load_suppressions) ( void );
-extern void VG_(show_all_errors) ( void );
+extern void VG_(show_all_errors) ( void );
-extern Bool VG_(is_action_requested) ( Char* action, Bool* clo );
+extern void VG_(show_error_counts_as_XML) ( void );
-extern UInt VG_(get_n_errs_found) ( void );
+extern Bool VG_(is_action_requested) ( Char* action, Bool* clo );
+
+extern UInt VG_(get_n_errs_found) ( void );
#endif // __PUB_CORE_ERRORMGR_H
diff --git a/coregrind/vg_main.c b/coregrind/vg_main.c
index a4b839c..5910e36 100644
--- a/coregrind/vg_main.c
+++ b/coregrind/vg_main.c
@@ -2856,6 +2856,10 @@
VG_(message)(Vg_UserMsg, "");
if (VG_(clo_xml)) {
+ if (VG_(needs).core_errors || VG_(needs).tool_errors) {
+ VG_(show_error_counts_as_XML)();
+ VG_(message)(Vg_UserMsg, "");
+ }
VG_(message)(Vg_UserMsg, "<status>FINISHED</status>");
VG_(message)(Vg_UserMsg, "");
}