Thread sanitizer annotations of custom mutex.

Author: jblueh

tests/tests/TestCustomMutex.hpp

@@ -27,6 +27,18 @@
 
 #include "testBase.hpp"
 
+#ifdef __SANITIZE_THREAD__
+  #define ANNOTATE_RWLOCK_CREATE(lock) AnnotateRWLockCreate(__FILE__, __LINE__, (void*)lock)
+  #define ANNOTATE_RWLOCK_DESTROY(lock) AnnotateRWLockDestroy(__FILE__, __LINE__, (void*)lock)
+  #define ANNOTATE_RWLOCK_ACQUIRED(lock, isWrite) AnnotateRWLockAcquired(__FILE__, __LINE__, (void*)lock, isWrite)
+  #define ANNOTATE_RWLOCK_RELEASED(lock, isWrite) AnnotateRWLockReleased(__FILE__, __LINE__, (void*)lock, isWrite)
+
+extern "C" void AnnotateRWLockCreate(const char* f, int l, void* addr);
+extern "C" void AnnotateRWLockDestroy(const char* f, int l, void* addr);
+extern "C" void AnnotateRWLockAcquired(const char* f, int l, void* addr, size_t isWrite);
+extern "C" void AnnotateRWLockReleased(const char* f, int l, void* addr, size_t isWrite);
+#endif
+
 template<typename _Case>
 struct TestCustomMutex : public TestBase<4, 1, 3, TestCustomMutex<_Case>> {
   public:
@@ -37,8 +49,27 @@ struct TestCustomMutex : public TestBase<4, 1, 3, TestCustomMutex<_Case>> {
       private:
         int status;
 
+        #ifdef __SANITIZE_THREAD__
+          int dummy;
+        #endif
+
       public:
-        CustomMutex() : status(0) {}
+        CustomMutex() : status(0)
+          #ifdef __SANITIZE_THREAD__
+                      , dummy(0)
+          #endif
+        {
+
+          #ifdef __SANITIZE_THREAD__
+            ANNOTATE_RWLOCK_CREATE(&dummy);
+          #endif
+        }
+
+        ~CustomMutex() {
+          #ifdef __SANITIZE_THREAD__
+            ANNOTATE_RWLOCK_DESTROY(&dummy);
+          #endif
+        }
 
         void lock() {
           int localStatus;
@@ -69,16 +100,26 @@ struct TestCustomMutex : public TestBase<4, 1, 3, TestCustomMutex<_Case>> {
             #endif
             --status;
           }
+
+          #ifdef __SANITIZE_THREAD__
+            ANNOTATE_RWLOCK_ACQUIRED(&dummy, true);
+          #endif
+
           #ifdef _OPENMP
             opdi::logic->onMutexAcquired(opdi::LogicInterface::MutexKind::Custom, reinterpret_cast<opdi::LogicInterface::WaitId>(&status));
           #endif
         }
 
         void unlock() {
+          #ifdef __SANITIZE_THREAD__
+            ANNOTATE_RWLOCK_RELEASED(&dummy, true);
+          #endif
+
           #ifdef _OPENMP
             #pragma omp atomic update
           #endif
           --status;
+
           #ifdef _OPENMP
             opdi::logic->onMutexReleased(opdi::LogicInterface::MutexKind::Custom, reinterpret_cast<opdi::LogicInterface::WaitId>(&status));
           #endif