Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 12:28:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove tr_wait(); use std::this_thread::sleep_for() (#5683)

Browse Source
This commit is contained in:
Charles Kerr
2023-06-29 08:51:39 -05:00
committed by GitHub
parent fd4a0b1d16
commit 3474a1da58
5 changed files with 9 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
cli/cli.cc
View File

@@ -7,6 +7,7 @@
#include <cstdlib> /* atoi () */ #include <cstdlib> /* atoi () */
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <thread>
#include <signal.h> #include <signal.h>
@@ -17,7 +18,7 @@
#include <libtransmission/error.h> #include <libtransmission/error.h>
#include <libtransmission/file.h> #include <libtransmission/file.h>
#include <libtransmission/tr-getopt.h> #include <libtransmission/tr-getopt.h>
#include <libtransmission/utils.h> /* tr_wait() */ #include <libtransmission/utils.h> // _()
#include <libtransmission/variant.h> #include <libtransmission/variant.h>
#include <libtransmission/version.h> #include <libtransmission/version.h>
#include <libtransmission/web-utils.h> #include <libtransmission/web-utils.h>
@@ -273,7 +274,7 @@ int tr_main(int argc, char* argv[])
waitingOnWeb = true; waitingOnWeb = true;
while (waitingOnWeb) while (waitingOnWeb)
{ {
tr_wait(1s); std::this_thread::sleep_for(1s);
} }
} }
else else
@@ -315,7 +316,7 @@ int tr_main(int argc, char* argv[])
"Error:", "Error:",
}; };
tr_wait(200ms); std::this_thread::sleep_for(200ms);
if (gotsig) if (gotsig)
{ {

9
libtransmission/utils.h
View File

@@ -7,14 +7,12 @@
#include <algorithm> #include <algorithm>
#include <cctype> #include <cctype>
#include <chrono>
#include <cstdint> // uint8_t, uint32_t, uint64_t #include <cstdint> // uint8_t, uint32_t, uint64_t
#include <cstddef> // size_t #include <cstddef> // size_t
#include <ctime> // time_t #include <ctime> // time_t
#include <optional> #include <optional>
#include <string> #include <string>
#include <string_view> #include <string_view>
#include <thread>
#include <type_traits> #include <type_traits>
#include <vector> #include <vector>
@@ -87,13 +85,6 @@ constexpr auto tr_saveFile(std::string_view filename, ContiguousRange const& x,
/** @brief return the current date in milliseconds */ /** @brief return the current date in milliseconds */
[[nodiscard]] uint64_t tr_time_msec(); [[nodiscard]] uint64_t tr_time_msec();
/** @brief sleep for the specified duration */
template<class rep, class period>
void tr_wait(std::chrono::duration<rep, period> const& delay)
{
std::this_thread::sleep_for(delay);
}
template<typename T, std::enable_if_t<std::is_integral<T>::value, bool> = true> template<typename T, std::enable_if_t<std::is_integral<T>::value, bool> = true>
[[nodiscard]] std::optional<T> tr_parseNum(std::string_view str, std::string_view* setme_remainder = nullptr, int base = 10); [[nodiscard]] std::optional<T> tr_parseNum(std::string_view str, std::string_view* setme_remainder = nullptr, int base = 10);

6
libtransmission/verify.cc
View File

@@ -21,7 +21,7 @@
#include "libtransmission/log.h" #include "libtransmission/log.h"
#include "libtransmission/torrent.h" #include "libtransmission/torrent.h"
#include "libtransmission/tr-assert.h" #include "libtransmission/tr-assert.h"
#include "libtransmission/utils.h" // tr_time(), tr_wait() #include "libtransmission/utils.h" // tr_time()
#include "libtransmission/verify.h" #include "libtransmission/verify.h"
using namespace std::chrono_literals; using namespace std::chrono_literals;
@@ -135,7 +135,7 @@ bool tr_verify_worker::verify_torrent(tr_torrent* tor, std::atomic<bool> const&
if (auto const now = tr_time(); last_slept_at != now) if (auto const now = tr_time(); last_slept_at != now)
{ {
last_slept_at = now; last_slept_at = now;
tr_wait(SleepPerSecondDuringVerify); std::this_thread::sleep_for(SleepPerSecondDuringVerify);
} }
sha->clear(); sha->clear();
@@ -277,6 +277,6 @@ tr_verify_worker::~tr_verify_worker()
while (verify_thread_id_.has_value()) while (verify_thread_id_.has_value())
{ {
tr_wait(20ms); std::this_thread::sleep_for(20ms);
} }
} }

2
libtransmission/web.cc
View File

@@ -705,7 +705,7 @@ public:
++repeats; ++repeats;
if (repeats > 1U) if (repeats > 1U)
{ {
tr_wait(100ms); std::this_thread::sleep_for(100ms);
} }
} }
else else

2
tests/libtransmission/test-fixtures.h
View File

@@ -89,7 +89,7 @@ inline bool waitFor(std::function<bool()> const& test, std::chrono::milliseconds
return false; return false;
} }
tr_wait(10ms); std::this_thread::sleep_for(10ms);
} }
} }