Skip to content

support Valgrind XML protocol versions newer than 4 #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
barsnick merged 1 commit into from
Jun 19, 2026
Merged

support Valgrind XML protocol versions newer than 4 #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/toolview/helgrind_logview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@ bool HelgrindLogView::appendNodeTool( QDomElement elem, QString& errMsg )
{
switch ( VgOutputItem::elemType( elem.tagName() ) ) {
case VG_ELEM::PROTOCOL_VERSION : {
if ( elem.text() != "4" ) {
if ( elem.text().toInt() < 4 ) {
errMsg = "Helgrind tool doesn't support XML protocol version: (" + elem.text() + ")";
vkPrintErr( "%s", qPrintable( "HelgrindLogView::appendNodeTool(): " + errMsg ) );
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/toolview/memcheck_logview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ bool MemcheckLogView::appendNodeTool( QDomElement elem, QString& errMsg )
{
switch ( VgOutputItem::elemType( elem.tagName() ) ) {
case VG_ELEM::PROTOCOL_VERSION : {
if ( elem.text() != "4" ) {
if ( elem.text().toInt() < 4 ) {
errMsg = "Memcheck tool doesn't support XML protocol version: (" + elem.text() + ")";
vkPrintErr( "%s", qPrintable( "MemcheckLogView::appendNodeTool(): " + errMsg ) );
return false;
Expand Down
21 changes: 20 additions & 1 deletion src/toolview/vglogview.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,25 @@ static ElemTypeMap setupElemTypeMap()
etmap["skaux"] = VG_ELEM::SKAUX;
etmap["sframe"] = VG_ELEM::SFRAME;
etmap["rawtext"] = VG_ELEM::RAWTEXT;
etmap["heap_summary"] = VG_ELEM::HEAP_SUMMARY;
etmap["leak_summary"] = VG_ELEM::LEAK_SUMMARY;
etmap["error_summary"] = VG_ELEM::ERROR_SUMMARY;
etmap["total_heap_usage"] = VG_ELEM::HEAP_SUMMARY;
etmap["memory_in_use_at_exit"] = VG_ELEM::HEAP_SUMMARY;
etmap["all_heap_blocks_freed"] = VG_ELEM::HEAP_SUMMARY;
etmap["definitely_lost"] = VG_ELEM::LEAK_SUMMARY;
etmap["indirectly_lost"] = VG_ELEM::LEAK_SUMMARY;
etmap["possibly_lost"] = VG_ELEM::LEAK_SUMMARY;
etmap["still_reachable"] = VG_ELEM::LEAK_SUMMARY;
etmap["suppressed"] = VG_ELEM::LEAK_SUMMARY;
etmap["errors"] = VG_ELEM::ERROR_SUMMARY;
etmap["error_contexts"] = VG_ELEM::ERROR_SUMMARY;
etmap["suppressed_contexts"] = VG_ELEM::ERROR_SUMMARY;
etmap["allocs"] = VG_ELEM::HEAP_SUMMARY;
etmap["frees"] = VG_ELEM::HEAP_SUMMARY;
etmap["bytes_allocated"] = VG_ELEM::HEAP_SUMMARY;
etmap["bytes"] = VG_ELEM::HEAP_SUMMARY;
etmap["blocks"] = VG_ELEM::HEAP_SUMMARY;
return etmap;
}

Expand Down Expand Up @@ -1100,7 +1119,7 @@ bool VgLogView::appendNode( QDomNode node, QString& errMsg )

switch ( elemtype ) {
case VG_ELEM::PROTOCOL_VERSION: {
if ( elem.text() != "4" ) {
if ( elem.text().toInt() < 4 ) {
errMsg = "Unsupported XML protocol version: (" + elem.text() + ")";
vkPrintErr( "%s", qPrintable( "VgLogView::appendNode(): " + errMsg ) );
return false;
Expand Down
1 change: 1 addition & 0 deletions src/toolview/vglogview.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ namespace VG_ELEM {
ERRORCOUNTS, ANNOUNCETHREAD, HTHREADID, PAIR, COUNT,
SUPPCOUNTS, NAME, LEAKEDBYTES, LEAKEDBLOCKS,
SUPPRESSION, SNAME, SKIND, SKAUX, SFRAME, RAWTEXT,
HEAP_SUMMARY, LEAK_SUMMARY, ERROR_SUMMARY,
NUM_ELEMS
};
}
Expand Down