commit 5f79133a435ebcb20000370d56046fe01201dd80
author Elliott Hughes <enh@google.com> Thu Sep 15 17:45:30 2011 -0700
committer Elliott Hughes <enh@google.com> Fri Sep 16 10:56:44 2011 -0700
tree 974c4610e30e8cc950e6e461e66b939361cb2bbe
parent 78128a63b2615744760b7f8ab83df9764a5d4a95

Implement monitors.

Change-Id: Ifc7a801f9cbcdfbc1e1af5c905261dfadaa60f45

src/class_linker.cc

diff --git a/src/class_linker.cc b/src/class_linker.cc
index 232390a..b9c6ed8 100644
--- a/src/class_linker.cc
+++ b/src/class_linker.cc
@@ -16,10 +16,10 @@
 #include "heap.h"
 #include "intern_table.h"
 #include "logging.h"
-#include "monitor.h"
 #include "object.h"
 #include "runtime.h"
 #include "space.h"
+#include "sync.h"
 #include "thread.h"
 #include "utils.h"
 
@@ -56,6 +56,35 @@
   "[Ljava/lang/StackTraceElement;",
 };
 
+class ObjectLock {
+ public:
+  explicit ObjectLock(Object* object) : self_(Thread::Current()), obj_(object) {
+    CHECK(object != NULL);
+    obj_->MonitorEnter(self_);
+  }
+
+  ~ObjectLock() {
+    obj_->MonitorExit(self_);
+  }
+
+  void Wait() {
+    return Monitor::Wait(self_, obj_, 0, 0, false);
+  }
+
+  void Notify() {
+    obj_->Notify();
+  }
+
+  void NotifyAll() {
+    obj_->NotifyAll();
+  }
+
+ private:
+  Thread* self_;
+  Object* obj_;
+  DISALLOW_COPY_AND_ASSIGN(ObjectLock);
+};
+
 ClassLinker* ClassLinker::Create(const std::vector<const DexFile*>& boot_class_path,
                                  const std::vector<const DexFile*>& class_path,
                                  InternTable* intern_table, bool image) {
@@ -1387,9 +1416,10 @@
     Class* super_class = klass->GetSuperClass();
     if (super_class->GetStatus() != Class::kStatusInitialized) {
       CHECK(!super_class->IsInterface());
-      klass->MonitorExit();
+      Thread* self = Thread::Current();
+      klass->MonitorEnter(self);
       bool super_initialized = InitializeClass(super_class);
-      klass->MonitorEnter();
+      klass->MonitorExit(self);
       // TODO: check for a pending exception
       if (!super_initialized) {
         klass->SetStatus(Class::kStatusError);
@@ -1407,10 +1437,11 @@
     return true;
   }
 
-  c->MonitorExit();
+  Thread* self = Thread::Current();
+  c->MonitorEnter(self);
   InitializeClass(c);
-  c->MonitorEnter();
-  return !Thread::Current()->IsExceptionPending();
+  c->MonitorExit(self);
+  return !self->IsExceptionPending();
 }
 
 StaticStorageBase* ClassLinker::InitializeStaticStorageFromCode(uint32_t type_idx,