Skip to content

Commit

Permalink
Merge bitcoin#19220: refactor: Replace RecursiveMutex with Mutex in w…
Browse files Browse the repository at this point in the history
…arnings.cpp

bacbfb6 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 bitcoin#19180.

ACKs for top commit:
  laanwj:
    Code review ACK bacbfb6
  MarcoFalke:
    ACK bacbfb6 , reviewed with -W  --word-diff-regex=. 🎿

Tree-SHA512: cc06d3d30e4051115d176dcfbd496c8562a70087369bccde756c1de42d7dc3f415ef20d3d69ad2599c1d0cd4228d604d7564adc17beac7b6ff92b924b8c20d54
  • Loading branch information
MarcoFalke authored and PastaPastaPasta committed Jun 28, 2021
1 parent bc67a78 commit b192adc
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions src/warnings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,32 +9,32 @@
#include <warnings.h>
#include <hash.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;
}

Expand All @@ -44,7 +44,7 @@ std::string GetWarnings(const std::string& strFor)
std::string strGUI;
const std::string uiAlertSeperator = "<hr />";

LOCK(cs_warnings);
LOCK(g_warnings_mutex);

if (!CLIENT_VERSION_IS_RELEASE) {
strStatusBar = "This is a pre-release test build - use at your own risk - do not use for mining or merchant applications";
Expand Down

0 comments on commit b192adc

Please sign in to comment.