highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-06-29 18:20:58 +02:00
Code Issues Packages Projects Releases Wiki Activity

Use steady_clock in ConnectAndCallRPC and inline time call in loop conditional

Browse Source 
to avoid unnecessary invocations and an unneeded local variable allocation.
This commit is contained in:
Jon Atack
2022-05-17 14:46:13 +02:00
parent 3799d2dcdd
commit 3a998d2e37
1 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/bitcoin-cli.cpp
View File

@ -844,7 +844,7 @@ static UniValue ConnectAndCallRPC(BaseRequestHandler* rh, const std::string& str
// Execute and handle connection failures with -rpcwait. // Execute and handle connection failures with -rpcwait.
const bool fWait = gArgs.GetBoolArg("-rpcwait", false); const bool fWait = gArgs.GetBoolArg("-rpcwait", false);
const int timeout = gArgs.GetIntArg("-rpcwaittimeout", DEFAULT_WAIT_CLIENT_TIMEOUT); const int timeout = gArgs.GetIntArg("-rpcwaittimeout", DEFAULT_WAIT_CLIENT_TIMEOUT);
const auto deadline{GetTime<std::chrono::microseconds>() + 1s * timeout}; const auto deadline{std::chrono::steady_clock::now() + 1s * timeout};
do { do {
try { try {
@ -857,8 +857,7 @@ static UniValue ConnectAndCallRPC(BaseRequestHandler* rh, const std::string& str
} }
break; // Connection succeeded, no need to retry. break; // Connection succeeded, no need to retry.
} catch (const CConnectionFailed& e) { } catch (const CConnectionFailed& e) {
const auto now{GetTime<std::chrono::microseconds>()}; if (fWait && (timeout <= 0 || std::chrono::steady_clock::now() < deadline)) {
if (fWait && (timeout <= 0 || now < deadline)) {
UninterruptibleSleep(1s); UninterruptibleSleep(1s);
} else { } else {
throw CConnectionFailed(strprintf("timeout on transient error: %s", e.what())); throw CConnectionFailed(strprintf("timeout on transient error: %s", e.what()));