skip zero cost entries

fixes #578
KDAB · Dec 21, 2023 · 802d166 · 802d166
1 parent a8d1440
commit 802d166
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 2 deletions.
diff --git a/src/parsers/perf/perfparser.cpp b/src/parsers/perf/perfparser.cpp
@@ -1053,11 +1053,20 @@ class PerfParserPrivate : public QObject
 
         auto& core = frequencyResult.cores[sample.cpu];
         for (const auto& cost : sample.costs) {
+
+            if (cost.attributeId < 0) {
+                // CHECKME: where does that happen (see testcase), is this an issue with
+                //          perfparser and how should this be handled here
+                qCWarning(LOG_PERFPARSER) << "Unexpected attribute id:" << cost.attributeId;
+                continue;
+            }
+
             if (core.costs.size() <= cost.attributeId) {
                 const auto oldSize = core.costs.size();
-                core.costs.resize(cost.attributeId + 1);
+                const auto newSize = cost.attributeId + 1;
+                core.costs.resize(newSize);
 
-                for (int i = oldSize; i < core.costs.size(); i++) {
+                for (int i = oldSize; i < newSize; i++) {
                     core.costs[i].costName = strings.at(attributes[i].name.id);
                 }
             }

diff --git a/tests/integrationtests/perf.data.ZeroCost b/tests/integrationtests/perf.data.ZeroCost
diff --git a/tests/integrationtests/tst_perfparser.cpp b/tests/integrationtests/tst_perfparser.cpp
@@ -286,6 +286,20 @@ private slots:
         }
     }
 
+    void testZeroCost()
+    {
+
+        PerfParser parser(this);
+        QSignalSpy parsingFailedSpy(&parser, &PerfParser::parsingFailed);
+        QSignalSpy parsingFinishedSpy(&parser, &PerfParser::parsingFinished);
+
+        parser.startParseFile(QFINDTESTDATA("perf.data.ZeroCost"));
+
+        // CHECKME: hotspot-perfparser alone needs 35 seconds to parse this file
+        QTRY_COMPARE_WITH_TIMEOUT(parsingFinishedSpy.count(), 1, 45000);
+        QCOMPARE(parsingFailedSpy.count(), 0);
+    }
+
     void testCppInliningNoOptions()
     {
         const QStringList perfOptions;