Deprecate old debugger breakpoint handler

runtime/vm/debugger.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/debugger.h"
 
 #include "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 10 matching lines @@
 #include "vm/stub_code.h"
 #include "vm/symbols.h"
 #include "vm/visitor.h"
 
 
 namespace dart {
 
 DEFINE_FLAG(bool, verbose_debug, false, "Verbose debugger messages");
 
 
-static void DefaultBreakpointHandler(Dart_Port isolate_id,
-                                     SourceBreakpoint* bpt,
-                                     DebuggerStackTrace* stack) {
-  String& var_name = String::Handle();
-  Instance& value = Instance::Handle();
-  for (intptr_t i = 0; i < stack->Length(); i++) {
-    ActivationFrame* frame = stack->ActivationFrameAt(i);
-    OS::Print("   %"Pd". %s\n",
-              i + 1, frame->ToCString());
-    intptr_t num_locals = frame->NumLocalVariables();
-    for (intptr_t i = 0; i < num_locals; i++) {
-      intptr_t token_pos, end_pos;
-      frame->VariableAt(i, &var_name, &token_pos, &end_pos, &value);
-      OS::Print("      var %s (pos %"Pd") = %s\n",
-                var_name.ToCString(), token_pos, value.ToCString());
-    }
-  }
-}
-
-
-BreakpointHandler* Debugger::bp_handler_ = DefaultBreakpointHandler;
 Debugger::EventHandler* Debugger::event_handler_ = NULL;
 
 
 class RemoteObjectCache : public ZoneAllocated {
  public:
   explicit RemoteObjectCache(intptr_t initial_size);
   intptr_t AddObject(const Object& obj);
   RawObject* GetObj(intptr_t obj_id) const;
   bool IsValidId(intptr_t obj_id) const {
     return obj_id < objs_->Length();
@@ skipping 1358 matching lines @@
     bpt = bpt->next();
   }
   CodeBreakpoint* cbpt = code_breakpoints_;
   while (cbpt != NULL) {
     cbpt->VisitObjectPointers(visitor);
     cbpt = cbpt->next();
   }
 }
 
 
-void Debugger::SetBreakpointHandler(BreakpointHandler* handler) {
-  if (bp_handler_ != NULL) {
-    bp_handler_ = handler;
-  }
-}
-
-
 void Debugger::SetEventHandler(EventHandler* handler) {
   event_handler_ = handler;
 }
 
 
 bool Debugger::IsDebuggable(const Function& func) {
   RawFunction::Kind fkind = func.kind();
   if ((fkind == RawFunction::kImplicitGetter) ||
       (fkind == RawFunction::kImplicitSetter) ||
       (fkind == RawFunction::kConstImplicitGetter) ||
@@ skipping 33 matching lines @@
     // This is a user-defined breakpoint so we call the breakpoint
     // callback even if it is on the same line as the previous breakpoint.
     last_bpt_line_ = -1;
   }
 
   bool notify_frontend =
     (last_bpt_line_ < 0) || (last_bpt_line_ != bpt->LineNumber());
 
   if (notify_frontend) {
     resume_action_ = kContinue;
-    if (bp_handler_ != NULL) {
-      SourceBreakpoint* src_bpt = bpt->src_bpt();
+    if (event_handler_ != NULL) {
       ASSERT(stack_trace_ == NULL);
       ASSERT(obj_cache_ == NULL);
       obj_cache_ = new RemoteObjectCache(64);
       stack_trace_ = stack_trace;
-      (*bp_handler_)(GetIsolateId(), src_bpt, stack_trace);
+      DebuggerEvent event;
+      event.type = kBreakpointReached;
+      ASSERT(stack_trace->Length() > 0);
+      event.top_frame = stack_trace->ActivationFrameAt(0);
+      (*event_handler_)(&event);
       stack_trace_ = NULL;
       obj_cache_ = NULL;  // Remote object cache is zone allocated.
       last_bpt_line_ = bpt->LineNumber();
     }
   }
 
   Function& currently_instrumented_func = Function::Handle();
   if (bpt->IsInternal()) {
     currently_instrumented_func = bpt->function();
   }
@@ skipping 251 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart