Skip to content

Fix #1790: discard test poll results from a finished sweep #1806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
4RH1T3CT0R7 wants to merge 1 commit into
base: dev
Choose a base branch
from
+17 −6
Open

Fix #1790: discard test poll results from a finished sweep #1806

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions include/ui/mainWindow/TestRunner.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,9 +75,10 @@ class TestRunner {

QString contextName(int entID) const;

void pollSpeedTest(const QMap<QString, int>& tag2entID, bool testCurrent);
// `gen` is the sweep the poll belongs to, re-checked once the query returns.
void pollSpeedTest(const QMap<QString, int>& tag2entID, bool testCurrent, quint64 gen);

void pollCountryTest(const QMap<QString, int>& tag2entID, bool testCurrent);
void pollCountryTest(const QMap<QString, int>& tag2entID, bool testCurrent, quint64 gen);

void creditTraffic(const std::shared_ptr<Configs::Profile>& profile, const QString& tag,
qint64 curUp, qint64 curDown);
Expand Down
18 changes: 14 additions & 4 deletions src/ui/mainWindow/TestRunner.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,6 +155,10 @@ void TestRunner::runUrlProbe(const Target& target) {
if (sessionGen_.load() != gen) return;
bool ok = false;
const auto resp = defaultClient->QueryURLTest(&ok);
// Re-checked: the tick's opening check is stale by now. A poll can sit in
// this RPC while its sweep ends and the next one zeroes the counter and
// reuses the positional outbound tags, so a late drain lands on the wrong run.
if (sessionGen_.load() != gen) return;
if (!ok || resp.results.empty()) return;

QList<int> updated;
Expand Down Expand Up @@ -217,6 +221,8 @@ void TestRunner::runIpProbe(const Target& target) {
if (sessionGen_.load() != gen) return;
bool ok = false;
const auto resp = defaultClient->QueryIPTest(&ok);
// See runUrlProbe: the opening check cannot cover the query itself.
if (sessionGen_.load() != gen) return;
if (!ok || resp.results.empty()) return;

QList<int> updated;
Expand Down Expand Up @@ -462,10 +468,12 @@ void TestRunner::creditTraffic(const std::shared_ptr<Configs::Profile>& profile,
Configs::dataManager->profilesRepo->SaveTraffic(profile);
}

void TestRunner::pollSpeedTest(const QMap<QString, int>& tag2entID, bool testCurrent)
void TestRunner::pollSpeedTest(const QMap<QString, int>& tag2entID, bool testCurrent, quint64 gen)
{
bool ok = false;
const auto res = defaultClient->QueryCurrentSpeedTests(&ok);
// See runUrlProbe: the opening check cannot cover the query itself.
if (sessionGen_.load() != gen) return;
if (!ok || !res.is_running.value())
{
return;
Expand Down Expand Up @@ -496,10 +504,12 @@ void TestRunner::pollSpeedTest(const QMap<QString, int>& tag2entID, bool testCur
});
}

void TestRunner::pollCountryTest(const QMap<QString, int>& tag2entID, bool testCurrent)
void TestRunner::pollCountryTest(const QMap<QString, int>& tag2entID, bool testCurrent, quint64 gen)
{
bool ok = false;
const auto res = defaultClient->QueryCountryTestResults(&ok);
// See runUrlProbe: the opening check cannot cover the query itself.
if (sessionGen_.load() != gen) return;
if (!ok || res.results.empty())
{
return;
Expand Down Expand Up @@ -562,8 +572,8 @@ void TestRunner::runSpeedProbe(const Target& target)
{
ResultPoller poller([this, gen = sessionGen_.load(), tag2entID = target.tag2entID, testCurrent = target.testCurrent, speedtestConf] {
if (sessionGen_.load() != gen) return;
if (speedtestConf == Configs::TestConfig::COUNTRY) pollCountryTest(tag2entID, testCurrent);
else pollSpeedTest(tag2entID, testCurrent);
if (speedtestConf == Configs::TestConfig::COUNTRY) pollCountryTest(tag2entID, testCurrent, gen);
else pollSpeedTest(tag2entID, testCurrent, gen);
}, kSpeedPollIntervalMs);

result = defaultClient->SpeedTest(&rpcOK, req, &coreError);
Expand Down