Replace QtLockedFile with QLockFile#23757
Merged
glassez merged 1 commit intoqbittorrent:masterfrom Jan 25, 2026
Merged
Conversation
glassez
reviewed
Jan 19, 2026
| , m_server(new QLocalServer(this)) | ||
| , m_lockFile(path + u"/lockfile") | ||
| { | ||
| m_server->setSocketOptions(QLocalServer::UserAccessOption); |
Member
There was a problem hiding this comment.
Since we are locking it for a long (undetermined) time, you should do the following:
Suggested change
| m_server->setSocketOptions(QLocalServer::UserAccessOption); | |
| m_server->setSocketOptions(QLocalServer::UserAccessOption); | |
| m_lockFile->setStaleLockTime(0); |
src/app/qtlocalpeer/qtlocalpeer.cpp
Outdated
| { | ||
| if (!isClient()) | ||
| { | ||
| m_lockFile.unlock(); |
Member
There was a problem hiding this comment.
You don't even need to do it manually. It is unlocked when destructing.
src/app/qtlocalpeer/qtlocalpeer.cpp
Outdated
| return false; | ||
|
|
||
| if (!m_lockFile.lock(QtLP_Private::QtLockedFile::WriteLock, false)) | ||
| if (!m_lockFile.tryLock(0)) |
Member
There was a problem hiding this comment.
IIRC, timeout is zero by default.
Suggested change
| if (!m_lockFile.tryLock(0)) | |
| if (!m_lockFile.tryLock()) |
src/app/qtlocalpeer/qtlocalpeer.h
Outdated
|
|
||
| #pragma once | ||
|
|
||
| #include <QFile> |
drustill
force-pushed
the
dru/QLockFile
branch
from
7160040 to
899f7e5
Compare
glassez
approved these changes
Jan 20, 2026
xavier2k6
approved these changes
Jan 20, 2026
Chocobo1
approved these changes
Jan 24, 2026
Member
Member
|
@drustill |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Replaces
QtLockedFileimplementation with Qt's built inQLockFile.Running
grep -rn "ReadLock\|WriteLock\|\.lock(" src/app/shows that the only usage ofQtLockedFileis withWriteLock.ReadLockis implemented, but never used.As for testing, I built the app and ran
./build/qbittorrent-nox.app/Contents/MacOS/qbittorrent-noxin two separate terminal windows, and the second instance exits, which is expected.Related: #23744 , #21557
Results of the grep: