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

Merge remote-tracking branch 'origin/2.8'

Browse Source 
Change-Id: I5ac289ba3e8291da88849ba996b138fbaea2c1a5
This commit is contained in:
Christiaan Janssen
2013-08-08 11:55:56 +02:00
parent a06bd050df 502d929c7f
commit f889349adb
1 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/qmlprofilerextension/scenegraphtimelinemodel.cpp
View File

@@ -142,9 +142,18 @@ const QString SceneGraphTimelineModel::categoryLabel(int categoryIndex) const
int SceneGraphTimelineModel::findFirstIndex(qint64 startTime) const
{
int candidate = findFirstIndexNoParents(startTime);
// because there's two threads synchronized, the right index could be one off
if (candidate > 0 && d->eventList[candidate-1].startTime + d->eventList[candidate-1].duration >= startTime)
return candidate - 1;
// because there's two asynchronous threads in the display,
// check the former event in same thread for false positives
int i = candidate - 1;
while (i >= 0) {
if (d->eventList[candidate].sgEventType == d->eventList[i].sgEventType) {
if (d->eventList[i].startTime + d->eventList[i].duration >= startTime)
candidate = i;
else
break;
}
i--;
}
return candidate;
}
@@ -395,6 +404,8 @@ void SceneGraphTimelineModel::loadData()
for (int i=0; i < timingFieldCount; i++)
newEvent.timing[i] = 0;
// Filter out events with incorrect timings due to interrupted thread on server side
if (newEvent.duration > 0 && newEvent.startTime > 0)
d->eventList << newEvent;
lastRenderEvent = d->eventList.count()-1;
}
@@ -445,7 +456,10 @@ void SceneGraphTimelineModel::loadData()
newEvent.timing[2] = event.numericData3;
newEvent.timing[3] = event.numericData4;
// Filter out events with incorrect timings due to interrupted thread on server side
if (newEvent.duration > 0 && newEvent.startTime > 0)
d->eventList << newEvent;
break;
}
case SceneGraphWindowsAnimations: {