Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-24 10:52:56 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

remove redundant timer in QSemaphore

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2019-06-09 20:55:53 +00:00
parent e53257ad1e
commit 8cdda3bb01
1 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/core/thread/qsemaphore.cpp
View file

@ -44,8 +44,6 @@
#ifndef QT_NO_THREAD #ifndef QT_NO_THREAD
#include "qmutex.h" #include "qmutex.h"
#include "qwaitcondition.h" #include "qwaitcondition.h"
#include "qelapsedtimer.h"
#include "qdatetime.h"
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
@ -220,12 +218,8 @@ bool QSemaphore::tryAcquire(int n, int timeout)
while (n > d->avail) while (n > d->avail)
d->cond.wait(locker.mutex()); d->cond.wait(locker.mutex());
} else { } else {
QElapsedTimer timer;
timer.start();
while (n > d->avail) { while (n > d->avail) {
const qint64 elapsed = timer.elapsed(); if (!d->cond.wait(locker.mutex(), timeout))
if (timeout - elapsed <= 0
|| !d->cond.wait(locker.mutex(), timeout - elapsed))
return false; return false;
} }
} }