commit 4681c809ba35d50fab92c592ce8d2c7f8b2731f7
author Elliott Hughes <enh@google.com> Sun Sep 25 18:04:37 2011 -0700
committer Elliott Hughes <enh@google.com> Sun Sep 25 18:04:37 2011 -0700
tree 218759bc9564bdbaa49d1be89d257ecddd3a8a14
parent 54643083afd5b99f4d52a32b4030aec0db8d0e2f

Various things.

Change-Id: I6911c995d7635b95e6dc6b9112bf4e1adf85e830

src/monitor.cc

diff --git a/src/monitor.cc b/src/monitor.cc
index 0ef5fb4..7d6cde4 100644
--- a/src/monitor.cc
+++ b/src/monitor.cc
@@ -188,8 +188,8 @@
   Monitor handle;
   Monitor *curr;
 
-  assert(mon != NULL);
-  assert(isUnmarkedObject != NULL);
+  DCHECK(mon != NULL);
+  DCHECK(isUnmarkedObject != NULL);
   Monitor* prev = &handle;
   prev->next = curr = *mon;
   while (curr != NULL) {
@@ -660,8 +660,8 @@
   long maxSleepDelayNs = 1000000000;  /* 1 second */
   uint32_t thin, newThin, threadId;
 
-  assert(self != NULL);
-  assert(obj != NULL);
+  DCHECK(self != NULL);
+  DCHECK(obj != NULL);
   threadId = self->thin_lock_id_;
 retry:
   thin = *thinp;
@@ -749,6 +749,7 @@
     }
   } else {
     // The lock is a fat lock.
+    LOG(INFO) << StringPrintf("(%d) locking fat lock %p (%p) %p on a %s", threadId, thinp, LW_MONITOR(*thinp), (void*)*thinp, PrettyTypeOf(obj).c_str());
     DCHECK(LW_MONITOR(*thinp) != NULL);
     LW_MONITOR(*thinp)->Lock(self);
   }
@@ -758,7 +759,7 @@
   volatile int32_t* thinp = obj->GetRawLockWordAddress();
 
   DCHECK(self != NULL);
-  DCHECK_EQ(self->GetState(), Thread::kRunnable);
+  //DCHECK_EQ(self->GetState(), Thread::kRunnable);
   DCHECK(obj != NULL);
 
   /*