aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2020-06-09 08:54:52 -0400
committerMarcoFalke <falke.marco@gmail.com>2020-06-09 08:54:57 -0400
commit9ad6f14175c19b5d47267c3dd5840c14bad43c83 (patch)
tree23af49ae07c02d1150a28256e93d0ba6708d6f90
parenta79bca2f1fb25f433d6e100a31a3acfde2656ce1 (diff)
parentbacbfb61eee6d3c32de3db4dea3f585c7159b643 (diff)
Merge #19220: refactor: Replace RecursiveMutex with Mutex in warnings.cpp
bacbfb61eee6d3c32de3db4dea3f585c7159b643 refactor: Replace RecursiveMutex with Mutex in warnings.cpp (Hennadii Stepanov) Pull request description: The functions that could lock this mutex, i.e., `SetMiscWarning()`, `{S,G}etfLargeWorkForkFound()`, `SetfLargeWorkInvalidChainFound()`, `GetWarnings()`, do not call itself recursively, and do not call each other either directly or indirectly. Therefore, the `g_warnings_mutex` could be a non-recursive mutex. Related to #19180. ACKs for top commit: laanwj: Code review ACK bacbfb61eee6d3c32de3db4dea3f585c7159b643 MarcoFalke: ACK bacbfb61eee6d3c32de3db4dea3f585c7159b643 , reviewed with -W --word-diff-regex=. 🎿 Tree-SHA512: cc06d3d30e4051115d176dcfbd496c8562a70087369bccde756c1de42d7dc3f415ef20d3d69ad2599c1d0cd4228d604d7564adc17beac7b6ff92b924b8c20d54
-rw-r--r--src/warnings.cpp18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/warnings.cpp b/src/warnings.cpp
index 467c3d0f65..e04e800687 100644
--- a/src/warnings.cpp
+++ b/src/warnings.cpp
@@ -9,32 +9,32 @@
#include <util/system.h>
#include <util/translation.h>
-static RecursiveMutex cs_warnings;
-static std::string strMiscWarning GUARDED_BY(cs_warnings);
-static bool fLargeWorkForkFound GUARDED_BY(cs_warnings) = false;
-static bool fLargeWorkInvalidChainFound GUARDED_BY(cs_warnings) = false;
+static Mutex g_warnings_mutex;
+static std::string strMiscWarning GUARDED_BY(g_warnings_mutex);
+static bool fLargeWorkForkFound GUARDED_BY(g_warnings_mutex) = false;
+static bool fLargeWorkInvalidChainFound GUARDED_BY(g_warnings_mutex) = false;
void SetMiscWarning(const std::string& strWarning)
{
- LOCK(cs_warnings);
+ LOCK(g_warnings_mutex);
strMiscWarning = strWarning;
}
void SetfLargeWorkForkFound(bool flag)
{
- LOCK(cs_warnings);
+ LOCK(g_warnings_mutex);
fLargeWorkForkFound = flag;
}
bool GetfLargeWorkForkFound()
{
- LOCK(cs_warnings);
+ LOCK(g_warnings_mutex);
return fLargeWorkForkFound;
}
void SetfLargeWorkInvalidChainFound(bool flag)
{
- LOCK(cs_warnings);
+ LOCK(g_warnings_mutex);
fLargeWorkInvalidChainFound = flag;
}
@@ -44,7 +44,7 @@ std::string GetWarnings(bool verbose)
std::string warnings_verbose;
const std::string warning_separator = "<hr />";
- LOCK(cs_warnings);
+ LOCK(g_warnings_mutex);
// Pre-release build warning
if (!CLIENT_VERSION_IS_RELEASE) {