[llvm-commits] [llvm] r73803 - in /llvm/trunk/include/llvm/System: Mutex.h RWMutex.h

[Owen Anderson]

Author: resistor
Date: Fri Jun 19 19:27:21 2009
New Revision: 73803

URL: http://llvm.org/viewvc/llvm-project?rev=73803&view=rev
Log:
Add debugging code to test for various locking faux-pas's, when running in single threaded mode.  This should help improve testing coverage for
threading support, without having extensive actually concurrent clients yet.

Modified:
    llvm/trunk/include/llvm/System/Mutex.h
    llvm/trunk/include/llvm/System/RWMutex.h

Modified: llvm/trunk/include/llvm/System/Mutex.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/System/Mutex.h?rev=73803&r1=73802&r2=73803&view=diff

==============================================================================
--- llvm/trunk/include/llvm/System/Mutex.h (original)
+++ llvm/trunk/include/llvm/System/Mutex.h Fri Jun 19 19:27:21 2009
@@ -15,6 +15,7 @@
 #define LLVM_SYSTEM_MUTEX_H
 
 #include "llvm/System/Threading.h"
+#include <cassert>
 
 namespace llvm
 {
@@ -85,18 +86,32 @@
     /// running in multithreaded mode.
     template<bool mt_only>
     class SmartMutex : public MutexImpl {
+      unsigned acquired;
+      bool recursive;
     public:
-      explicit SmartMutex(bool recursive = true) : MutexImpl(recursive) { }
+      explicit SmartMutex(bool rec = true) :
+        MutexImpl(rec), acquired(0), recursive(rec) { }
       
       bool acquire() {
         if (!mt_only || llvm_is_multithreaded())
           return MutexImpl::acquire();
+        
+        // Single-threaded debugging code.  This would be racy in multithreaded
+        // mode, but provides not sanity checks in single threaded mode.
+        assert((recursive || acquired == 0) && "Lock already acquired!!");
+        ++acquired;
         return true;
       }
 
       bool release() {
         if (!mt_only || llvm_is_multithreaded())
           return MutexImpl::release();
+        
+        // Single-threaded debugging code.  This would be racy in multithreaded
+        // mode, but provides not sanity checks in single threaded mode.
+        assert(((recursive && acquired) || (acquired == 1)) &&
+               "Lock not acquired before release!");
+        --acquired;
         return true;
       }
 

Modified: llvm/trunk/include/llvm/System/RWMutex.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/include/llvm/System/RWMutex.h?rev=73803&r1=73802&r2=73803&view=diff

==============================================================================
--- llvm/trunk/include/llvm/System/RWMutex.h (original)
+++ llvm/trunk/include/llvm/System/RWMutex.h Fri Jun 19 19:27:21 2009
@@ -15,6 +15,7 @@
 #define LLVM_SYSTEM_RWMUTEX_H
 
 #include "llvm/System/Threading.h"
+#include <cassert>
 
 namespace llvm
 {
@@ -84,30 +85,50 @@
     /// running in multithreaded mode.
     template<bool mt_only>
     class SmartRWMutex : public RWMutexImpl {
+      unsigned readers, writers;
     public:
-      explicit SmartRWMutex() : RWMutexImpl() { }
+      explicit SmartRWMutex() : RWMutexImpl(), readers(0), writers(0) { }
       
       bool reader_acquire() {
         if (!mt_only || llvm_is_multithreaded())
           return RWMutexImpl::reader_acquire();
+        
+        // Single-threaded debugging code.  This would be racy in multithreaded
+        // mode, but provides not sanity checks in single threaded mode.
+        ++readers;
         return true;
       }
       
       bool reader_release() {
         if (!mt_only || llvm_is_multithreaded())
           return RWMutexImpl::reader_release();
+        
+        // Single-threaded debugging code.  This would be racy in multithreaded
+        // mode, but provides not sanity checks in single threaded mode.
+        assert(readers > 0 && "Reader lock not acquired before release!");
+        --readers;
         return true;
       }
       
       bool writer_acquire() {
         if (!mt_only || llvm_is_multithreaded())
           return RWMutexImpl::writer_acquire();
+        
+        // Single-threaded debugging code.  This would be racy in multithreaded
+        // mode, but provides not sanity checks in single threaded mode.
+        assert(writers == 0 && "Writer lock already acquired!");
+        ++writers;
         return true;
       }
       
       bool writer_release() {
         if (!mt_only || llvm_is_multithreaded())
           return RWMutexImpl::writer_release();
+        
+        // Single-threaded debugging code.  This would be racy in multithreaded
+        // mode, but provides not sanity checks in single threaded mode.
+        assert(writers == 1 && "Writer lock not acquired before release!");
+        --writers;
         return true;
       }