From 7b9f7f3891230ddd2b2ef5cf3c760a605a02ee96 Mon Sep 17 00:00:00 2001 From: David Faure Date: Thu, 4 Sep 2014 16:29:25 +0200 Subject: QLockFile: on Windows, retry deleting the lock file if it is being read. A "sharing violation" happens when trying to delete the lock file and another thread/process is reading it at that very moment. Detect the error and try again, up to 10000 times - to avoid an infinite loop if QFile::remove fails for another reason such as a sudden change of permissions preventing us from deleting our own lock file. On Unix the deletion can't fail because of readers, but it doesn't hurt to check the return value there too, to catch other reasons for failures such as a sudden permission change. Task-number: QTBUG-38853 Change-Id: Icf12a74faed4a4916e3427abc09d9c33aa141476 Reviewed-by: Thiago Macieira --- tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) (limited to 'tests') diff --git a/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp b/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp index bd9e28beb5..de5d641c57 100644 --- a/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp +++ b/tests/auto/corelib/io/qlockfile/tst_qlockfile.cpp @@ -57,6 +57,7 @@ private slots: void lockUnlock(); void lockOutOtherProcess(); void lockOutOtherThread(); + void raceWithOtherThread(); void waitForLock_data(); void waitForLock(); void staleLockFromCrashedProcess_data(); @@ -165,6 +166,25 @@ void tst_QLockFile::lockOutOtherThread() QCOMPARE(ret2.result(), QLockFile::NoError); } +static QLockFile::LockError lockFromThread(const QString &fileName) +{ + QLockFile lockInThread(fileName); + lockInThread.lock(); + return lockInThread.error(); +} + +// QTBUG-38853, best way to trigger it was to add a QThread::sleep(1) in QLockFilePrivate::getLockInfo() after the first readLine. +// Then (on Windows), the QFile::remove() in unlock() (called by the first thread who got the lock, in the destructor) +// would fail due to the existing reader on the file. Fixed by checking the return value of QFile::remove() in unlock(). +void tst_QLockFile::raceWithOtherThread() +{ + const QString fileName = dir.path() + "/raceWithOtherThread"; + QFuture ret = QtConcurrent::run(lockFromThread, fileName); + QFuture ret2 = QtConcurrent::run(lockFromThread, fileName); + QCOMPARE(ret.result(), QLockFile::NoError); + QCOMPARE(ret2.result(), QLockFile::NoError); +} + static bool lockFromThread(const QString &fileName, int sleepMs, QSemaphore *semThreadReady, QSemaphore *semMainThreadDone) { QLockFile lockFile(fileName); -- cgit v1.2.3