diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-09-20 11:22:41 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-20 11:22:41 -0700 |
| commit | bb0140e051e62ca0b51b0870c2386ae3110b0556 (patch) | |
| tree | a180a70b7e53a67cca30a93379659e9754c3d74a /runtime/monitor.h | |
| parent | f381419be7cf8df4bf7d217c2e243a63c8ee3736 (diff) | |
| parent | 8ae693027ae56ed19dc5f2e81e9a3a4a37988754 (diff) | |
| download | art-bb0140e051e62ca0b51b0870c2386ae3110b0556.zip art-bb0140e051e62ca0b51b0870c2386ae3110b0556.tar.gz art-bb0140e051e62ca0b51b0870c2386ae3110b0556.tar.bz2 | |
am 8ae69302: am 7d690ba9: Merge "Re-enable concurrent system weak sweeping." into klp-dev
* commit '8ae693027ae56ed19dc5f2e81e9a3a4a37988754':
Re-enable concurrent system weak sweeping.
Diffstat (limited to 'runtime/monitor.h')
| -rw-r--r-- | runtime/monitor.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/runtime/monitor.h b/runtime/monitor.h index 6651768..0b5b7e5 100644 --- a/runtime/monitor.h +++ b/runtime/monitor.h @@ -182,12 +182,14 @@ class MonitorList { ~MonitorList(); void Add(Monitor* m); - void SweepMonitorList(IsMarkedTester is_marked, void* arg) SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); - + void DisallowNewMonitors(); + void AllowNewMonitors(); private: + bool allow_new_monitors_ GUARDED_BY(monitor_list_lock_); Mutex monitor_list_lock_ DEFAULT_MUTEX_ACQUIRED_AFTER; + ConditionVariable monitor_add_condition_ GUARDED_BY(monitor_list_lock_); std::list<Monitor*> list_ GUARDED_BY(monitor_list_lock_); friend class Monitor; |