Handle stepping requests after isolate interrupt event

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 "include/dart_mirrors_api.h"
 #include "platform/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/thread.h"
 #include "vm/unit_test.h"
@@ skipping 1290 matching lines @@
   EXPECT(Dart_GetIsolate(test_isolate_id) == isolate);
   EXPECT(Dart_GetIsolateId(isolate) == test_isolate_id);
   Dart_ExitScope();
   Dart_ShutdownIsolate();
   EXPECT(verify_callback == 0x5);  // Only created and shutdown events.
 }
 
 
 static Monitor* sync = NULL;
 static bool isolate_interrupted = false;
+static bool pause_event_handled = false;
 static Dart_IsolateId interrupt_isolate_id = ILLEGAL_ISOLATE_ID;
 static volatile bool continue_isolate_loop = true;
 
 
+static void InterruptIsolateHandler(Dart_IsolateId isolateId,
+                                    intptr_t breakpointId,
+                                    const Dart_CodeLocation& location) {
+  MonitorLocker ml(sync);
+  pause_event_handled = true;
+  ml.Notify();
+}
+
 static void TestInterruptIsolate(Dart_IsolateId isolate_id,
                                  Dart_IsolateEvent kind) {
   if (kind == kCreated) {
     EXPECT(interrupt_isolate_id == ILLEGAL_ISOLATE_ID);
     // Indicate that the isolate has been created.
     {
       MonitorLocker ml(sync);
       interrupt_isolate_id = isolate_id;
       ml.Notify();
     }
   } else if (kind == kInterrupted) {
     // Indicate that isolate has been interrupted.
     {
       MonitorLocker ml(sync);
       isolate_interrupted = true;
       continue_isolate_loop = false;
-      ml.Notify();
+      Dart_SetStepInto();
     }
   } else if (kind == kShutdown) {
     if (interrupt_isolate_id == isolate_id) {
       MonitorLocker ml(sync);
       interrupt_isolate_id = ILLEGAL_ISOLATE_ID;
       ml.Notify();
     }
   }
 }
 
@@ skipping 45 matching lines @@
   EXPECT_VALID(retval);
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 TEST_CASE(Debug_InterruptIsolate) {
   Dart_SetIsolateEventHandler(&TestInterruptIsolate);
   sync = new Monitor();
   EXPECT(interrupt_isolate_id == ILLEGAL_ISOLATE_ID);
+  Dart_SetPausedEventHandler(InterruptIsolateHandler);
   int result = Thread::Start(InterruptIsolateRun, 0);
   EXPECT_EQ(0, result);
 
   // Wait for the test isolate to be created.
   {
     MonitorLocker ml(sync);
     while (interrupt_isolate_id == ILLEGAL_ISOLATE_ID) {
       ml.Wait();
     }
   }
   EXPECT(interrupt_isolate_id != ILLEGAL_ISOLATE_ID);
 
   Dart_Isolate isolate = Dart_GetIsolate(interrupt_isolate_id);
   EXPECT(isolate != NULL);
   Dart_InterruptIsolate(isolate);
 
   // Wait for the test isolate to be interrupted.
   {
     MonitorLocker ml(sync);
-    while (!isolate_interrupted) {
+    while (!isolate_interrupted || !pause_event_handled) {
       ml.Wait();
     }
   }
   EXPECT(isolate_interrupted);
+  EXPECT(pause_event_handled);
 
   // Wait for the test isolate to shutdown.
   {
     MonitorLocker ml(sync);
     while (interrupt_isolate_id != ILLEGAL_ISOLATE_ID) {
       ml.Wait();
     }
   }
   EXPECT(interrupt_isolate_id == ILLEGAL_ISOLATE_ID);
 }
 
-
 static void StackTraceDump1BreakpointHandler(
                 Dart_IsolateId isolate_id,
                 intptr_t bp_id,
                 const Dart_CodeLocation& location) {
   Dart_StackTrace trace;
   Dart_GetStackTrace(&trace);
   const int kStackTraceLen = 4;
   static const char* expected_trace[kStackTraceLen] = {
     "local_to_main",
     "Test.local1_to_func1",
@@ skipping 618 matching lines @@
 
   Dart_Handle list_type = Dart_InstanceGetType(list_access_test_obj);
   Dart_Handle super_type = Dart_GetSupertype(list_type);
   EXPECT(!Dart_IsError(super_type));
   super_type = Dart_GetSupertype(super_type);
   EXPECT(!Dart_IsError(super_type));
   EXPECT(super_type == Dart_Null());
 }
 
 }  // namespace dart