zecfoundation
/
zcashd
mirror of https://github.com/ZcashFoundation/zcashd.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #1424 from TheBlueMatt/lockcontention 

Fix DEBUG_LOCKCONTENTION
This commit is contained in:
Pieter Wuille 2012-06-08 07:22:19 -07:00
parent afdd59416e 4d009243cb
commit 1b7cd74a49
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/sync.cpp
View File

@ -7,6 +7,14 @@
#include <boost/foreach.hpp> #include <boost/foreach.hpp>
#ifdef DEBUG_LOCKCONTENTION
void PrintLockContention(const char* pszName, const char* pszFile, int nLine)
{
printf("LOCKCONTENTION: %s\n", pszName);
printf("Locker: %s:%d\n", pszFile, nLine);
}
#endif /* DEBUG_LOCKCONTENTION */
#ifdef DEBUG_LOCKORDER #ifdef DEBUG_LOCKORDER
// //
// Early deadlock detection. // Early deadlock detection.

7
src/sync.h
View File

@ -27,6 +27,10 @@ void static inline EnterCritical(const char* pszName, const char* pszFile, int n
void static inline LeaveCritical() {} void static inline LeaveCritical() {}
#endif #endif
#ifdef DEBUG_LOCKCONTENTION
void PrintLockContention(const char* pszName, const char* pszFile, int nLine);
#endif
/** Wrapper around boost::interprocess::scoped_lock */ /** Wrapper around boost::interprocess::scoped_lock */
template<typename Mutex> template<typename Mutex>
class CMutexLock class CMutexLock
@ -43,8 +47,7 @@ public:
#ifdef DEBUG_LOCKCONTENTION #ifdef DEBUG_LOCKCONTENTION
if (!lock.try_lock()) if (!lock.try_lock())
{ {
printf("LOCKCONTENTION: %s\n", pszName); PrintLockContention(pszName, pszFile, nLine);
printf("Locker: %s:%d\n", pszFile, nLine);
#endif #endif
lock.lock(); lock.lock();
#ifdef DEBUG_LOCKCONTENTION #ifdef DEBUG_LOCKCONTENTION