diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-10-25 10:05:23 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2013-10-29 12:14:36 -0700 |
| commit | ad2541a59c00c2c69e8973088891a2b5257c9780 (patch) | |
| tree | 523898cf039c5185352978e71a54fa3a2657a04c /runtime/gc/collector/mark_sweep.h | |
| parent | 9780099e445884d8bc9444c8c1261b02d80a26c7 (diff) | |
| download | art-ad2541a59c00c2c69e8973088891a2b5257c9780.zip art-ad2541a59c00c2c69e8973088891a2b5257c9780.tar.gz art-ad2541a59c00c2c69e8973088891a2b5257c9780.tar.bz2 | |
Fix object identity hash.
The object identity hash is now stored in the monitor word after
being computed. Hashes are computed by a pseudo random number
generator.
When we write the image, we eagerly compute object hashes to
prevent pages getting dirtied.
Bug: 8981901
Change-Id: Ic8edacbacb0afc7055fd740a52444929f88ed564
Diffstat (limited to 'runtime/gc/collector/mark_sweep.h')
| -rw-r--r-- | runtime/gc/collector/mark_sweep.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/runtime/gc/collector/mark_sweep.h b/runtime/gc/collector/mark_sweep.h index 19df2da..7e05136 100644 --- a/runtime/gc/collector/mark_sweep.h +++ b/runtime/gc/collector/mark_sweep.h @@ -69,7 +69,7 @@ class MarkSweep : public GarbageCollector { virtual bool HandleDirtyObjectsPhase() EXCLUSIVE_LOCKS_REQUIRED(Locks::mutator_lock_); virtual void MarkingPhase() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); virtual void ReclaimPhase() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); - virtual void FinishPhase(); + virtual void FinishPhase() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_); virtual void MarkReachableObjects() SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) EXCLUSIVE_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); @@ -208,13 +208,13 @@ class MarkSweep : public GarbageCollector { void SetImmuneRange(mirror::Object* begin, mirror::Object* end); void SweepSystemWeaks() - SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_, Locks::heap_bitmap_lock_); static mirror::Object* VerifySystemWeakIsLiveCallback(mirror::Object* obj, void* arg) SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); void VerifySystemWeaks() - SHARED_LOCKS_REQUIRED(Locks::heap_bitmap_lock_); + SHARED_LOCKS_REQUIRED(Locks::mutator_lock_, Locks::heap_bitmap_lock_); // Verify that an object is live, either in a live bitmap or in the allocation stack. void VerifyIsLive(const mirror::Object* obj) |