diff options
author | Andreas Gampe <agampe@google.com> | 2014-09-11 08:30:08 -0700 |
---|---|---|
committer | Andreas Gampe <agampe@google.com> | 2014-09-15 19:50:12 -0700 |
commit | 5a4b8a236030460651a3136397d23ca6744e7eb7 (patch) | |
tree | 0e43891398e416d3fa77c7de391bf4db4408e8ee /runtime/monitor_test.cc | |
parent | 19f7c95491a053b818f914137fa73df0517b8792 (diff) | |
download | android_art-5a4b8a236030460651a3136397d23ca6744e7eb7.tar.gz android_art-5a4b8a236030460651a3136397d23ca6744e7eb7.tar.bz2 android_art-5a4b8a236030460651a3136397d23ca6744e7eb7.zip |
ART: Rename Handle hierarchy
Bring the names in line with normal OO principles: ConstHandle
becomes Handle, and Handle becomes MutableHandle.
Change-Id: I0f018eb7ba28bc422e3a23dd73a6cbe6fc2d2044
Diffstat (limited to 'runtime/monitor_test.cc')
-rw-r--r-- | runtime/monitor_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/runtime/monitor_test.cc b/runtime/monitor_test.cc index af24368e2f..704e0410a5 100644 --- a/runtime/monitor_test.cc +++ b/runtime/monitor_test.cc @@ -58,7 +58,7 @@ class MonitorTest : public CommonRuntimeTest { static const size_t kMaxHandles = 1000000; // Use arbitrary large amount for now. static void FillHeap(Thread* self, ClassLinker* class_linker, std::unique_ptr<StackHandleScope<kMaxHandles>>* hsp, - std::vector<Handle<mirror::Object>>* handles) + std::vector<MutableHandle<mirror::Object>>* handles) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { Runtime::Current()->GetHeap()->SetIdealFootprint(1 * GB); @@ -73,7 +73,7 @@ static void FillHeap(Thread* self, ClassLinker* class_linker, // Start allocating with 128K size_t length = 128 * KB / 4; while (length > 10) { - Handle<mirror::Object> h((*hsp)->NewHandle<mirror::Object>( + MutableHandle<mirror::Object> h((*hsp)->NewHandle<mirror::Object>( mirror::ObjectArray<mirror::Object>::Alloc(self, ca.Get(), length / 4))); if (self->IsExceptionPending() || h.Get() == nullptr) { self->ClearException(); @@ -92,7 +92,7 @@ static void FillHeap(Thread* self, ClassLinker* class_linker, // Allocate simple objects till it fails. while (!self->IsExceptionPending()) { - Handle<mirror::Object> h = (*hsp)->NewHandle<mirror::Object>(c->AllocObject(self)); + MutableHandle<mirror::Object> h = (*hsp)->NewHandle<mirror::Object>(c->AllocObject(self)); if (!self->IsExceptionPending() && h.Get() != nullptr) { handles->push_back(h); } @@ -307,7 +307,7 @@ static void CommonWaitSetup(MonitorTest* test, ClassLinker* class_linker, uint64 // Fill the heap. std::unique_ptr<StackHandleScope<kMaxHandles>> hsp; - std::vector<Handle<mirror::Object>> handles; + std::vector<MutableHandle<mirror::Object>> handles; { Thread* self = Thread::Current(); ScopedObjectAccess soa(self); |