Move DEBUG_LOCKCONTENTION out of sync.h and into implementation

theuni · theuni · commit 92b973ce56e5 · 2021-09-16T21:30:13.000Z
diff --git a/src/kernel/sync.h b/src/kernel/sync.h
@@ -118,9 +118,8 @@ using RecursiveMutex = AnnotatedMixin<std::recursive_mutex>;
 /** Wrapped mutex: supports waiting but not recursive locking */
 typedef AnnotatedMixin<std::mutex> Mutex;
 
-#ifdef DEBUG_LOCKCONTENTION
-void PrintLockContention(const char* pszName, const char* pszFile, int nLine);
-#endif
+template <typename Base>
+void CheckContentionAndLock(Base* base, const char* pszName, const char* pszFile, int nLine);
 
 /** Wrapper around std::unique_lock style lock for Mutex. */
 template <typename Mutex, typename Base = typename Mutex::UniqueLock>
@@ -130,14 +129,7 @@ class SCOPED_LOCKABLE UniqueLock : public Base
     void Enter(const char* pszName, const char* pszFile, int nLine)
     {
         EnterCritical(pszName, pszFile, nLine, Base::mutex());
-#ifdef DEBUG_LOCKCONTENTION
-        if (!Base::try_lock()) {
-            PrintLockContention(pszName, pszFile, nLine);
-#endif
-            Base::lock();
-#ifdef DEBUG_LOCKCONTENTION
-        }
-#endif
+        CheckContentionAndLock(static_cast<Base*>(this), pszName, pszFile, nLine);
     }
 
     bool TryEnter(const char* pszName, const char* pszFile, int nLine)
diff --git a/src/sync.cpp b/src/sync.cpp
@@ -23,11 +23,6 @@
 #if !defined(HAVE_THREAD_LOCAL)
 static_assert(false, "thread_local is not supported");
 #endif
-void PrintLockContention(const char* pszName, const char* pszFile, int nLine)
-{
-    LogPrintf("LOCKCONTENTION: %s\n", pszName);
-    LogPrintf("Locker: %s:%d\n", pszFile, nLine);
-}
 #endif /* DEBUG_LOCKCONTENTION */
 
 #ifdef DEBUG_LOCKORDER
@@ -344,3 +339,26 @@ bool LockStackEmpty()
     return true;
 #endif
 }
+
+#ifdef DEBUG_LOCKCONTENTION
+static void PrintLockContention(const char* pszName, const char* pszFile, int nLine)
+{
+    LogPrintf("LOCKCONTENTION: %s\n", pszName);
+    LogPrintf("Locker: %s:%d\n", pszFile, nLine);
+}
+#endif
+
+template <typename Base>
+void CheckContentionAndLock(Base* base, const char* pszName, const char* pszFile, int nLine)
+{
+#ifdef DEBUG_LOCKCONTENTION
+    if (!base->try_lock()) {
+        PrintLockContention(pszName, pszFile, nLine);
+#endif
+        base->lock();
+#ifdef DEBUG_LOCKCONTENTION
+        }
+#endif
+}
+template void CheckContentionAndLock(Mutex::UniqueLock*, const char*, const char*, int);
+template void CheckContentionAndLock(RecursiveMutex::UniqueLock*, const char*, const char*, int);
