highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-30 08:01:12 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge #19220: refactor: Replace RecursiveMutex with Mutex in warnings.cpp

Browse Source 
bacbfb61ee 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 bacbfb61ee
  MarcoFalke:
    ACK bacbfb61ee , reviewed with -W  --word-diff-regex=. 🎿

Tree-SHA512: cc06d3d30e4051115d176dcfbd496c8562a70087369bccde756c1de42d7dc3f415ef20d3d69ad2599c1d0cd4228d604d7564adc17beac7b6ff92b924b8c20d54
This commit is contained in:
MarcoFalke
2020-06-09 08:54:52 -04:00
parent a79bca2f1f bacbfb61ee
commit 9ad6f14175
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/warnings.cpp
View File

@@ -9,32 +9,32 @@
#include <util/system.h> #include <util/system.h>
#include <util/translation.h> #include <util/translation.h>
static RecursiveMutex cs_warnings; static Mutex g_warnings_mutex;
static std::string strMiscWarning GUARDED_BY(cs_warnings); static std::string strMiscWarning GUARDED_BY(g_warnings_mutex);
static bool fLargeWorkForkFound GUARDED_BY(cs_warnings) = false; static bool fLargeWorkForkFound GUARDED_BY(g_warnings_mutex) = false;
static bool fLargeWorkInvalidChainFound GUARDED_BY(cs_warnings) = false; static bool fLargeWorkInvalidChainFound GUARDED_BY(g_warnings_mutex) = false;
void SetMiscWarning(const std::string& strWarning) void SetMiscWarning(const std::string& strWarning)
{ {
LOCK(cs_warnings); LOCK(g_warnings_mutex);
strMiscWarning = strWarning; strMiscWarning = strWarning;
} }
void SetfLargeWorkForkFound(bool flag) void SetfLargeWorkForkFound(bool flag)
{ {
LOCK(cs_warnings); LOCK(g_warnings_mutex);
fLargeWorkForkFound = flag; fLargeWorkForkFound = flag;
} }
bool GetfLargeWorkForkFound() bool GetfLargeWorkForkFound()
{ {
LOCK(cs_warnings); LOCK(g_warnings_mutex);
return fLargeWorkForkFound; return fLargeWorkForkFound;
} }
void SetfLargeWorkInvalidChainFound(bool flag) void SetfLargeWorkInvalidChainFound(bool flag)
{ {
LOCK(cs_warnings); LOCK(g_warnings_mutex);
fLargeWorkInvalidChainFound = flag; fLargeWorkInvalidChainFound = flag;
} }
@@ -44,7 +44,7 @@ std::string GetWarnings(bool verbose)
std::string warnings_verbose; std::string warnings_verbose;
const std::string warning_separator = "<hr />"; const std::string warning_separator = "<hr />";
LOCK(cs_warnings); LOCK(g_warnings_mutex);
// Pre-release build warning // Pre-release build warning
if (!CLIENT_VERSION_IS_RELEASE) { if (!CLIENT_VERSION_IS_RELEASE) {