Implement deletion of breakpoints

runtime/vm/debugger_api_impl_test.cc

Index: runtime/vm/debugger_api_impl_test.cc
===================================================================
--- runtime/vm/debugger_api_impl_test.cc	(revision 3444)
+++ runtime/vm/debugger_api_impl_test.cc	(working copy)
@@ -4,6 +4,7 @@
 
 #include "include/dart_debugger_api.h"
 #include "platform/assert.h"
+#include "vm/dart_api_impl.h"
 #include "vm/unit_test.h"
 
 namespace dart {
@@ -12,6 +13,7 @@
 #if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 static bool breakpoint_hit = false;
+static int  breakpoint_hit_counter = 0;
 
 static const bool verbose = false;
 
@@ -26,6 +28,7 @@
   const char* expected_trace[] = {"A.foo", "main"};
   const intptr_t expected_trace_length = 2;
   breakpoint_hit = true;
+  breakpoint_hit_counter++;
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_NOT_ERROR(res);
@@ -46,7 +49,7 @@
 }
 
 
-UNIT_TEST_CASE(Breakpoint) {
+TEST_CASE(Debug_Breakpoint) {
   const char* kScriptChars =
       "void moo(s) { }\n"
       "class A {\n"
@@ -58,8 +61,6 @@
       "  A.foo();\n"
       "}\n";
 
-  TestIsolateScope __test_isolate__;
-
   Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
   EXPECT(!Dart_IsError(lib));
 
@@ -81,6 +82,119 @@
   EXPECT(breakpoint_hit == true);
 }
 
+
+static void DeleteBreakpointHandler(Dart_Breakpoint bpt,
+                                    Dart_StackTrace trace) {
+  const char* expected_trace[] = {"foo", "main"};
+  const intptr_t expected_trace_length = 2;
+  breakpoint_hit = true;

[siva, 2012/01/20 21:26:29]

Is this setting needed?

[hausner, 2012/01/20 22:20:32]

No, not really. Removed.

+  breakpoint_hit_counter++;
+  intptr_t trace_len;
+  Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
+  EXPECT_NOT_ERROR(res);
+  EXPECT_EQ(expected_trace_length, trace_len);
+  for (int i = 0; i < trace_len; i++) {
+    Dart_ActivationFrame frame;
+    res = Dart_GetActivationFrame(trace, i, &frame);
+    EXPECT_NOT_ERROR(res);
+    Dart_Handle func_name;
+    res = Dart_ActivationFrameInfo(frame, &func_name, NULL, NULL);
+    EXPECT_NOT_ERROR(res);
+    EXPECT(Dart_IsString(func_name));
+    const char* name_chars;
+    Dart_StringToCString(func_name, &name_chars);
+    EXPECT_STREQ(expected_trace[i], name_chars);
+    if (verbose) printf("  >> %d: %s\n", i, name_chars);
+  }
+  // Remove the breakpoint after we've hit it twice
+  if (breakpoint_hit_counter == 2) {
+    if (verbose) printf("uninstalling breakpoint\n");
+    Dart_Handle res = Dart_DeleteBreakpoint(bpt);
+    EXPECT_NOT_ERROR(res);
+  }
+}
+
+
+TEST_CASE(Debug_DeleteBreakpoint) {
+  const char* kScriptChars =
+      "moo(s) { }\n"
+      "\n"
+      "foo() {\n"
+      "    moo('good news');\n"
+      "}\n"
+      "\n"
+      "void main() {\n"
+      "  foo();\n"
+      "  foo();\n"
+      "  foo();\n"
+      "}\n";
+
+  Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
+  EXPECT(!Dart_IsError(lib));
+
+  Dart_Handle script_url = Dart_NewString(TestCase::url());
+  Dart_Handle line_no = Dart_NewInteger(4);  // In function 'foo'.
+
+  Dart_SetBreakpointHandler(&DeleteBreakpointHandler);
+
+  Dart_Breakpoint bpt;
+  Dart_Handle res = Dart_SetBreakpointAtLine(script_url, line_no, &bpt);
+  EXPECT_NOT_ERROR(res);
+
+  // Function main() calls foo() 3 times. On the second iteration, the
+  // breakpoint is removed by the handler, so we excpect the breakpoint

[siva, 2012/01/20 21:26:29]

expect

[hausner, 2012/01/20 22:20:32]

Done.

+  // to fire twice only.
+  breakpoint_hit_counter = 0;
+  Dart_Handle retval = Dart_InvokeStatic(lib,
+                                         Dart_NewString(""),
+                                         Dart_NewString("main"),
+                                         0,
+                                         NULL);
+  EXPECT(!Dart_IsError(retval));
+  EXPECT(breakpoint_hit_counter == 2);
+}
+
+
+TEST_CASE(Debug_LookupSourceLine) {
+  const char* kScriptChars =
+  /*1*/  "class A {\n"
+  /*2*/  "  static void foo() {\n"
+  /*3*/  "    moo('good news');\n"
+  /*4*/  "  }\n"
+  /*5*/  "}\n"
+  /*6*/  "\n"
+  /*7*/  "void main() {\n"
+  /*8*/  "  A.foo();\n"
+  /*9*/  "}\n"
+  /*10*/ "\n";
+
+  Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
+  EXPECT(!Dart_IsError(lib));
+
+  const Library& test_lib = Library::CheckedHandle(Api::UnwrapHandle(lib));
+  const String& script_url = String::Handle(String::New(TestCase::url()));
+  Function& func = Function::Handle();
+
+  // TODO(hausner): Looking up functions from source and line number
+  // needs to be refined. We currently dont find "main" on line 7.
+  for (int line = 8; line <= 9; line++) {
+    func = test_lib.LookupFunctionInSource(script_url, line);
+    EXPECT(!func.IsNull());
+    EXPECT_STREQ("main", String::Handle(func.name()).ToCString());
+  }
+
+  func = test_lib.LookupFunctionInSource(script_url, 3);
+  EXPECT(!func.IsNull());
+  EXPECT_STREQ("foo", String::Handle(func.name()).ToCString());
+
+  func = test_lib.LookupFunctionInSource(script_url, 1);
+  EXPECT(func.IsNull());
+  func = test_lib.LookupFunctionInSource(script_url, 6);
+  EXPECT(func.IsNull());
+  func = test_lib.LookupFunctionInSource(script_url, 10);
+  EXPECT(func.IsNull());
+}
+
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart