Use template function instead of void* parameter

hebasto · hebasto · commit 971a468ccf04 · 2020-05-28T09:55:04.000+03:00
This change gets rid of -Wthread-safety-attributes warning spam.
diff --git a/src/sync.cpp b/src/sync.cpp
@@ -219,12 +219,15 @@ static bool LockHeld(void* mutex)
     return false;
 }
 
-void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs)
+template <typename MutexType>
+void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs)
 {
     if (LockHeld(cs)) return;
     tfm::format(std::cerr, "Assertion failed: lock %s not held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld());
     abort();
 }
+template void AssertLockHeldInternal(const char*, const char*, int, Mutex*);
+template void AssertLockHeldInternal(const char*, const char*, int, RecursiveMutex*);
 
 void AssertLockNotHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs)
 {
diff --git a/src/sync.h b/src/sync.h
@@ -52,7 +52,8 @@ void EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs
 void LeaveCritical();
 void CheckLastCritical(void* cs, std::string& lockname, const char* guardname, const char* file, int line);
 std::string LocksHeld();
-void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs) ASSERT_EXCLUSIVE_LOCK(cs);
+template <typename MutexType>
+void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs) ASSERT_EXCLUSIVE_LOCK(cs);
 void AssertLockNotHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs);
 void DeleteLock(void* cs);
 
@@ -66,7 +67,8 @@ extern bool g_debug_lockorder_abort;
 void static inline EnterCritical(const char* pszName, const char* pszFile, int nLine, void* cs, bool fTry = false) {}
 void static inline LeaveCritical() {}
 void static inline CheckLastCritical(void* cs, std::string& lockname, const char* guardname, const char* file, int line) {}
-void static inline AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs) ASSERT_EXCLUSIVE_LOCK(cs) {}
+template <typename MutexType>
+void static inline AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs) ASSERT_EXCLUSIVE_LOCK(cs) {}
 void static inline AssertLockNotHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs) {}
 void static inline DeleteLock(void* cs) {}
 #endif

Original file line number	Diff line number	Diff line change
`@@ -219,12 +219,15 @@ static bool LockHeld(void* mutex)`
`219`	`219`	`return false;`
`220`	`220`	`}`
`221`	`221`
`222`		`-void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs)`
	`222`	`+template <typename MutexType>`
	`223`	`+void AssertLockHeldInternal(const char* pszName, const char* pszFile, int nLine, MutexType* cs)`
`223`	`224`	`{`
`224`	`225`	`if (LockHeld(cs)) return;`
`225`	`226`	`tfm::format(std::cerr, "Assertion failed: lock %s not held in %s:%i; locks held:\n%s", pszName, pszFile, nLine, LocksHeld());`
`226`	`227`	`abort();`
`227`	`228`	`}`
	`229`	`+template void AssertLockHeldInternal(const char, const char, int, Mutex*);`
	`230`	`+template void AssertLockHeldInternal(const char, const char, int, RecursiveMutex*);`
`228`	`231`
`229`	`232`	`void AssertLockNotHeldInternal(const char* pszName, const char* pszFile, int nLine, void* cs)`
`230`	`233`	`{`