First debugger API unit test

runtime/vm/debugger.cc

 // Copyright (c) 2011, 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 "vm/code_index_table.h"
 #include "vm/code_patcher.h"
 #include "vm/compiler.h"
 #include "vm/flags.h"
 #include "vm/globals.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/os.h"
 #include "vm/stack_frame.h"
 #include "vm/stub_code.h"
 #include "vm/visitor.h"
 
 
 namespace dart {
 
 
 DEFINE_FLAG(charp, bpt, NULL, "Debug breakpoint at <func>");

[siva, 2011/12/09 02:20:04]

Is this flag used anymore?

[hausner, 2011/12/13 00:14:59]

No. Good catch.

 
+static const bool verbose = false;

[siva, 2011/12/09 02:20:04]

Can this be turned on at the command line?

[hausner, 2011/12/13 00:14:59]

No it's just for my own "debugger debugging" at this point. The verbose output
will go away over time. 

 
 Breakpoint::Breakpoint(const Function& func, intptr_t pc_desc_index)
     : function_(func.raw()),
       pc_desc_index_(pc_desc_index),
       pc_(0),
       line_number_(-1),
       next_(NULL) {
   Code& code = Code::Handle(func.code());
   ASSERT(!code.IsNull());  // Function must be compiled.
   PcDescriptors& desc = PcDescriptors::Handle(code.pc_descriptors());
@@ skipping 47 matching lines @@
   if (function_ == Function::null()) {
     ASSERT(Isolate::Current() != NULL);
     CodeIndexTable* code_index_table = Isolate::Current()->code_index_table();
     ASSERT(code_index_table != NULL);
     function_ = code_index_table->LookupFunction(pc_);
   }
   return function_;
 }
 
 
+const char* Debugger::QualifiedFunctionName(const Function& func) {
+  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";
+  intptr_t len = OS::SNPrint(NULL, 0, kFormat,
+      func_class.IsTopLevel() ? "" : class_name.ToCString(),
+      func_class.IsTopLevel() ? "" : ".",
+      func_name.ToCString());

[siva, 2011/12/09 02:20:04]

ditto comment regarding library URL needed for full qualification?

[hausner, 2011/12/13 00:14:59]

Yes. Cf other comment.

+  len++;  // String terminator.
+  char* chars = reinterpret_cast<char*>(
+      Isolate::Current()->current_zone()->Allocate(len));
+  OS::SNPrint(chars, len, kFormat,
+              func_class.IsTopLevel() ? "" : class_name.ToCString(),
+              func_class.IsTopLevel() ? "" : ".",
+              func_name.ToCString());
+  return chars;
+}
+
+
+RawString* ActivationFrame::QualifiedFunctionName() {
+  Function& func = Function::Handle(DartFunction());
+  return String::New(Debugger::QualifiedFunctionName(func));
+}
+
+
 RawString* ActivationFrame::SourceUrl() {
   const Script& script = Script::Handle(SourceScript());
   return script.url();
 }
 
 
 RawScript* ActivationFrame::SourceScript() {
   const Function& func = Function::Handle(DartFunction());
   const Class& cls = Class::Handle(func.owner());
   return cls.script();
@@ skipping 35 matching lines @@
 }
 
 
 RawInstance* ActivationFrame::Value(const String& variable_name) {
   UNIMPLEMENTED();
   return NULL;
 }
 
 
 const char* ActivationFrame::ToCString() {
-  const char* kFormat = "Function: '%s%s%s' url: '%s' line: %d";
+  const char* kFormat = "Function: '%s' url: '%s' line: %d";
 
   Function& func = Function::Handle(DartFunction());
-  String& func_name = String::Handle(func.name());
-  Class& func_class = Class::Handle(func.owner());
-  String& class_name = String::Handle(func_class.Name());
   String& url = String::Handle(SourceUrl());
   intptr_t line = LineNumber();
+  const char* func_name = Debugger::QualifiedFunctionName(func);
 
-  intptr_t len = OS::SNPrint(NULL, 0, kFormat,
-                             class_name.ToCString(),
-                             func_class.IsTopLevel() ? "" : ".",
-                             func_name.ToCString(),
-                             url.ToCString(),
-                             line);
+  intptr_t len =
+      OS::SNPrint(NULL, 0, kFormat, func_name, url.ToCString(), line);
   len++;  // String terminator.
   char* chars = reinterpret_cast<char*>(
       Isolate::Current()->current_zone()->Allocate(len));
-  OS::SNPrint(chars, len, kFormat,
-              class_name.ToCString(),
-              func_class.IsTopLevel() ? "" : ".",
-              func_name.ToCString(),
-              url.ToCString(),
-              line);
+  OS::SNPrint(chars, len, kFormat, func_name, url.ToCString(), line);
   return chars;
 }
 
 
 void StackTrace::AddActivation(ActivationFrame* frame) {
   this->trace_.Add(frame);
 }
 
 
 Debugger::Debugger()
@@ skipping 63 matching lines @@
           desc.PC(i), StubCode::BreakpointDynamicEntryPoint());
       bpt = new Breakpoint(target_function, i);
     } else if (kind == PcDescriptors::kOther) {
       if (CodePatcher::IsDartCall(desc.PC(i))) {
         CodePatcher::PatchStaticCallAt(
             desc.PC(i), StubCode::BreakpointStaticEntryPoint());
         bpt = new Breakpoint(target_function, i);
       }
     }
     if (bpt != NULL) {
-      OS::Print("Setting breakpoint at '%s' line %d  (PC %p)\n",
-          String::Handle(bpt->SourceUrl()).ToCString(),
-          bpt->LineNumber(),
-          bpt->pc());
+      if (verbose) {
+        OS::Print("Setting breakpoint at '%s' line %d  (PC %p)\n",
+            String::Handle(bpt->SourceUrl()).ToCString(),
+            bpt->LineNumber(),
+            bpt->pc());
+      }
       AddBreakpoint(bpt);
       return bpt;
     }
   }
   return NULL;
 }
 
 
 void Debugger::VisitObjectPointers(ObjectPointerVisitor* visitor) {
   ASSERT(visitor != NULL);
@@ skipping 21 matching lines @@
 }
 
 
 void Debugger::BreakpointCallback() {
   ASSERT(initialized_);
   DartFrameIterator iterator;
   DartFrame* frame = iterator.NextFrame();
   ASSERT(frame != NULL);
   Breakpoint* bpt = GetBreakpoint(frame->pc());
   ASSERT(bpt != NULL);
-  OS::Print(">>> Breakpoint at %s:%d (Address %p)\n",
-      bpt ? String::Handle(bpt->SourceUrl()).ToCString() : "?",
-      bpt ? bpt->LineNumber() : 0,
-      frame->pc());
+  if (verbose) {
+    OS::Print(">>> Breakpoint at %s:%d (Address %p)\n",
+        bpt ? String::Handle(bpt->SourceUrl()).ToCString() : "?",
+        bpt ? bpt->LineNumber() : 0,
+        frame->pc());
+  }
   StackTrace* stack_trace = new StackTrace(8);
   while (frame != NULL) {
     ASSERT(frame->IsValid());
     ASSERT(frame->IsDartFrame());
     ActivationFrame* activation = new ActivationFrame(frame->pc());
     stack_trace->AddActivation(activation);
     frame = iterator.NextFrame();
   }
 
   if (bp_handler_ != NULL) {

[siva, 2011/12/09 02:20:04]

Can bp_handler_ ever be NULL, it ties back to the question of can somebody call
the dart API function and set this to NULL?

[hausner, 2011/12/13 00:14:59]

Yes, it can be NULL if the caller would like to remove its registered breakpoint
callback. In that case, we just install the default handler.

     (*bp_handler_)(bpt, stack_trace);
   }
 }
 
 
 void Debugger::Initialize(Isolate* isolate) {
   if (initialized_) {
     return;
   }
   initialized_ = true;
@@ skipping 14 matching lines @@
 
 
 void Debugger::AddBreakpoint(Breakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(this->breakpoints_);
   this->breakpoints_ = bpt;
 }
 
 
 }  // namespace dart