- Add support to interrupt a running isolate

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(SourceBreakpoint* bpt,
+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;
@@ skipping 119 matching lines @@
 
 
 void Debugger::SignalIsolateEvent(EventType type) {
   if (event_handler_ != NULL) {
     Debugger* debugger = Isolate::Current()->debugger();
     ASSERT(debugger != NULL);
     DebuggerEvent event;
     event.type = type;
     event.isolate_id = debugger->GetIsolateId();
     ASSERT(event.isolate_id != ILLEGAL_ISOLATE_ID);
-    (*event_handler_)(&event);
+    if (type == kIsolateInterrupted) {
+      DebuggerStackTrace* stack_trace = debugger->CollectStackTrace();
+      ASSERT(stack_trace->Length() > 0);
+      ASSERT(debugger->stack_trace_ == NULL);
+      ASSERT(debugger->obj_cache_ == NULL);
+      debugger->obj_cache_ = new RemoteObjectCache(64);
+      debugger->stack_trace_ = stack_trace;
+      (*event_handler_)(&event);
+      debugger->stack_trace_ = NULL;
+      debugger->obj_cache_ = NULL;  // Remote object cache is zone allocated.
+      // TODO(asiva): Need some work here to be able to single step after
+      // an interrupt.
+    } else {
+      (*event_handler_)(&event);
+    }
   }
 }
 
 
 const char* Debugger::QualifiedFunctionName(const Function& func) {
   const String& func_name = String::Handle(func.name());
   Class& func_class = Class::Handle(func.Owner());
   String& class_name = String::Handle(func_class.Name());
 
   const char* kFormat = "%s%s%s";
@@ skipping 1148 matching lines @@
     // 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) {
+      Isolate* isolate = Isolate::Current();

[hausner, 2012/10/05 18:06:34]

Why do you need to get the debugger object through the current isolate? We are
in an instance method, and *this should be the same as
Isolate::Current()->debugger().

I see that you made SignalIsolateEvent() a static method, but SignalBpReached is
an instance method.

[siva, 2012/10/05 22:35:06]

Good point, this is not a static function so just GetIsolateId() is sufficient.

On 2012/10/05 18:06:34, hausner wrote:

+      ASSERT(isolate != NULL);
+      ASSERT(isolate->debugger() != NULL);
       SourceBreakpoint* src_bpt = bpt->src_bpt();
       ASSERT(stack_trace_ == NULL);
       ASSERT(obj_cache_ == NULL);
       obj_cache_ = new RemoteObjectCache(64);
       stack_trace_ = stack_trace;
-      (*bp_handler_)(src_bpt, stack_trace);
+      (*bp_handler_)(isolate->debugger()->GetIsolateId(), src_bpt, stack_trace);
       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 245 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart