phantom/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-01-11 20:32:35 -03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge #19399: refactor: Replace RecursiveMutex with Mutex in rpc/server.cpp

Browse source 
6fdfeebcc7 refactor: Replace RecursiveMutex with Mutex in rpc/server.cpp (Hennadii Stepanov)

Pull request description:

  The functions that could lock this mutex, i.e., `SetRPCWarmupStatus()`, `SetRPCWarmupFinished()`, `RPCIsInWarmup()`, `CRPCTable::execute()`, do not call itself recursively, and do not call each other either directly or indirectly. Therefore, the `g_rpc_warmup_mutex` could be a non-recursive mutex.

  Related to #19303.

ACKs for top commit:
  laanwj:
    ACK 6fdfeebcc7
  MarcoFalke:
    ACK 6fdfeebcc7

Tree-SHA512: 05a8ac58c0cd6a3c9afad9e06ad78059642e3e97715e129f379c0bf6dccdb58e70d05d965f23e7432fd3f02d7f97967a778ffb8e424837891d9d785a9e98964c
This commit is contained in:
Wladimir J. van der Laan 2020-06-29 19:03:18 +02:00
commit 2af56d6d5c
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/rpc/server.cpp
View file

@ -20,10 +20,10 @@
#include <mutex> #include <mutex>
#include <unordered_map> #include <unordered_map>
static RecursiveMutex cs_rpcWarmup; static Mutex g_rpc_warmup_mutex;
static std::atomic<bool> g_rpc_running{false}; static std::atomic<bool> g_rpc_running{false};
static bool fRPCInWarmup GUARDED_BY(cs_rpcWarmup) = true; static bool fRPCInWarmup GUARDED_BY(g_rpc_warmup_mutex) = true;
static std::string rpcWarmupStatus GUARDED_BY(cs_rpcWarmup) = "RPC server started"; static std::string rpcWarmupStatus GUARDED_BY(g_rpc_warmup_mutex) = "RPC server started";
/* Timer-creating functions */ /* Timer-creating functions */
static RPCTimerInterface* timerInterface = nullptr; static RPCTimerInterface* timerInterface = nullptr;
/* Map of name to timer. */ /* Map of name to timer. */
@ -327,20 +327,20 @@ void RpcInterruptionPoint()
void SetRPCWarmupStatus(const std::string& newStatus) void SetRPCWarmupStatus(const std::string& newStatus)
{ {
LOCK(cs_rpcWarmup); LOCK(g_rpc_warmup_mutex);
rpcWarmupStatus = newStatus; rpcWarmupStatus = newStatus;
} }
void SetRPCWarmupFinished() void SetRPCWarmupFinished()
{ {
LOCK(cs_rpcWarmup); LOCK(g_rpc_warmup_mutex);
assert(fRPCInWarmup); assert(fRPCInWarmup);
fRPCInWarmup = false; fRPCInWarmup = false;
} }
bool RPCIsInWarmup(std::string *outStatus) bool RPCIsInWarmup(std::string *outStatus)
{ {
LOCK(cs_rpcWarmup); LOCK(g_rpc_warmup_mutex);
if (outStatus) if (outStatus)
*outStatus = rpcWarmupStatus; *outStatus = rpcWarmupStatus;
return fRPCInWarmup; return fRPCInWarmup;
@ -439,7 +439,7 @@ UniValue CRPCTable::execute(const JSONRPCRequest &request) const
{ {
// Return immediately if in warmup // Return immediately if in warmup
{ {
LOCK(cs_rpcWarmup); LOCK(g_rpc_warmup_mutex);
if (fRPCInWarmup) if (fRPCInWarmup)
throw JSONRPCError(RPC_IN_WARMUP, rpcWarmupStatus); throw JSONRPCError(RPC_IN_WARMUP, rpcWarmupStatus);
} }