From b43390cb87eace4a017f672d66cfb20fb9e76aa1 Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Tue, 12 May 2015 10:47:11 -0700 Subject: 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 --- runtime/thread_state.h | 1 + 1 file changed, 1 insertion(+) (limited to 'runtime/thread_state.h') diff --git a/runtime/thread_state.h b/runtime/thread_state.h index b5479edb80..c7ea7f4381 100644 --- a/runtime/thread_state.h +++ b/runtime/thread_state.h @@ -42,6 +42,7 @@ enum ThreadState { kWaitingForDeoptimization, // WAITING TS_WAIT waiting for deoptimization suspend all kWaitingForMethodTracingStart, // WAITING TS_WAIT waiting for method tracing to start kWaitingForVisitObjects, // WAITING TS_WAIT waiting for visiting objects + kWaitingForGetObjectsAllocated, // WAITING TS_WAIT waiting for getting the number of allocated objects kStarting, // NEW TS_WAIT native thread started, not yet ready to run managed code kNative, // RUNNABLE TS_RUNNING running in a JNI native method kSuspended, // RUNNABLE TS_RUNNING suspended by GC or debugger -- cgit v1.2.3