mirror of
https://github.com/kvazar-network/kevacoin.git
synced 2025-01-11 23:58:18 +00:00
Fix -Wthread-safety-analysis warnings. Change the sync.h primitives to std from boost.
Commit 1. This code was written by @TheBlueMatt in the following branch: * https://github.com/TheBlueMatt/bitcoin/commits/2017-08-test-10923 This commit message was written by me (@practicalswift) who also squashed @TheBlueMatt's commits into one and tried to summarize the changes made. Commit 2. Remove boost include. Remove boost mentions in comments.
This commit is contained in:
parent
e022463a4b
commit
7e319d6393
@ -544,14 +544,14 @@ static void BlockNotifyCallback(bool initialSync, const CBlockIndex *pBlockIndex
|
|||||||
}
|
}
|
||||||
|
|
||||||
static bool fHaveGenesis = false;
|
static bool fHaveGenesis = false;
|
||||||
static boost::mutex cs_GenesisWait;
|
static CWaitableCriticalSection cs_GenesisWait;
|
||||||
static CConditionVariable condvar_GenesisWait;
|
static CConditionVariable condvar_GenesisWait;
|
||||||
|
|
||||||
static void BlockNotifyGenesisWait(bool, const CBlockIndex *pBlockIndex)
|
static void BlockNotifyGenesisWait(bool, const CBlockIndex *pBlockIndex)
|
||||||
{
|
{
|
||||||
if (pBlockIndex != nullptr) {
|
if (pBlockIndex != nullptr) {
|
||||||
{
|
{
|
||||||
boost::unique_lock<boost::mutex> lock_GenesisWait(cs_GenesisWait);
|
WaitableLock lock_GenesisWait(cs_GenesisWait);
|
||||||
fHaveGenesis = true;
|
fHaveGenesis = true;
|
||||||
}
|
}
|
||||||
condvar_GenesisWait.notify_all();
|
condvar_GenesisWait.notify_all();
|
||||||
@ -1634,7 +1634,7 @@ bool AppInitMain(boost::thread_group& threadGroup, CScheduler& scheduler)
|
|||||||
|
|
||||||
// Wait for genesis block to be processed
|
// Wait for genesis block to be processed
|
||||||
{
|
{
|
||||||
boost::unique_lock<boost::mutex> lock(cs_GenesisWait);
|
WaitableLock lock(cs_GenesisWait);
|
||||||
while (!fHaveGenesis) {
|
while (!fHaveGenesis) {
|
||||||
condvar_GenesisWait.wait(lock);
|
condvar_GenesisWait.wait(lock);
|
||||||
}
|
}
|
||||||
|
@ -455,7 +455,7 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
|
|||||||
{
|
{
|
||||||
// Wait to respond until either the best block changes, OR a minute has passed and there are more transactions
|
// Wait to respond until either the best block changes, OR a minute has passed and there are more transactions
|
||||||
uint256 hashWatchedChain;
|
uint256 hashWatchedChain;
|
||||||
boost::system_time checktxtime;
|
std::chrono::steady_clock::time_point checktxtime;
|
||||||
unsigned int nTransactionsUpdatedLastLP;
|
unsigned int nTransactionsUpdatedLastLP;
|
||||||
|
|
||||||
if (lpval.isStr())
|
if (lpval.isStr())
|
||||||
@ -476,17 +476,17 @@ UniValue getblocktemplate(const JSONRPCRequest& request)
|
|||||||
// Release the wallet and main lock while waiting
|
// Release the wallet and main lock while waiting
|
||||||
LEAVE_CRITICAL_SECTION(cs_main);
|
LEAVE_CRITICAL_SECTION(cs_main);
|
||||||
{
|
{
|
||||||
checktxtime = boost::get_system_time() + boost::posix_time::minutes(1);
|
checktxtime = std::chrono::steady_clock::now() + std::chrono::minutes(1);
|
||||||
|
|
||||||
boost::unique_lock<boost::mutex> lock(csBestBlock);
|
WaitableLock lock(csBestBlock);
|
||||||
while (chainActive.Tip()->GetBlockHash() == hashWatchedChain && IsRPCRunning())
|
while (chainActive.Tip()->GetBlockHash() == hashWatchedChain && IsRPCRunning())
|
||||||
{
|
{
|
||||||
if (!cvBlockChange.timed_wait(lock, checktxtime))
|
if (cvBlockChange.wait_until(lock, checktxtime) == std::cv_status::timeout)
|
||||||
{
|
{
|
||||||
// Timeout: Check transactions for update
|
// Timeout: Check transactions for update
|
||||||
if (mempool.GetTransactionsUpdated() != nTransactionsUpdatedLastLP)
|
if (mempool.GetTransactionsUpdated() != nTransactionsUpdatedLastLP)
|
||||||
break;
|
break;
|
||||||
checktxtime += boost::posix_time::seconds(10);
|
checktxtime += std::chrono::seconds(10);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
46
src/sync.h
46
src/sync.h
@ -10,7 +10,9 @@
|
|||||||
|
|
||||||
#include <boost/thread/condition_variable.hpp>
|
#include <boost/thread/condition_variable.hpp>
|
||||||
#include <boost/thread/mutex.hpp>
|
#include <boost/thread/mutex.hpp>
|
||||||
#include <boost/thread/recursive_mutex.hpp>
|
#include <condition_variable>
|
||||||
|
#include <thread>
|
||||||
|
#include <mutex>
|
||||||
|
|
||||||
|
|
||||||
////////////////////////////////////////////////
|
////////////////////////////////////////////////
|
||||||
@ -21,17 +23,17 @@
|
|||||||
|
|
||||||
/*
|
/*
|
||||||
CCriticalSection mutex;
|
CCriticalSection mutex;
|
||||||
boost::recursive_mutex mutex;
|
std::recursive_mutex mutex;
|
||||||
|
|
||||||
LOCK(mutex);
|
LOCK(mutex);
|
||||||
boost::unique_lock<boost::recursive_mutex> criticalblock(mutex);
|
std::unique_lock<std::recursive_mutex> criticalblock(mutex);
|
||||||
|
|
||||||
LOCK2(mutex1, mutex2);
|
LOCK2(mutex1, mutex2);
|
||||||
boost::unique_lock<boost::recursive_mutex> criticalblock1(mutex1);
|
std::unique_lock<std::recursive_mutex> criticalblock1(mutex1);
|
||||||
boost::unique_lock<boost::recursive_mutex> criticalblock2(mutex2);
|
std::unique_lock<std::recursive_mutex> criticalblock2(mutex2);
|
||||||
|
|
||||||
TRY_LOCK(mutex, name);
|
TRY_LOCK(mutex, name);
|
||||||
boost::unique_lock<boost::recursive_mutex> name(mutex, boost::try_to_lock_t);
|
std::unique_lock<std::recursive_mutex> name(mutex, std::try_to_lock_t);
|
||||||
|
|
||||||
ENTER_CRITICAL_SECTION(mutex); // no RAII
|
ENTER_CRITICAL_SECTION(mutex); // no RAII
|
||||||
mutex.lock();
|
mutex.lock();
|
||||||
@ -85,10 +87,10 @@ void static inline DeleteLock(void* cs) {}
|
|||||||
#define AssertLockHeld(cs) AssertLockHeldInternal(#cs, __FILE__, __LINE__, &cs)
|
#define AssertLockHeld(cs) AssertLockHeldInternal(#cs, __FILE__, __LINE__, &cs)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Wrapped boost mutex: supports recursive locking, but no waiting
|
* Wrapped mutex: supports recursive locking, but no waiting
|
||||||
* TODO: We should move away from using the recursive lock by default.
|
* TODO: We should move away from using the recursive lock by default.
|
||||||
*/
|
*/
|
||||||
class CCriticalSection : public AnnotatedMixin<boost::recursive_mutex>
|
class CCriticalSection : public AnnotatedMixin<std::recursive_mutex>
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
~CCriticalSection() {
|
~CCriticalSection() {
|
||||||
@ -96,22 +98,24 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
/** Wrapped boost mutex: supports waiting but not recursive locking */
|
/** Wrapped mutex: supports waiting but not recursive locking */
|
||||||
typedef AnnotatedMixin<boost::mutex> CWaitableCriticalSection;
|
typedef AnnotatedMixin<std::mutex> CWaitableCriticalSection;
|
||||||
|
|
||||||
/** Just a typedef for boost::condition_variable, can be wrapped later if desired */
|
/** Just a typedef for std::condition_variable, can be wrapped later if desired */
|
||||||
typedef boost::condition_variable CConditionVariable;
|
typedef std::condition_variable CConditionVariable;
|
||||||
|
|
||||||
|
/** Just a typedef for std::unique_lock, can be wrapped later if desired */
|
||||||
|
typedef std::unique_lock<std::mutex> WaitableLock;
|
||||||
|
|
||||||
#ifdef DEBUG_LOCKCONTENTION
|
#ifdef DEBUG_LOCKCONTENTION
|
||||||
void PrintLockContention(const char* pszName, const char* pszFile, int nLine);
|
void PrintLockContention(const char* pszName, const char* pszFile, int nLine);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/** Wrapper around boost::unique_lock<Mutex> */
|
/** Wrapper around std::unique_lock<CCriticalSection> */
|
||||||
template <typename Mutex>
|
class SCOPED_LOCKABLE CCriticalBlock
|
||||||
class SCOPED_LOCKABLE CMutexLock
|
|
||||||
{
|
{
|
||||||
private:
|
private:
|
||||||
boost::unique_lock<Mutex> lock;
|
std::unique_lock<CCriticalSection> lock;
|
||||||
|
|
||||||
void Enter(const char* pszName, const char* pszFile, int nLine)
|
void Enter(const char* pszName, const char* pszFile, int nLine)
|
||||||
{
|
{
|
||||||
@ -136,7 +140,7 @@ private:
|
|||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
CMutexLock(Mutex& mutexIn, const char* pszName, const char* pszFile, int nLine, bool fTry = false) EXCLUSIVE_LOCK_FUNCTION(mutexIn) : lock(mutexIn, boost::defer_lock)
|
CCriticalBlock(CCriticalSection& mutexIn, const char* pszName, const char* pszFile, int nLine, bool fTry = false) EXCLUSIVE_LOCK_FUNCTION(mutexIn) : lock(mutexIn, std::defer_lock)
|
||||||
{
|
{
|
||||||
if (fTry)
|
if (fTry)
|
||||||
TryEnter(pszName, pszFile, nLine);
|
TryEnter(pszName, pszFile, nLine);
|
||||||
@ -144,18 +148,18 @@ public:
|
|||||||
Enter(pszName, pszFile, nLine);
|
Enter(pszName, pszFile, nLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
CMutexLock(Mutex* pmutexIn, const char* pszName, const char* pszFile, int nLine, bool fTry = false) EXCLUSIVE_LOCK_FUNCTION(pmutexIn)
|
CCriticalBlock(CCriticalSection* pmutexIn, const char* pszName, const char* pszFile, int nLine, bool fTry = false) EXCLUSIVE_LOCK_FUNCTION(pmutexIn)
|
||||||
{
|
{
|
||||||
if (!pmutexIn) return;
|
if (!pmutexIn) return;
|
||||||
|
|
||||||
lock = boost::unique_lock<Mutex>(*pmutexIn, boost::defer_lock);
|
lock = std::unique_lock<CCriticalSection>(*pmutexIn, std::defer_lock);
|
||||||
if (fTry)
|
if (fTry)
|
||||||
TryEnter(pszName, pszFile, nLine);
|
TryEnter(pszName, pszFile, nLine);
|
||||||
else
|
else
|
||||||
Enter(pszName, pszFile, nLine);
|
Enter(pszName, pszFile, nLine);
|
||||||
}
|
}
|
||||||
|
|
||||||
~CMutexLock() UNLOCK_FUNCTION()
|
~CCriticalBlock() UNLOCK_FUNCTION()
|
||||||
{
|
{
|
||||||
if (lock.owns_lock())
|
if (lock.owns_lock())
|
||||||
LeaveCritical();
|
LeaveCritical();
|
||||||
@ -167,8 +171,6 @@ public:
|
|||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
typedef CMutexLock<CCriticalSection> CCriticalBlock;
|
|
||||||
|
|
||||||
#define PASTE(x, y) x ## y
|
#define PASTE(x, y) x ## y
|
||||||
#define PASTE2(x, y) PASTE(x, y)
|
#define PASTE2(x, y) PASTE(x, y)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user