diff --git a/cli/cli.cc b/cli/cli.cc index c8ef33038..86f5f6797 100644 --- a/cli/cli.cc +++ b/cli/cli.cc @@ -7,6 +7,7 @@ #include /* atoi () */ #include #include +#include #include @@ -17,7 +18,7 @@ #include #include #include -#include /* tr_wait() */ +#include // _() #include #include #include @@ -273,7 +274,7 @@ int tr_main(int argc, char* argv[]) waitingOnWeb = true; while (waitingOnWeb) { - tr_wait(1s); + std::this_thread::sleep_for(1s); } } else @@ -315,7 +316,7 @@ int tr_main(int argc, char* argv[]) "Error:", }; - tr_wait(200ms); + std::this_thread::sleep_for(200ms); if (gotsig) { diff --git a/libtransmission/utils.h b/libtransmission/utils.h index a44448121..5b1329cef 100644 --- a/libtransmission/utils.h +++ b/libtransmission/utils.h @@ -7,14 +7,12 @@ #include #include -#include #include // uint8_t, uint32_t, uint64_t #include // size_t #include // time_t #include #include #include -#include #include #include @@ -87,13 +85,6 @@ constexpr auto tr_saveFile(std::string_view filename, ContiguousRange const& x, /** @brief return the current date in milliseconds */ [[nodiscard]] uint64_t tr_time_msec(); -/** @brief sleep for the specified duration */ -template -void tr_wait(std::chrono::duration const& delay) -{ - std::this_thread::sleep_for(delay); -} - template::value, bool> = true> [[nodiscard]] std::optional tr_parseNum(std::string_view str, std::string_view* setme_remainder = nullptr, int base = 10); diff --git a/libtransmission/verify.cc b/libtransmission/verify.cc index 2cf3e4038..826c14b70 100644 --- a/libtransmission/verify.cc +++ b/libtransmission/verify.cc @@ -21,7 +21,7 @@ #include "libtransmission/log.h" #include "libtransmission/torrent.h" #include "libtransmission/tr-assert.h" -#include "libtransmission/utils.h" // tr_time(), tr_wait() +#include "libtransmission/utils.h" // tr_time() #include "libtransmission/verify.h" using namespace std::chrono_literals; @@ -135,7 +135,7 @@ bool tr_verify_worker::verify_torrent(tr_torrent* tor, std::atomic const& if (auto const now = tr_time(); last_slept_at != now) { last_slept_at = now; - tr_wait(SleepPerSecondDuringVerify); + std::this_thread::sleep_for(SleepPerSecondDuringVerify); } sha->clear(); @@ -277,6 +277,6 @@ tr_verify_worker::~tr_verify_worker() while (verify_thread_id_.has_value()) { - tr_wait(20ms); + std::this_thread::sleep_for(20ms); } } diff --git a/libtransmission/web.cc b/libtransmission/web.cc index 162143b5e..38a1584b5 100644 --- a/libtransmission/web.cc +++ b/libtransmission/web.cc @@ -705,7 +705,7 @@ public: ++repeats; if (repeats > 1U) { - tr_wait(100ms); + std::this_thread::sleep_for(100ms); } } else diff --git a/tests/libtransmission/test-fixtures.h b/tests/libtransmission/test-fixtures.h index b395e79ef..da65c7727 100644 --- a/tests/libtransmission/test-fixtures.h +++ b/tests/libtransmission/test-fixtures.h @@ -89,7 +89,7 @@ inline bool waitFor(std::function const& test, std::chrono::milliseconds return false; } - tr_wait(10ms); + std::this_thread::sleep_for(10ms); } }