diff options
| author | Ian Rogers <irogers@google.com> | 2014-07-09 18:52:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-07-09 14:50:30 +0000 |
| commit | 0f635b103c1fff6439d47bdae363afeffe7327fd (patch) | |
| tree | afa160b8c3b850e5189a1bfa06065faee54eccaf /runtime/debugger.cc | |
| parent | 32710dd4a0232149002a5ae7bde1c640cdffd564 (diff) | |
| parent | bae182cbc6adc8796154162a87fc54ae804e0469 (diff) | |
| download | art-0f635b103c1fff6439d47bdae363afeffe7327fd.zip art-0f635b103c1fff6439d47bdae363afeffe7327fd.tar.gz art-0f635b103c1fff6439d47bdae363afeffe7327fd.tar.bz2 | |
Merge "Fix method tracing from command-line"
Diffstat (limited to 'runtime/debugger.cc')
| -rw-r--r-- | runtime/debugger.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/runtime/debugger.cc b/runtime/debugger.cc index 6161aff..c95be01 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -1996,13 +1996,14 @@ JDWP::JdwpThreadStatus Dbg::ToJdwpThreadStatus(ThreadState state) { case kTerminated: return JDWP::TS_ZOMBIE; case kTimedWaiting: + case kWaitingForCheckPointsToRun: case kWaitingForDebuggerSend: case kWaitingForDebuggerSuspension: case kWaitingForDebuggerToAttach: case kWaitingForDeoptimization: case kWaitingForGcToComplete: - case kWaitingForCheckPointsToRun: case kWaitingForJniOnLoad: + case kWaitingForMethodTracingStart: case kWaitingForSignalCatcherOutput: case kWaitingInMainDebuggerLoop: case kWaitingInMainSignalCatcherLoop: |