Helgrind and exp-sgcheck, XML error reporting: move the code printing <kind>...<...

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

diff --git a/exp-sgcheck/pc_common.c b/exp-sgcheck/pc_common.c
index 429579f76fca38c1845fff8bb35e638b7862362f..89846fd0e798d6c4864cda49abd6d367bcaea50e 100644 (file)
--- a/exp-sgcheck/pc_common.c
+++ b/exp-sgcheck/pc_common.c
@@ -309,6 +309,9 @@ void pc_pp_Error ( Error* err )
    XError *xe = (XError*)VG_(get_error_extra)(err);
    tl_assert(xe);
 
+   if (xml)
+      emit( "  <kind>%s</kind>\n", pc_get_error_name(err));
+
    switch (VG_(get_error_kind)(err)) {
 
    //----------------------------------------------------------
@@ -316,7 +319,6 @@ void pc_pp_Error ( Error* err )
 
       if (xml) {
 
-         emit( "  <kind>SorG</kind>\n");
          emit( "  <what>Invalid %s of size %ld</what>\n",
                xe->XE.SorG.sszB < 0 ? "write" : "read",
                Word__abs(xe->XE.SorG.sszB) );
@@ -357,7 +359,6 @@ void pc_pp_Error ( Error* err )
 
          if (xml) {
 
-            emit( "  <kind>Heap</kind>\n");
             emit( "  <what>Invalid %s of size %ld</what>\n",
                   readwrite(xe->XE.Heap.sszB),
                   Word__abs(xe->XE.Heap.sszB) );
@@ -392,7 +393,6 @@ void pc_pp_Error ( Error* err )
 
          if (xml) {
 
-            emit( "  <kind>Heap</kind>\n");
             emit( "  <what>%s %s of size %ld</what>\n",
                   how_invalid,
                   readwrite(xe->XE.Heap.sszB),
@@ -475,7 +475,6 @@ void pc_pp_Error ( Error* err )
 
       if (xml) {
 
-         emit( "  <kind>Arith</kind>\n");
          emit( "  <what>Invalid arguments to %s</what>\n",
                xe->XE.Arith.opname );
          VG_(pp_ExeContext)( VG_(get_error_where)(err) );
@@ -561,7 +560,6 @@ void pc_pp_Error ( Error* err )
 
          if (xml) {
 
-            emit( "  <kind>SysParam</kind>\n");
             emit( "  <what>%s%s contains unaddressable byte(s)</what>\n",
                   what, s );
             VG_(pp_ExeContext)( VG_(get_error_where)(err) );
@@ -589,7 +587,6 @@ void pc_pp_Error ( Error* err )
 
          if (xml) {
 
-            emit( "  <kind>SysParam</kind>\n");
             emit( "  <what>%s%s is non-contiguous</what>\n",
                   what, s );
             VG_(pp_ExeContext)( VG_(get_error_where)(err) );

diff --git a/helgrind/hg_errors.c b/helgrind/hg_errors.c
index 41d99e26951cc44e91c03cce487d3fd17f0eb953..010f5e0bcd6642499872408018eb8755b103cce0 100644 (file)
--- a/helgrind/hg_errors.c
+++ b/helgrind/hg_errors.c
@@ -942,6 +942,9 @@ void HG_(pp_Error) ( Error* err )
    XError *xe = (XError*)VG_(get_error_extra)(err);
    tl_assert(xe);
 
+   if (xml)
+      emit( "  <kind>%s</kind>\n", HG_(get_error_name)(err));
+
    switch (VG_(get_error_kind)(err)) {
 
    case XE_Misc: {
@@ -949,7 +952,6 @@ void HG_(pp_Error) ( Error* err )
 
       if (xml) {
 
-         emit( "  <kind>Misc</kind>\n");
          emit( "  <xwhat>\n" );
          emit( "    <text>Thread #%d: %s</text>\n",
                (Int)xe->XE.Misc.thr->errmsg_index,
@@ -985,7 +987,6 @@ void HG_(pp_Error) ( Error* err )
 
       if (xml) {
 
-         emit( "  <kind>LockOrder</kind>\n");
          emit( "  <xwhat>\n" );
          emit( "    <text>Thread #%d: lock order \"%p before %p\" "
                     "violated</text>\n",
@@ -1050,7 +1051,6 @@ void HG_(pp_Error) ( Error* err )
 
       if (xml) {
 
-         emit( "  <kind>PthAPIerror</kind>\n");
          emit( "  <xwhat>\n" );
          emit_no_f_c(
             "    <text>Thread #%d's call to %t failed</text>\n",
@@ -1082,7 +1082,6 @@ void HG_(pp_Error) ( Error* err )
 
       if (xml) {
 
-         emit( "  <kind>UnlockBogus</kind>\n");
          emit( "  <xwhat>\n" );
          emit( "    <text>Thread #%d unlocked an invalid "
                     "lock at %p</text>\n",
@@ -1112,7 +1111,6 @@ void HG_(pp_Error) ( Error* err )
 
       if (xml) {
 
-         emit( "  <kind>UnlockForeign</kind>\n");
          emit( "  <xwhat>\n" );
          emit( "    <text>Thread #%d unlocked lock at %p "
                     "currently held by thread #%d</text>\n",
@@ -1157,7 +1155,6 @@ void HG_(pp_Error) ( Error* err )
 
       if (xml) {
 
-         emit( "  <kind>UnlockUnlocked</kind>\n");
          emit( "  <xwhat>\n" );
          emit( "    <text>Thread #%d unlocked a "
                     "not-locked lock at %p</text>\n",
@@ -1205,7 +1202,6 @@ void HG_(pp_Error) ( Error* err )
       if (xml) {
 
          /* ------ XML ------ */
-         emit( "  <kind>Race</kind>\n" );
          emit( "  <xwhat>\n" );
          emit( "    <text>Possible data race during %s of size %d "
                     "at %p by thread #%d</text>\n",