[vmkit-commits] [vmkit] r120119 - /vmkit/branches/precise/lib/Mvm/CommonThread/ObjectLocks.cpp

[Nicolas Geoffray]

Author: geoffray
Date: Wed Nov 24 15:54:01 2010
New Revision: 120119

URL: http://llvm.org/viewvc/llvm-project?rev=120119&view=rev
Log:
Add some assertions.


Modified:
    vmkit/branches/precise/lib/Mvm/CommonThread/ObjectLocks.cpp

Modified: vmkit/branches/precise/lib/Mvm/CommonThread/ObjectLocks.cpp
URL: http://llvm.org/viewvc/llvm-project/vmkit/branches/precise/lib/Mvm/CommonThread/ObjectLocks.cpp?rev=120119&r1=120118&r2=120119&view=diff
==============================================================================
--- vmkit/branches/precise/lib/Mvm/CommonThread/ObjectLocks.cpp (original)
+++ vmkit/branches/precise/lib/Mvm/CommonThread/ObjectLocks.cpp Wed Nov 24 15:54:01 2010
@@ -164,7 +164,7 @@
     
     if ((object->header & ~NonLockBitsMask) == 0) {
       FatLock* obj = table.allocate(object);
-      obj->acquire(object);
+      obj->internalLock.lock();
       do {
         oldValue = object->header & NonLockBitsMask;
         newValue = oldValue | obj->getID();
@@ -177,6 +177,7 @@
         obj->internalLock.unlock();
         table.deallocate(obj);
       } else {
+        assert((object->header & ~NonLockBitsMask) == obj->getID());
         assert(owner(object, table) && "Inconsistent lock");
         break;
       }
@@ -299,6 +300,8 @@
     internalLock.unlock();
     return false;
   }
+  assert(obj->header & FatMask);
+  assert((obj->header & ~NonLockBitsMask) == getID());
   return true;
 }