mirror/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission synced 2025-03-05 02:58:33 +00:00
Code Issues Releases Wiki Activity

fix: thread-sanitizer warnings in SandboxedTests (#4131)

Browse source
This commit is contained in:
Charles Kerr 2022-11-09 23:56:08 -06:00 • committed by GitHub
parent 7e817b5a43
commit 2d2270c7d9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 30 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
tests/libtransmission/test-fixtures.h
View file

@ -6,6 +6,7 @@
#pragma once #pragma once
#include <chrono> #include <chrono>
#include <condition_variable>
#include <cstdlib> // getenv() #include <cstdlib> // getenv()
#include <cstring> // strlen() #include <cstring> // strlen()
#include <iostream> #include <iostream>
@ -404,19 +405,23 @@ protected:
Complete Complete
}; };
[[nodiscard]] tr_torrent* createTorrentAndWaitForVerifyDone(tr_ctor* ctor) const [[nodiscard]] tr_torrent* createTorrentAndWaitForVerifyDone(tr_ctor* ctor)
{ {
auto verified_lock = std::unique_lock(verified_mutex_);
auto const n_previously_verified = std::size(verified_); auto const n_previously_verified = std::size(verified_);
auto* const tor = tr_torrentNew(ctor, nullptr); auto* const tor = tr_torrentNew(ctor, nullptr);
auto const stop_waiting = [this, tor, n_previously_verified]()
{
return std::size(verified_) > n_previously_verified && verified_.back() == tor;
};
EXPECT_NE(nullptr, tor); EXPECT_NE(nullptr, tor);
waitFor( verified_cv_.wait_for(verified_lock, 20s, stop_waiting);
[this, tor, n_previously_verified]()
{ return std::size(verified_) > n_previously_verified && verified_.back() == tor; },
20s);
return tor; return tor;
} }
[[nodiscard]] tr_torrent* zeroTorrentInit(ZeroTorrentState state) const [[nodiscard]] tr_torrent* zeroTorrentInit(ZeroTorrentState state)
{ {
// 1048576 files-filled-with-zeroes/1048576 // 1048576 files-filled-with-zeroes/1048576
// 4096 files-filled-with-zeroes/4096 // 4096 files-filled-with-zeroes/4096
@ -486,16 +491,20 @@ protected:
return tor; return tor;
} }
void blockingTorrentVerify(tr_torrent* tor) const void blockingTorrentVerify(tr_torrent* tor)
{ {
EXPECT_NE(nullptr, tor->session); EXPECT_NE(nullptr, tor->session);
EXPECT_FALSE(tor->session->amInSessionThread()); EXPECT_FALSE(tor->session->amInSessionThread());
auto verified_lock = std::unique_lock(verified_mutex_);
auto const n_previously_verified = std::size(verified_); auto const n_previously_verified = std::size(verified_);
auto const stop_waiting = [this, tor, n_previously_verified]()
{
return std::size(verified_) > n_previously_verified && verified_.back() == tor;
};
tr_torrentVerify(tor); tr_torrentVerify(tor);
waitFor( verified_cv_.wait_for(verified_lock, 20s, stop_waiting);
[this, tor, n_previously_verified]()
{ return std::size(verified_) > n_previously_verified && verified_.back() == tor; },
20s);
} }
tr_session* session_ = nullptr; tr_session* session_ = nullptr;
@ -521,8 +530,15 @@ protected:
{ {
SandboxedTest::SetUp(); SandboxedTest::SetUp();
auto callback = [this](tr_torrent* tor, bool /*aborted*/)
{
auto verified_lock = std::scoped_lock(verified_mutex_);
verified_.emplace_back(tor);
verified_cv_.notify_one();
};
session_ = sessionInit(settings()); session_ = sessionInit(settings());
session_->verifier_->addCallback([this](tr_torrent* tor, bool /*aborted*/) { verified_.emplace_back(tor); }); session_->verifier_->addCallback(callback);
} }
virtual void TearDown() override virtual void TearDown() override
@ -535,6 +551,8 @@ protected:
} }
private: private:
std::mutex verified_mutex_;
std::condition_variable verified_cv_;
std::vector<tr_torrent*> verified_; std::vector<tr_torrent*> verified_;
}; };