feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CtfVisualizer: Fix computation of nesting level

Browse Source 
The computed nesting level (which row an event to show in) was solely
based on begin+end events and "complete" events were ignored.

Compute the rows afterwards, similar to the "parent" computation that
the timeline model already does. Find the first row that is free,
and use that for the row of the item.

Change-Id: I890138c10f5038508da9b286b35d7bcfdf0ab64d
Reviewed-by: Alessandro Portale <alessandro.portale@qt.io>
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>
This commit is contained in:
Eike Ziller
2023-09-11 08:53:42 +02:00
parent bd6348fc20
commit 305a1a6ed1
5 changed files with 68 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/plugins/ctfvisualizer/ctftimelinemodel.cpp
View File

@@ -105,7 +105,7 @@ int CtfTimelineModel::expandedRow(int index) const
if (counterIdx > 0) {
return m_counterIndexToRow[counterIdx - 1] + 1;
}
return m_nestingLevels.value(index) + m_counterData.size() + 1;
return m_rows.value(index) + m_counterData.size() + 1;
}
int CtfTimelineModel::collapsedRow(int index) const
@@ -187,6 +187,8 @@ void CtfTimelineModel::finalize(double traceBegin, double traceEnd, const QStrin
m_details[index].insert(6, {reuse(Tr::tr("Unfinished")), reuse(Tr::tr("true"))});
}
computeNesting();
m_rows = computeRows(&m_maxStackSize);
++m_maxStackSize; // index -> count
QVector<std::string> sortedCounterNames = m_counterNames;
std::sort(sortedCounterNames.begin(), sortedCounterNames.end());
@@ -233,8 +235,6 @@ qint64 CtfTimelineModel::newStackEvent(const json &event, qint64 normalizedTime,
const std::string &eventPhase, const std::string &name,
int selectionId)
{
int nestingLevel = m_openEventIds.size();
m_maxStackSize = std::max(qsizetype(m_maxStackSize), qsizetype(m_openEventIds.size() + 1));
int index = 0;
qint64 duration = -1;
if (eventPhase == CtfEventTypeBegin) {
@@ -250,29 +250,21 @@ qint64 CtfTimelineModel::newStackEvent(const json &event, qint64 normalizedTime,
duration = qint64(event[CtfDurationKey]) * 1000;
index = insert(normalizedTime, duration, selectionId);
for (int i = m_openEventIds.size() - 1; i >= 0; --i) {
if (m_openEventIds[i] >= index) {
if (m_openEventIds[i] >= index)
++m_openEventIds[i];
// if the event is before an open event, the nesting level decreases:
--nestingLevel;
}
}
} else {
index = insert(normalizedTime, 0, selectionId);
for (int i = m_openEventIds.size() - 1; i >= 0; --i) {
if (m_openEventIds[i] >= index) {
if (m_openEventIds[i] >= index)
++m_openEventIds[i];
--nestingLevel;
}
}
}
if (index >= m_details.size()) {
m_details.resize(index + 1);
m_details[index] = QMap<int, QPair<QString, QString>>();
m_nestingLevels.resize(index + 1);
m_nestingLevels[index] = nestingLevel;
} else {
m_details.insert(index, QMap<int, QPair<QString, QString>>());
m_nestingLevels.insert(index, nestingLevel);
}
if (m_counterValues.size() > index) {
// if the event was inserted before any counter, we need

2
src/plugins/ctfvisualizer/ctftimelinemodel.h
View File

@@ -73,7 +73,7 @@ protected:
QString m_processName;
int m_maxStackSize = 0;
QVector<int> m_nestingLevels;
QVector<int> m_rows;
QVector<QMap<int, QPair<QString, QString>>> m_details;
QSet<int> m_handledTypeIds;
QStack<int> m_openEventIds;