BTCPrivate
/
BTCP-Rebase
mirror of https://github.com/BTCPrivate/BTCP-Rebase.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #2004 from alexanderkjeldaas/simplify-cmutexlock 

Simplify CMutexLock
This commit is contained in:
Pieter Wuille 2012-11-24 13:55:00 -08:00
parent 7818d230a2 bfc9620799
commit 3ed1ccb089
1 changed files with 11 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/sync.h
View File

@ -37,46 +37,31 @@ class CMutexLock
{ {
private: private:
boost::unique_lock<Mutex> lock; boost::unique_lock<Mutex> lock;
public:
void Enter(const char* pszName, const char* pszFile, int nLine) void Enter(const char* pszName, const char* pszFile, int nLine)
{ {
if (!lock.owns_lock()) EnterCritical(pszName, pszFile, nLine, (void*)(lock.mutex()));
{
EnterCritical(pszName, pszFile, nLine, (void*)(lock.mutex()));
#ifdef DEBUG_LOCKCONTENTION #ifdef DEBUG_LOCKCONTENTION
if (!lock.try_lock()) if (!lock.try_lock())
{
PrintLockContention(pszName, pszFile, nLine);
#endif
lock.lock();
#ifdef DEBUG_LOCKCONTENTION
}
#endif
}
}
void Leave()
{
if (lock.owns_lock())
{ {
lock.unlock(); PrintLockContention(pszName, pszFile, nLine);
LeaveCritical(); #endif
lock.lock();
#ifdef DEBUG_LOCKCONTENTION
} }
#endif
} }
bool TryEnter(const char* pszName, const char* pszFile, int nLine) bool TryEnter(const char* pszName, const char* pszFile, int nLine)
{ {
EnterCritical(pszName, pszFile, nLine, (void*)(lock.mutex()), true);
lock.try_lock();
if (!lock.owns_lock()) if (!lock.owns_lock())
{ LeaveCritical();
EnterCritical(pszName, pszFile, nLine, (void*)(lock.mutex()), true);
lock.try_lock();
if (!lock.owns_lock())
LeaveCritical();
}
return lock.owns_lock(); return lock.owns_lock();
} }
public:
CMutexLock(Mutex& mutexIn, const char* pszName, const char* pszFile, int nLine, bool fTry = false) : lock(mutexIn, boost::defer_lock) CMutexLock(Mutex& mutexIn, const char* pszName, const char* pszFile, int nLine, bool fTry = false) : lock(mutexIn, boost::defer_lock)
{ {
if (fTry) if (fTry)
@ -95,11 +80,6 @@ public:
{ {
return lock.owns_lock(); return lock.owns_lock();
} }
boost::unique_lock<Mutex> &GetLock()
{
return lock;
}
}; };
typedef CMutexLock<CCriticalSection> CCriticalBlock; typedef CMutexLock<CCriticalSection> CCriticalBlock;