AuroraMiddleware/qt5base-lts
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QTimerInfoList: use std::upper_bound/rotate

Browse Source 
Change-Id: I80899a8c652ac724b0efd82815dddc061fe9f5e8
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Ahmad Samir 2023-06-21 16:21:38 +03:00
parent 464461dea6
commit fa42350c8d
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/corelib/kernel/qtimerinfo_unix.cpp
View File

@ -46,18 +46,16 @@ bool QTimerInfoList::hasPendingTimers()
return updateCurrentTime() < constFirst()->timeout;
}
static bool byTimeout(const QTimerInfo *a, const QTimerInfo *b)
{ return a->timeout < b->timeout; };
/*
insert timer info into list
*/
void QTimerInfoList::timerInsert(QTimerInfo *ti)
{
int index = size();
while (index--) {
const QTimerInfo * const t = at(index);
if (!(ti->timeout < t->timeout))
break;
}
insert(index+1, ti);
insert(std::upper_bound(cbegin(), cend(), ti, byTimeout),
ti);
}
static constexpr milliseconds roundToMillisecond(nanoseconds val)
@ -420,14 +418,16 @@ int QTimerInfoList::activateTimers()
firstTimerInfo = currentTimerInfo;
}
// remove from list
removeFirst();
// determine next timeout time
calculateNextTimeout(currentTimerInfo, now);
if (size() > 1) {
// Find where "currentTimerInfo" should be in the list so as
// to keep the list ordered by timeout
auto afterCurrentIt = begin() + 1;
auto iter = std::upper_bound(afterCurrentIt, end(), currentTimerInfo, byTimeout);
currentTimerInfo = *std::rotate(begin(), afterCurrentIt, iter);
}
// reinsert timer
timerInsert(currentTimerInfo);
if (currentTimerInfo->interval > 0ms)
n_act++;