diff options
| author | Sebastien Hertz <shertz@google.com> | 2013-12-17 10:42:03 +0100 |
|---|---|---|
| committer | Sebastien Hertz <shertz@google.com> | 2014-07-09 16:10:45 +0200 |
| commit | bae182cbc6adc8796154162a87fc54ae804e0469 (patch) | |
| tree | d5c1fdb048edab194e948e4e90bff66703c5f55e /runtime/native/java_lang_Thread.cc | |
| parent | 0c1734665c38b3116e38a90ad06c3f152d9316c5 (diff) | |
Fix method tracing from command-line
Transitions current thread to the new kWaitingForMethodTracingStart thread
state when starting method tracing.
Ensures there is a current thread when method tracing is stopped due to runtime
shutdown. If the current thread has been detached, we now re-attach it.
Note: we only do this if method tracing has been activated from command-line.
Fixes instrumentation when forcing interpreter mode (-Xint) with method tracing
enabled.
Removes unused parameter from UnsafeLogFatalForThreadSuspendAllTimeout.
Bug: https://code.google.com/p/android/issues/detail?id=72094
Bug: 11683397
Change-Id: I70f000fb46ddd95d6ad51ea0a8eee77697a045e9
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 86db893cf8..bae67f20e8 100644 --- a/runtime/native/java_lang_Thread.cc +++ b/runtime/native/java_lang_Thread.cc @@ -85,6 +85,7 @@ static jint Thread_nativeGetStatus(JNIEnv* env, jobject java_thread, jboolean ha case kWaitingForJniOnLoad: return kJavaWaiting; case kWaitingForSignalCatcherOutput: return kJavaWaiting; case kWaitingInMainSignalCatcherLoop: return kJavaWaiting; + case kWaitingForMethodTracingStart: return kJavaWaiting; case kSuspended: return kJavaRunnable; // Don't add a 'default' here so the compiler can spot incompatible enum changes. } |