- Add support to interrupt a running isolate

runtime/vm/debugger_api_impl_test.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 "include/dart_debugger_api.h"
 #include "platform/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/thread.h"
 #include "vm/unit_test.h"
 
@@ skipping 217 matching lines @@
     EXPECT_VALID(res);
     if (i < expected_frames) {
       VerifyStackFrame(frame, func_names[i], local_vars[i]);
     } else {
       VerifyStackFrame(frame, NULL, Dart_Null());
     }
   }
 }
 
 
-void TestBreakpointHandler(Dart_Breakpoint bpt, Dart_StackTrace trace) {
+void TestBreakpointHandler(Dart_IsolateId isolate_id,
+                           Dart_Breakpoint bpt,
+                           Dart_StackTrace trace) {
   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_VALID(res);
   EXPECT_EQ(expected_trace_length, trace_len);
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
@@ skipping 27 matching lines @@
   Dart_SetBreakpointHandler(&TestBreakpointHandler);
   SetBreakpointAtEntry("A", "foo");
 
   breakpoint_hit = false;
   Dart_Handle retval = Invoke("main");
   EXPECT_VALID(retval);
   EXPECT(breakpoint_hit == true);
 }
 
 
-void TestStepOutHandler(Dart_Breakpoint bpt, Dart_StackTrace trace) {
+void TestStepOutHandler(Dart_IsolateId isolate_id,
+                        Dart_Breakpoint bpt,
+                        Dart_StackTrace trace) {
   const char* expected_bpts[] = {"f1", "foo", "main"};
   const intptr_t expected_bpts_length = ARRAY_SIZE(expected_bpts);
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_VALID(res);
   EXPECT(breakpoint_hit_counter < expected_bpts_length);
   Dart_ActivationFrame frame;
   res = Dart_GetActivationFrame(trace, 0, &frame);
   EXPECT_VALID(res);
   Dart_Handle func_name;
@@ skipping 41 matching lines @@
   Dart_Handle retval = Invoke("main");
   EXPECT_VALID(retval);
   EXPECT(Dart_IsInteger(retval));
   int64_t int_value = 0;
   Dart_IntegerToInt64(retval, &int_value);
   EXPECT_EQ(2, int_value);
   EXPECT(breakpoint_hit == true);
 }
 
 
-void TestStepIntoHandler(Dart_Breakpoint bpt, Dart_StackTrace trace) {
+void TestStepIntoHandler(Dart_IsolateId isolate_id,
+                         Dart_Breakpoint bpt,
+                         Dart_StackTrace trace) {
   const char* expected_bpts[] = {
       "main",
         "foo",
           "f1",
         "foo",
           "X.X.",
         "foo",
           "X.kvmk",
             "f2",
           "X.kvmk",
@@ skipping 60 matching lines @@
   Dart_Handle retval = Invoke("main");
   EXPECT_VALID(retval);
   EXPECT(Dart_IsInteger(retval));
   int64_t int_value = 0;
   Dart_IntegerToInt64(retval, &int_value);
   EXPECT_EQ(7, int_value);
   EXPECT(breakpoint_hit == true);
 }
 
 
-static void StepIntoHandler(Dart_Breakpoint bpt, Dart_StackTrace trace) {
+static void StepIntoHandler(Dart_IsolateId isolate_id,
+                            Dart_Breakpoint bpt,
+                            Dart_StackTrace trace) {
   if (verbose) {
     OS::Print(">>> Breakpoint nr. %d in %s <<<\n",
               breakpoint_hit_counter, BreakpointInfo(trace));
     PrintStackTrace(trace);
   }
   breakpoint_hit = true;
   breakpoint_hit_counter++;
   Dart_SetStepInto();
 }
 
@@ skipping 60 matching lines @@
   Dart_Handle retval = Invoke("main");
   EXPECT_VALID(retval);
   EXPECT(Dart_IsInteger(retval));
   int64_t int_value = 0;
   Dart_IntegerToInt64(retval, &int_value);
   EXPECT_EQ(2 * 99, int_value);
   EXPECT(breakpoint_hit == true);
 }
 
 
-void TestSingleStepHandler(Dart_Breakpoint bpt, Dart_StackTrace trace) {
+void TestSingleStepHandler(Dart_IsolateId isolate_id,
+                           Dart_Breakpoint bpt,
+                           Dart_StackTrace trace) {
   const char* expected_bpts[] = {
       "moo", "foo", "moo", "foo", "moo", "foo", "main"};
   const intptr_t expected_bpts_length = ARRAY_SIZE(expected_bpts);
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_VALID(res);
   EXPECT(breakpoint_hit_counter < expected_bpts_length);
   Dart_ActivationFrame frame;
   res = Dart_GetActivationFrame(trace, 0, &frame);
   EXPECT_VALID(res);
@@ skipping 35 matching lines @@
   SetBreakpointAtEntry("", "moo");
 
   breakpoint_hit = false;
   breakpoint_hit_counter = 0;
   Dart_Handle retval = Invoke("main");
   EXPECT_VALID(retval);
   EXPECT(breakpoint_hit == true);
 }
 
 
-static void ClosureBreakpointHandler(Dart_Breakpoint bpt,
+static void ClosureBreakpointHandler(Dart_IsolateId isolate_id,
+                                     Dart_Breakpoint bpt,
                                      Dart_StackTrace trace) {
   const char* expected_trace[] = {"callback", "main"};
   const intptr_t expected_trace_length = 2;
   breakpoint_hit_counter++;
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_VALID(res);
   EXPECT_EQ(expected_trace_length, trace_len);
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
@@ skipping 32 matching lines @@
   breakpoint_hit_counter = 0;
   Dart_Handle retval = Invoke("main");
   EXPECT_VALID(retval);
   int64_t int_value = 0;
   Dart_IntegerToInt64(retval, &int_value);
   EXPECT_EQ(442, int_value);
   EXPECT_EQ(2, breakpoint_hit_counter);
 }
 
 
-static void ExprClosureBreakpointHandler(Dart_Breakpoint bpt,
+static void ExprClosureBreakpointHandler(Dart_IsolateId isolate_id,
+                                         Dart_Breakpoint bpt,
                                          Dart_StackTrace trace) {
   static const char* expected_trace[] = {"add", "main"};
   Dart_Handle add_locals = Dart_NewList(4);
   Dart_ListSetAt(add_locals, 0, Dart_NewString("a"));
   Dart_ListSetAt(add_locals, 1, Dart_NewInteger(10));
   Dart_ListSetAt(add_locals, 2, Dart_NewString("b"));
   Dart_ListSetAt(add_locals, 3, Dart_NewInteger(20));
   Dart_Handle expected_locals[] = {add_locals, Dart_Null()};
   breakpoint_hit_counter++;
   PrintStackTrace(trace);
@@ skipping 26 matching lines @@
   EXPECT_VALID(retval);
   int64_t int_value = 0;
   Dart_IntegerToInt64(retval, &int_value);
   EXPECT_EQ(30, int_value);
   EXPECT_EQ(1, breakpoint_hit_counter);
 }
 
 
 static intptr_t bp_id_to_be_deleted;
 
-static void DeleteBreakpointHandler(Dart_Breakpoint bpt,
+static void DeleteBreakpointHandler(Dart_IsolateId isolate_id,
+                                    Dart_Breakpoint bpt,
                                     Dart_StackTrace trace) {
   const char* expected_trace[] = {"foo", "main"};
   const intptr_t expected_trace_length = 2;
   breakpoint_hit_counter++;
   intptr_t trace_len;
   Dart_Handle res = Dart_StackTraceLength(trace, &trace_len);
   EXPECT_VALID(res);
   EXPECT_EQ(expected_trace_length, trace_len);
   for (int i = 0; i < trace_len; i++) {
     Dart_ActivationFrame frame;
@@ skipping 48 matching lines @@
   // breakpoint is removed by the handler, so we expect the breakpoint
   // to fire twice only.
   bp_id_to_be_deleted = bp_id;
   breakpoint_hit_counter = 0;
   Dart_Handle retval = Invoke("main");
   EXPECT_VALID(retval);
   EXPECT_EQ(2, breakpoint_hit_counter);
 }
 
 
-static void InspectStaticFieldHandler(Dart_Breakpoint bpt,
+static void InspectStaticFieldHandler(Dart_IsolateId isolate_id,
+                                      Dart_Breakpoint bpt,
                                       Dart_StackTrace trace) {
   ASSERT(script_lib != NULL);
   ASSERT(!Dart_IsError(script_lib));
   ASSERT(Dart_IsLibrary(script_lib));
   Dart_Handle class_A = Dart_GetClass(script_lib, Dart_NewString("A"));
   EXPECT_VALID(class_A);
 
   const int expected_num_fields = 2;
   struct {
     const char* field_name;
@@ skipping 460 matching lines @@
     while (interrupt_isolate_id != ILLEGAL_ISOLATE_ID) {
       ml.Wait();
     }
   }
   EXPECT(interrupt_isolate_id == ILLEGAL_ISOLATE_ID);
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart