From 4d009243cbc2dd5aa172fedbd00c6658ae6ac82d Mon Sep 17 00:00:00 2001
From: Matt Corallo <matt@bluematt.me>
Date: Tue, 5 Jun 2012 16:12:32 +0200
Subject: [PATCH] Fix DEBUG_LOCKCONTENTION

---
 src/sync.cpp | 8 ++++++++
 src/sync.h   | 7 +++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/sync.cpp b/src/sync.cpp
index f2403a43..dbd9ebda 100644
--- a/src/sync.cpp
+++ b/src/sync.cpp
@@ -7,6 +7,14 @@
 
 #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
 //
 // Early deadlock detection.
diff --git a/src/sync.h b/src/sync.h
index dffe4f6e..98640e6e 100644
--- a/src/sync.h
+++ b/src/sync.h
@@ -27,6 +27,10 @@ void static inline EnterCritical(const char* pszName, const char* pszFile, int n
 void static inline LeaveCritical() {}
 #endif
 
+#ifdef DEBUG_LOCKCONTENTION
+void PrintLockContention(const char* pszName, const char* pszFile, int nLine);
+#endif
+
 /** Wrapper around boost::interprocess::scoped_lock */
 template<typename Mutex>
 class CMutexLock
@@ -43,8 +47,7 @@ public:
 #ifdef DEBUG_LOCKCONTENTION
             if (!lock.try_lock())
             {
-                printf("LOCKCONTENTION: %s\n", pszName);
-                printf("Locker: %s:%d\n", pszFile, nLine);
+                PrintLockContention(pszName, pszFile, nLine);
 #endif
             lock.lock();
 #ifdef DEBUG_LOCKCONTENTION