diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2014-05-07 15:43:14 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2014-05-13 14:45:54 -0700 |
| commit | eb8167a4f4d27fce0530f6724ab8032610cd146b (patch) | |
| tree | bcfeaf13ad78f2dd68466bbd0e20c71944f7e854 /runtime/gc/heap.h | |
| parent | 6fb66a2bc4e1c0b7931101153e58714991237af7 (diff) | |
| download | art-eb8167a4f4d27fce0530f6724ab8032610cd146b.zip art-eb8167a4f4d27fce0530f6724ab8032610cd146b.tar.gz art-eb8167a4f4d27fce0530f6724ab8032610cd146b.tar.bz2 | |
Add Handle/HandleScope and delete SirtRef.
Delete SirtRef and replaced it with Handle. Handles are value types
which wrap around StackReference*.
Renamed StackIndirectReferenceTable to HandleScope.
Added a scoped handle wrapper which wraps around an Object** and
restores it in its destructor.
Renamed Handle::get -> Get.
Bug: 8473721
Change-Id: Idbfebd4f35af629f0f43931b7c5184b334822c7a
Diffstat (limited to 'runtime/gc/heap.h')
| -rw-r--r-- | runtime/gc/heap.h | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/runtime/gc/heap.h b/runtime/gc/heap.h index f71de1a..3b071d1 100644 --- a/runtime/gc/heap.h +++ b/runtime/gc/heap.h @@ -412,7 +412,7 @@ class Heap { return GetTotalMemory() - num_bytes_allocated_; } - // Get the space that corresponds to an object's address. Current implementation searches all + // get the space that corresponds to an object's address. Current implementation searches all // spaces in turn. If fail_ok is false then failing to find a space will cause an abort. // TODO: consider using faster data structure like binary tree. space::ContinuousSpace* FindContinuousSpaceFromObject(const mirror::Object*, bool fail_ok) const; @@ -582,6 +582,10 @@ class Heap { mirror::Object** obj) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + accounting::ObjectStack* GetMarkStack() { + return mark_stack_.get(); + } + // We don't force this to be inlined since it is a slow path. template <bool kInstrumented, typename PreFenceVisitor> mirror::Object* AllocLargeObject(Thread* self, mirror::Class* klass, size_t byte_count, @@ -634,7 +638,10 @@ class Heap { void RequestCollectorTransition(CollectorType desired_collector_type, uint64_t delta_time) LOCKS_EXCLUDED(heap_trim_request_lock_); void RequestHeapTrim() LOCKS_EXCLUDED(Locks::runtime_shutdown_lock_); - void RequestConcurrentGC(Thread* self) LOCKS_EXCLUDED(Locks::runtime_shutdown_lock_); + void RequestConcurrentGCAndSaveObject(Thread* self, mirror::Object** obj) + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); + void RequestConcurrentGC(Thread* self) + LOCKS_EXCLUDED(Locks::runtime_shutdown_lock_); bool IsGCRequestPending() const; // Sometimes CollectGarbageInternal decides to run a different Gc than you requested. Returns |