diff options
| author | Hiroshi Yamauchi <yamauchi@google.com> | 2014-05-22 17:34:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-22 17:34:45 +0000 |
| commit | 225353e2ff7072d4e4aa9d2cd9cdbfa83670e323 (patch) | |
| tree | 41b4ab344e0d5eef729be167d97857112e48670e /runtime/monitor.h | |
| parent | 5da6e2b88258733dd3856543af27ca73b395ef60 (diff) | |
| parent | 4cba0d979a11f955e6ec3c0f1bf61478af7aa810 (diff) | |
| download | art-225353e2ff7072d4e4aa9d2cd9cdbfa83670e323.zip art-225353e2ff7072d4e4aa9d2cd9cdbfa83670e323.tar.gz art-225353e2ff7072d4e4aa9d2cd9cdbfa83670e323.tar.bz2 | |
Merge "Add a read barrier for weak roots in monitors."
Diffstat (limited to 'runtime/monitor.h')
| -rw-r--r-- | runtime/monitor.h | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/runtime/monitor.h b/runtime/monitor.h index bc1b2ed4..7af2d4c 100644 --- a/runtime/monitor.h +++ b/runtime/monitor.h @@ -27,6 +27,7 @@ #include "atomic.h" #include "base/mutex.h" #include "object_callbacks.h" +#include "read_barrier.h" #include "thread_state.h" namespace art { @@ -92,8 +93,9 @@ class Monitor { static bool IsValidLockWord(LockWord lock_word); + template<ReadBarrierOption kReadBarrierOption = kWithReadBarrier> mirror::Object* GetObject() const SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - return obj_; + return ReadBarrier::BarrierForWeakRoot<mirror::Object, kReadBarrierOption>(obj_); } void SetObject(mirror::Object* object); @@ -190,7 +192,9 @@ class Monitor { // Owner's recursive lock depth. int lock_count_ GUARDED_BY(monitor_lock_); - // What object are we part of. + // What object are we part of. This is a weak root. Do not access + // this directly, use GetObject() to read it so it will be guarded + // by a read barrier. mirror::Object* obj_; // Threads currently waiting on this monitor. |