[Valgrind-valkyrie-dev] valkyrie: r502 - branches/valkyrie_qt4port/toolview

[<sv...@va...>]

Author: cerion
Date: 2010-09-04 13:52:39 +0100 (Sat, 04 Sep 2010)
New Revision: 502

Log:
Update the XML element map for valgrind, as described in:
valgrind/docs/internals/xml-output-protocol4.txt

Clears up an error (undefined TEXT element), and fills in the remaining blanks for future use.




Modified:
   branches/valkyrie_qt4port/toolview/vglogview.cpp
   branches/valkyrie_qt4port/toolview/vglogview.h


Modified: branches/valkyrie_qt4port/toolview/vglogview.cpp
===================================================================
--- branches/valkyrie_qt4port/toolview/vglogview.cpp	2010-09-03 03:34:59 UTC (rev 501)
+++ branches/valkyrie_qt4port/toolview/vglogview.cpp	2010-09-04 12:52:39 UTC (rev 502)
@@ -60,6 +60,7 @@
    etmap["kind"]             = VG_ELEM::KIND;
    etmap["what"]             = VG_ELEM::WHAT;
    etmap["xwhat"]            = VG_ELEM::XWHAT;
+   etmap["text"]             = VG_ELEM::TEXT;
    etmap["stack"]            = VG_ELEM::STACK;
    etmap["frame"]            = VG_ELEM::FRAME;
    etmap["ip"]               = VG_ELEM::IP;
@@ -71,6 +72,7 @@
    etmap["auxwhat"]          = VG_ELEM::AUXWHAT;
    etmap["xauxwhat"]         = VG_ELEM::XAUXWHAT;
    etmap["announcethread"]   = VG_ELEM::ANNOUNCETHREAD;
+   etmap["hthreadid"]        = VG_ELEM::HTHREADID;
    etmap["errorcounts"]      = VG_ELEM::ERRORCOUNTS;
    etmap["pair"]             = VG_ELEM::PAIR;
    etmap["count"]            = VG_ELEM::COUNT;
@@ -79,6 +81,11 @@
    etmap["leakedbytes"]      = VG_ELEM::LEAKEDBYTES;
    etmap["leakedblocks"]     = VG_ELEM::LEAKEDBLOCKS;
    etmap["suppression"]      = VG_ELEM::SUPPRESSION;
+   etmap["sname"]            = VG_ELEM::SNAME;
+   etmap["skind"]            = VG_ELEM::SKIND;
+   etmap["skaux"]            = VG_ELEM::SKAUX;
+   etmap["sframe"]           = VG_ELEM::SFRAME;
+   etmap["rawtext"]          = VG_ELEM::RAWTEXT;
    return etmap;
 }
 

Modified: branches/valkyrie_qt4port/toolview/vglogview.h
===================================================================
--- branches/valkyrie_qt4port/toolview/vglogview.h	2010-09-03 03:34:59 UTC (rev 501)
+++ branches/valkyrie_qt4port/toolview/vglogview.h	2010-09-04 12:52:39 UTC (rev 502)
@@ -107,11 +107,11 @@
       LOGQUAL, VAR, VALUE, COMMENT,
       ARGS, VARGV, ARGV, EXE, ARG,
       STATUS, STATE, TIME,
-      ERROR, UNIQUE, TID, KIND, WHAT, XWHAT, STACK,
+      ERROR, UNIQUE, TID, KIND, WHAT, XWHAT, TEXT, STACK,
       FRAME, IP, OBJ, FN, SRCDIR, SRCFILE, LINE, AUXWHAT, XAUXWHAT,
-      ERRORCOUNTS, ANNOUNCETHREAD, PAIR, COUNT,
+      ERRORCOUNTS, ANNOUNCETHREAD, HTHREADID, PAIR, COUNT,
       SUPPCOUNTS, NAME, LEAKEDBYTES, LEAKEDBLOCKS,
-      SUPPRESSION,
+      SUPPRESSION, SNAME, SKIND, SKAUX, SFRAME, RAWTEXT,
       NUM_ELEMS
    };
 }