Skip to content

Commit ef16dd6

Browse files
author
Vladyslav Goncharuk
committed
[PLOT_VIEW] Fix several minor issues
- The Gantt chart event ID is int32, but in the production use case, we need int64 to use a thread ID as a plot's event ID. Switch to the int64_t type. - Fix of a bug with combining graph names from multiple string parts. Signed-off-by: Vladyslav Goncharuk <vladyslav_goncharuk@epam.com>
1 parent 0b72fc9 commit ef16dd6

File tree

3 files changed

+10
-4
lines changed

3 files changed

+10
-4
lines changed

dltmessageanalyzerplugin/src/common/PlotDefinitions.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
typedef double tPlotData;
2424
typedef std::vector<tPlotData> tPlotDataVec;
2525

26-
typedef int tEventId;
26+
typedef int64_t tEventId;
2727

2828
typedef tQStringPtrWrapper tPlotGraphMetadataKey;
2929
typedef tQStringPtrWrapper tPlotGraphMetadataValue;

dltmessageanalyzerplugin/src/components/log/src/CConsoleInputProcessor.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -677,7 +677,7 @@ CConsoleInputProcessor::tScenariosMap CConsoleInputProcessor::createScenariosMap
677677

678678
#ifdef DMA_TC_MALLOC_PROFILING_ENABLED
679679
result["dump-memory-stats"] = CConsoleInputProcessor::tScenarioData([](const CConsoleInputProcessor::tParamMap&){dumpMemoryStatistics();}
680-
, "- prints tcmalloc memory stats");
680+
, "- prints tcmalloc memory stats.");
681681
#endif
682682

683683
return result;

dltmessageanalyzerplugin/src/components/searchView/src/CSearchResultModel.cpp

+8-2
Original file line numberDiff line numberDiff line change
@@ -604,6 +604,7 @@ namespace detail
604604
struct tGraphMetadataItem
605605
{
606606
TOptional<QString> graphName;
607+
tMsgId usedMsgId = -1;
607608
};
608609

609610
typedef std::map<tGraphId, tGraphMetadataItem> tGraphIdMetadataMap;
@@ -1349,7 +1350,12 @@ namespace detail
13491350
auto& axisRectNameMap = axisNameMetadataMap[parsingResult.axisRectName].graphIdMetadataMap;
13501351
auto& metadataItem = axisRectNameMap[parsingResult.graphId];
13511352

1352-
metadataItem.graphName.setValue("");
1353+
if(!metadataItem.graphName.isSet() || (metadataItem.graphName.isSet() &&
1354+
!metadataItem.graphName.getValue().isEmpty() && metadataItem.usedMsgId != msgId ))
1355+
{
1356+
metadataItem.graphName.setValue("");
1357+
metadataItem.usedMsgId = msgId;
1358+
}
13531359

13541360
if(true == parsingResult.graphName.isSet() &&
13551361
false == parsingResult.graphName.getValue().isEmpty())
@@ -1541,7 +1547,7 @@ namespace detail
15411547
auto valueStr = getValueFromStringCoverageMap();
15421548

15431549
bool bValueResolved = false;
1544-
auto valueInt = valueStr.toInt(&bValueResolved);
1550+
auto valueInt = valueStr.toLongLong(&bValueResolved);
15451551

15461552
if(false == bValueResolved)
15471553
{

0 commit comments

Comments
 (0)