diff options
| author | Sebastien Hertz <shertz@google.com> | 2015-05-07 16:10:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-05-07 16:10:44 +0000 |
| commit | ba9ef5377b21a627ec502da3e475b34e45d0c435 (patch) | |
| tree | 5facbc141e51db481cb7473403675a4142992ba1 /runtime/debugger.cc | |
| parent | b882da74db950246b5731aecad9737b63bdefef7 (diff) | |
| parent | 0462c4c87c39db6cfcd338f323844738109ac3c9 (diff) | |
| download | art-ba9ef5377b21a627ec502da3e475b34e45d0c435.tar.gz art-ba9ef5377b21a627ec502da3e475b34e45d0c435.tar.bz2 art-ba9ef5377b21a627ec502da3e475b34e45d0c435.zip | |
Merge "Support multiple instrumentation clients"
Diffstat (limited to 'runtime/debugger.cc')
| -rw-r--r-- | runtime/debugger.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/runtime/debugger.cc b/runtime/debugger.cc index 47371e54c5..9b33e50881 100644 --- a/runtime/debugger.cc +++ b/runtime/debugger.cc @@ -57,6 +57,9 @@ namespace art { +// The key identifying the debugger to update instrumentation. +static constexpr const char* kDbgInstrumentationKey = "Debugger"; + static const size_t kMaxAllocRecordStackDepth = 16; // Max 255. static const size_t kDefaultNumAllocRecords = 64*1024; // Must be a power of 2. 2BE can hold 64k-1. @@ -733,7 +736,7 @@ void Dbg::Disconnected() { instrumentation_events_ = 0; } if (RequiresDeoptimization()) { - runtime->GetInstrumentation()->DisableDeoptimization(); + runtime->GetInstrumentation()->DisableDeoptimization(kDbgInstrumentationKey); } gDebuggerActive = false; } @@ -3054,12 +3057,12 @@ void Dbg::ProcessDeoptimizationRequest(const DeoptimizationRequest& request) { break; case DeoptimizationRequest::kFullDeoptimization: VLOG(jdwp) << "Deoptimize the world ..."; - instrumentation->DeoptimizeEverything(); + instrumentation->DeoptimizeEverything(kDbgInstrumentationKey); VLOG(jdwp) << "Deoptimize the world DONE"; break; case DeoptimizationRequest::kFullUndeoptimization: VLOG(jdwp) << "Undeoptimize the world ..."; - instrumentation->UndeoptimizeEverything(); + instrumentation->UndeoptimizeEverything(kDbgInstrumentationKey); VLOG(jdwp) << "Undeoptimize the world DONE"; break; case DeoptimizationRequest::kSelectiveDeoptimization: |