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

Timeline: Fix and clarify index lookup

Browse Source 
There was a subtle bug in firstIndexNoParents(): If the model had
exactly one range with an endtime <= the given start time, it would
return 0, rather than -1.

Also, add some comments, and don't check for count == 1. The check for
count == 1 is redundant as that case is already covered by the endTime
and startTime checks for the first and last elements. As count == 1 is
really rare and this is a very hot code path, we drop it.

Change-Id: Ic21318cf82d2aea4c70d96989c56c2870dc871f7
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Joerg Bornemann <joerg.bornemann@qt.io>
This commit is contained in:
Ulf Hermann
2017-03-24 12:04:36 +01:00
parent 1f23c11a56
commit 7b5db5db90
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/libs/timeline/timelinemodel.cpp
View File

@@ -322,12 +322,14 @@ int TimelineModel::firstIndex(qint64 startTime) const
int TimelineModel::TimelineModelPrivate::firstIndexNoParents(qint64 startTime) const int TimelineModel::TimelineModelPrivate::firstIndexNoParents(qint64 startTime) const
{ {
// in the "endtime" list, find the first event that ends after startTime // in the "endtime" list, find the first event that ends after startTime
if (endTimes.isEmpty())
// lowerBound() cannot deal with empty lists, and it never finds the last element.
if (endTimes.isEmpty() || endTimes.last().end <= startTime)
return -1; return -1;
if (endTimes.count() == 1 || endTimes.first().end > startTime)
// lowerBound() never returns "invalid", so handle this manually.
if (endTimes.first().end > startTime)
return endTimes.first().startIndex; return endTimes.first().startIndex;
if (endTimes.last().end <= startTime)
return -1;
return endTimes[lowerBound(endTimes, startTime) + 1].startIndex; return endTimes[lowerBound(endTimes, startTime) + 1].startIndex;
} }
@@ -340,10 +342,12 @@ int TimelineModel::lastIndex(qint64 endTime) const
{ {
Q_D(const TimelineModel); Q_D(const TimelineModel);
// in the "starttime" list, find the last event that starts before endtime // in the "starttime" list, find the last event that starts before endtime
// lowerBound() never returns "invalid", so handle this manually.
if (d->ranges.isEmpty() || d->ranges.first().start >= endTime) if (d->ranges.isEmpty() || d->ranges.first().start >= endTime)
return -1; return -1;
if (d->ranges.count() == 1)
return 0; // lowerBound() never finds the last element.
if (d->ranges.last().start < endTime) if (d->ranges.last().start < endTime)
return d->ranges.count() - 1; return d->ranges.count() - 1;