diff options
author | Ian Rogers <irogers@google.com> | 2013-10-11 07:59:01 -0700 |
---|---|---|
committer | Ian Rogers <irogers@google.com> | 2013-10-11 07:59:01 -0700 |
commit | 13c479e7e9b62115fe0409e5273c1e976a1c09f9 (patch) | |
tree | 2c3fa2fd752f8e80ea888887c4ef46fd00bdb696 /runtime | |
parent | 9822c33a66157b7a4c96222befb0848e204dcc5b (diff) | |
download | art-13c479e7e9b62115fe0409e5273c1e976a1c09f9.zip art-13c479e7e9b62115fe0409e5273c1e976a1c09f9.tar.gz art-13c479e7e9b62115fe0409e5273c1e976a1c09f9.tar.bz2 |
Notify doesn't inflate, rename helper.
Change-Id: I85c93b522478b3116a66630856a2370ec0fda490
Diffstat (limited to 'runtime')
-rw-r--r-- | runtime/monitor.cc | 2 | ||||
-rw-r--r-- | runtime/monitor.h | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/runtime/monitor.cc b/runtime/monitor.cc index 1ceaa5d..a5605ff 100644 --- a/runtime/monitor.cc +++ b/runtime/monitor.cc @@ -695,7 +695,7 @@ void Monitor::Wait(Thread* self, mirror::Object *obj, int64_t ms, int32_t ns, mon->Wait(self, ms, ns, interruptShouldThrow, why); } -void Monitor::InflateAndNotify(Thread* self, mirror::Object* obj, bool notify_all) { +void Monitor::DoNotify(Thread* self, mirror::Object* obj, bool notify_all) { DCHECK(self != NULL); DCHECK(obj != NULL); diff --git a/runtime/monitor.h b/runtime/monitor.h index 044f76e..27124a2 100644 --- a/runtime/monitor.h +++ b/runtime/monitor.h @@ -62,11 +62,11 @@ class Monitor { static void Notify(Thread* self, mirror::Object* obj) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - InflateAndNotify(self, obj, false); + DoNotify(self, obj, false); } static void NotifyAll(Thread* self, mirror::Object* obj) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { - InflateAndNotify(self, obj, true); + DoNotify(self, obj, true); } static void Wait(Thread* self, mirror::Object* obj, int64_t ms, int32_t ns, bool interruptShouldThrow, ThreadState why) @@ -130,7 +130,7 @@ class Monitor { LOCKS_EXCLUDED(monitor_lock_) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - static void InflateAndNotify(Thread* self, mirror::Object* obj, bool notify_all) + static void DoNotify(Thread* self, mirror::Object* obj, bool notify_all) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); void Notify(Thread* self) |