Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve code to avoid multiple completion requests

This commit is contained in:
Martchus 2020-03-02 18:20:48 +01:00
parent 7ad623d660
commit b8f19b5cc1
1 changed files with 21 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
connector/syncthingconnection_requests.cpp
View File

@ -1104,7 +1104,7 @@ static void ensureCompletionNotConsideredRequested(const QString &devId, Syncthi
devInfo->completionByDir[dirId].requested = false;
}
if (dirInfo) {
dirInfo->completionByDevice[dirId].requested = false;
dirInfo->completionByDevice[devId].requested = false;
}
}
/// \endcond
@ -2071,10 +2071,27 @@ void SyncthingConnection::readRemoteIndexUpdated(DateTime eventTime, const QJson
}
// request completion again if not already requested and out-of-date
const auto &completion = dirInfo ? dirInfo->completionByDevice[devId] : devInfo->completionByDir[dirId];
if (!completion.requested && completion.lastUpdate < eventTime) {
requestCompletion(devId, dirId);
// note: Considering the current completion info stored within the dir info and the dev info. That
// should not be required because both should be in sync but theoretically a user of the library
// might meddle with that.
auto *const completionFromDirInfo = dirInfo ? &dirInfo->completionByDevice[devId] : nullptr;
auto *const completionFromDevInfo = devInfo ? &devInfo->completionByDir[dirId] : nullptr;
if ((completionFromDirInfo && completionFromDirInfo->requested) || (completionFromDevInfo && completionFromDevInfo->requested)) {
return;
}
const auto lastUpdate = completionFromDirInfo && completionFromDevInfo
? min(completionFromDirInfo->lastUpdate, completionFromDevInfo->lastUpdate)
: (completionFromDirInfo ? completionFromDirInfo->lastUpdate : completionFromDevInfo->lastUpdate);
if (lastUpdate >= eventTime) {
return;
}
if (completionFromDirInfo) {
completionFromDirInfo->requested = true;
}
if (completionFromDevInfo) {
completionFromDevInfo->requested = true;
}
requestCompletion(devId, dirId);
}
/*!