diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-05-12 10:47:11 -0700 |
|---|---|---|
| committer | Mathieu Chartier <mathieuc@google.com> | 2015-05-12 14:59:31 -0700 |
| commit | b43390cb87eace4a017f672d66cfb20fb9e76aa1 (patch) | |
| tree | 7d4f2f0f0d0ad561f20cac4a2aa78cba9a477c78 /runtime/native/java_lang_Thread.cc | |
| parent | 28d332c720cb7c9c0163c4844bb0c1a2a067470e (diff) | |
Hold heap bitmap lock in Heap::GetObjectsAllocated
Fixes a race condition where add and remove space could cause a crash
when we iterated over the spaces.
TODO: Add a spaces lock or something to guard against this.
(cherry picked from commit a395c0a492079d86b312c9edc796d63001576954)
Bug: 21031927
Change-Id: I7f0d558316f8e9d9f22ffd182e8666355bf50d47
Diffstat (limited to 'runtime/native/java_lang_Thread.cc')
| -rw-r--r-- | runtime/native/java_lang_Thread.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/native/java_lang_Thread.cc b/runtime/native/java_lang_Thread.cc index be7022e281..6569d833c5 100644 --- a/runtime/native/java_lang_Thread.cc +++ b/runtime/native/java_lang_Thread.cc @@ -84,6 +84,7 @@ static jint Thread_nativeGetStatus(JNIEnv* env, jobject java_thread, jboolean ha case kWaitingInMainDebuggerLoop: return kJavaWaiting; case kWaitingForDebuggerSuspension: return kJavaWaiting; case kWaitingForDeoptimization: return kJavaWaiting; + case kWaitingForGetObjectsAllocated: return kJavaWaiting; case kWaitingForJniOnLoad: return kJavaWaiting; case kWaitingForSignalCatcherOutput: return kJavaWaiting; case kWaitingInMainSignalCatcherLoop: return kJavaWaiting; |