diff options
| author | MarcoFalke <falke.marco@gmail.com> | 2018-05-14 08:46:39 -0400 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2018-05-14 08:46:54 -0400 |
| commit | ea7d6553bc7d5660cb2f90f1642b6d7f57d8bf77 (patch) | |
| tree | 8f94c5745aa8aa8a578484e6a2ca2096757209d5 | |
| parent | 3cbd25f9bfbec44d7ae3f866908485d236ff163c (diff) | |
| parent | 8499f15e67acb4789bfef4fcfc2b56dbfeae17bc (diff) | |
| download | bitcoin-ea7d6553bc7d5660cb2f90f1642b6d7f57d8bf77.tar.xz | |
Merge #13116: Add Clang thread safety annotations for variables guarded by cs_{rpcWarmup,nTimeOffset,warnings}
8499f15e67 Add Clang thread safety annotations for variables guarded by cs_warnings (practicalswift)
cf13ad23d4 Add Clang thread safety annotations for variables guarded by cs_nTimeOffset (practicalswift)
012dec0347 Add Clang thread safety annotations for variables guarded by cs_rpcWarmup (practicalswift)
Pull request description:
Add Clang thread safety annotations for variables guarded by `cs_{rpcWarmup,nTimeOffset,warnings}`.
Tree-SHA512: 8e0a4b9e36a4450bd75ad32c21d813bb572aaaa5b4a4cbdcbf4678e58ade6265c0b275352391168930a63fcbd09caa3b76e74595a7b14646054c52870c46d007
| -rw-r--r-- | src/rpc/server.cpp | 6 | ||||
| -rw-r--r-- | src/timedata.cpp | 2 | ||||
| -rw-r--r-- | src/warnings.cpp | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/src/rpc/server.cpp b/src/rpc/server.cpp index 7edd51d3d7..10040b1255 100644 --- a/src/rpc/server.cpp +++ b/src/rpc/server.cpp @@ -23,10 +23,10 @@ #include <memory> // for unique_ptr #include <unordered_map> -static bool fRPCRunning = false; -static bool fRPCInWarmup = true; -static std::string rpcWarmupStatus("RPC server started"); static CCriticalSection cs_rpcWarmup; +static bool fRPCRunning = false; +static bool fRPCInWarmup GUARDED_BY(cs_rpcWarmup) = true; +static std::string rpcWarmupStatus GUARDED_BY(cs_rpcWarmup) = "RPC server started"; /* Timer-creating functions */ static RPCTimerInterface* timerInterface = nullptr; /* Map of name to timer. */ diff --git a/src/timedata.cpp b/src/timedata.cpp index 27d08172f5..dfb8fe55af 100644 --- a/src/timedata.cpp +++ b/src/timedata.cpp @@ -17,7 +17,7 @@ static CCriticalSection cs_nTimeOffset; -static int64_t nTimeOffset = 0; +static int64_t nTimeOffset GUARDED_BY(cs_nTimeOffset) = 0; /** * "Never go to sea with two chronometers; take one or three." diff --git a/src/warnings.cpp b/src/warnings.cpp index dc4e6e4842..534745f998 100644 --- a/src/warnings.cpp +++ b/src/warnings.cpp @@ -9,9 +9,9 @@ #include <warnings.h> CCriticalSection cs_warnings; -std::string strMiscWarning; -bool fLargeWorkForkFound = false; -bool fLargeWorkInvalidChainFound = false; +std::string strMiscWarning GUARDED_BY(cs_warnings); +bool fLargeWorkForkFound GUARDED_BY(cs_warnings) = false; +bool fLargeWorkInvalidChainFound GUARDED_BY(cs_warnings) = false; void SetMiscWarning(const std::string& strWarning) { |