whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

QLockFile: Use QDeadlineTimer in tryLock 

This simplifies the code a bit.

Change-Id: Ifc295639c8cf4ddcaa69fffd146f7535d646cb15
Reviewed-by: David Faure <david.faure@kdab.com>
bb10
Thiago Macieira 2016-08-29 19:34:37 -07:00
parent 1a09c599b3
commit eebdb16c63
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/io/qlockfile.cpp
View File

@ -42,7 +42,7 @@
#include "qlockfile_p.h"
#include <QtCore/qthread.h>
#include <QtCore/qelapsedtimer.h>
#include <QtCore/qdeadlinetimer.h>
#include <QtCore/qdatetime.h>
QT_BEGIN_NAMESPACE
@ -210,9 +210,7 @@ bool QLockFile::lock()
bool QLockFile::tryLock(int timeout)
{
Q_D(QLockFile);
QElapsedTimer timer;
if (timeout > 0)
timer.start();
QDeadlineTimer timer(qMax(timeout, -1)); // QDT only takes -1 as "forever"
int sleepTime = 100;
forever {
d->lockError = d->tryLock_sys();
@ -235,7 +233,7 @@ bool QLockFile::tryLock(int timeout)
}
break;
}
if (timeout == 0 || (timeout > 0 && timer.hasExpired(timeout)))
if (timer.hasExpired())
return false;
QThread::msleep(sleepTime);
if (sleepTime < 5 * 1000)