diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2013-09-19 10:01:59 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2013-09-20 10:36:49 -0700 |
| commit | c11d9b8870de5f860b13c84003ade7b3f3125a52 (patch) | |
| tree | 89b0250d35a950774f98fa1abfa9cc296c9d85db /runtime/scoped_thread_state_change.h | |
| parent | 261d3cda32b28782d894be0244e617f78182ee3b (diff) | |
| download | art-c11d9b8870de5f860b13c84003ade7b3f3125a52.tar.gz art-c11d9b8870de5f860b13c84003ade7b3f3125a52.tar.bz2 art-c11d9b8870de5f860b13c84003ade7b3f3125a52.zip | |
Re-enable concurrent system weak sweeping.
Enabled by disallowing new system weaks during the pause and
re-allowing it after the system weaks have been swept. Reduces
GC pause by ~1ms.
Fixes pause regression caused by fix for
Bug: 10626133
Change-Id: If49d33e7ef19cb728ed3cef5187acfa53b9b05d8
Diffstat (limited to 'runtime/scoped_thread_state_change.h')
| -rw-r--r-- | runtime/scoped_thread_state_change.h | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/runtime/scoped_thread_state_change.h b/runtime/scoped_thread_state_change.h index 5f649b117b..d3f3a88d66 100644 --- a/runtime/scoped_thread_state_change.h +++ b/runtime/scoped_thread_state_change.h @@ -196,8 +196,6 @@ class ScopedObjectAccessUnchecked : public ScopedThreadStateChange { template<typename T> T Decode(jobject obj) const - LOCKS_EXCLUDED(JavaVMExt::globals_lock, - JavaVMExt::weak_globals_lock) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { Locks::mutator_lock_->AssertSharedHeld(Self()); DCHECK_EQ(thread_state_, kRunnable); // Don't work with raw objects in non-runnable states. @@ -205,8 +203,6 @@ class ScopedObjectAccessUnchecked : public ScopedThreadStateChange { } mirror::ArtField* DecodeField(jfieldID fid) const - LOCKS_EXCLUDED(JavaVMExt::globals_lock, - JavaVMExt::weak_globals_lock) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { Locks::mutator_lock_->AssertSharedHeld(Self()); DCHECK_EQ(thread_state_, kRunnable); // Don't work with raw objects in non-runnable states. @@ -218,8 +214,6 @@ class ScopedObjectAccessUnchecked : public ScopedThreadStateChange { } jfieldID EncodeField(mirror::ArtField* field) const - LOCKS_EXCLUDED(JavaVMExt::globals_lock, - JavaVMExt::weak_globals_lock) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { Locks::mutator_lock_->AssertSharedHeld(Self()); DCHECK_EQ(thread_state_, kRunnable); // Don't work with raw objects in non-runnable states. @@ -230,8 +224,6 @@ class ScopedObjectAccessUnchecked : public ScopedThreadStateChange { } mirror::ArtMethod* DecodeMethod(jmethodID mid) const - LOCKS_EXCLUDED(JavaVMExt::globals_lock, - JavaVMExt::weak_globals_lock) SHARED_LOCKS_REQUIRED(Locks::mutator_lock_) { Locks::mutator_lock_->AssertSharedHeld(Self()); DCHECK_EQ(thread_state_, kRunnable); // Don't work with raw objects in non-runnable states. |