diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-09-20 14:02:02 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2013-09-20 14:02:02 -0700 |
| commit | 810b1d704f2db0d935bf5dddae3545f79cabd435 (patch) | |
| tree | baf1ec61b47031244cb1fe2458b136c9f9d54f1f /runtime/monitor.h | |
| parent | 5c00e28cdc7da675451869a2e5baa8f1c3244892 (diff) | |
| parent | bb0140e051e62ca0b51b0870c2386ae3110b0556 (diff) | |
| download | art-810b1d704f2db0d935bf5dddae3545f79cabd435.zip art-810b1d704f2db0d935bf5dddae3545f79cabd435.tar.gz art-810b1d704f2db0d935bf5dddae3545f79cabd435.tar.bz2 | |
resolved conflicts for merge of bb0140e0 to dalvik-dev
Change-Id: I31e0c05c5e917cf3275296a7f65bd8b78ec9b78b
Diffstat (limited to 'runtime/monitor.h')
| -rw-r--r-- | runtime/monitor.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/runtime/monitor.h b/runtime/monitor.h index 4249316..71fe716 100644 --- a/runtime/monitor.h +++ b/runtime/monitor.h @@ -185,9 +185,13 @@ class MonitorList { void Add(Monitor* m); void SweepMonitorList(RootVisitor visitor, void* arg); + 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; |