commit 05f3057d6a4d23d712092ccd36a531590bff323b
author Ian Rogers <irogers@google.com> Wed Feb 20 12:13:11 2013 -0800
committer Ian Rogers <irogers@google.com> Wed Feb 20 12:15:09 2013 -0800
tree 3f342c813afdb44a08466e379c060f917d073e5a
parent 4aeb567fa8b1f5e17ef7beacf86fed505cc7335c

Move monitor related object routines to object-inl.h

Also pass through readily available self Thread. Remove unused wait method.
Rename ObjectLock.Wait to document it doesn't honor interrupts.

Change-Id: I991e5036997b3f60ee4fdf1a420beabab9a70c85

src/object_utils.h

diff --git a/src/object_utils.h b/src/object_utils.h
index ea4de90..18ad312 100644
--- a/src/object_utils.h
+++ b/src/object_utils.h
@@ -46,16 +46,16 @@
     obj_->MonitorExit(self_);
   }
 
-  void Wait() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
-    return Monitor::Wait(self_, obj_, 0, 0, false, kWaiting);
+  void WaitIgnoringInterrupts() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
+    Monitor::Wait(self_, obj_, 0, 0, false, kWaiting);
   }
 
   void Notify() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
-    obj_->Notify();
+    obj_->Notify(self_);
   }
 
   void NotifyAll() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) {
-    obj_->NotifyAll();
+    obj_->NotifyAll(self_);
   }
 
  private: