commit 380f0d8db56b5fcf6e7181184fdae9f303ad7ba5
author Andreas Gampe <agampe@google.com> Mon Jun 10 11:01:43 2019 -0700
committer Treehugger Robot <treehugger-gerrit@google.com> Tue Jun 11 17:44:40 2019 +0000
tree 4ad13aff6c3742787f6f6487844305af065070e9
parent 3fae12960c2d411dff450fce95c096af0e8d74de

ART: Conditionally install Dbg class callbacks

Temporary allocations in the dispatch code are unnecessary when they
end up in disabled code. Instead follow the example of the method
inspection callback and only add the callback when the debugger is
actually active.

Test: m test-art-host
Test: atest CtsJdwpTestCases
Change-Id: I750f2df475400147b1d569f463228d436aa3ae5a

runtime/debugger.cc

diff --git a/runtime/debugger.cc b/runtime/debugger.cc
index 914a750..4cc3583 100644
--- a/runtime/debugger.cc
+++ b/runtime/debugger.cc
@@ -698,7 +698,8 @@
   }
   instrumentation_events_ = 0;
   Runtime::DoAndMaybeSwitchInterpreter([=](){ gDebuggerActive = true; });
-  Runtime::Current()->GetRuntimeCallbacks()->AddMethodInspectionCallback(&gDebugActiveCallback);
+  runtime->GetRuntimeCallbacks()->AddClassLoadCallback(Dbg::GetClassLoadCallback());
+  runtime->GetRuntimeCallbacks()->AddMethodInspectionCallback(&gDebugActiveCallback);
   LOG(INFO) << "Debugger is active";
 }
 
@@ -736,7 +737,8 @@
         runtime->GetInstrumentation()->DisableDeoptimization(kDbgInstrumentationKey);
       }
       Runtime::DoAndMaybeSwitchInterpreter([=](){ gDebuggerActive = false; });
-      Runtime::Current()->GetRuntimeCallbacks()->RemoveMethodInspectionCallback(
+      runtime->GetRuntimeCallbacks()->RemoveClassLoadCallback(Dbg::GetClassLoadCallback());
+      runtime->GetRuntimeCallbacks()->RemoveMethodInspectionCallback(
           &gDebugActiveCallback);
     }
   }

runtime/runtime.cc

diff --git a/runtime/runtime.cc b/runtime/runtime.cc
index ad8ded4..d8c68e6 100644
--- a/runtime/runtime.cc
+++ b/runtime/runtime.cc
@@ -1398,7 +1398,6 @@
     }
   }
   callbacks_->AddThreadLifecycleCallback(Dbg::GetThreadLifecycleCallback());
-  callbacks_->AddClassLoadCallback(Dbg::GetClassLoadCallback());
 
   jit_options_.reset(jit::JitOptions::CreateFromRuntimeArguments(runtime_options));
   if (IsAotCompiler()) {