Fix issue 906

runtime/vm/dart_api_impl_test.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 "include/dart_api.h"
 
 #include "vm/assert.h"
 #include "vm/dart_api_impl.h"
 #include "vm/dart_api_state.h"
 #include "vm/thread.h"
@@ skipping 2940 matching lines @@
 UNIT_TEST_CASE(RunLoop_ExceptionChild) {
   RunLoopTest(true, false);
 }
 
 
 UNIT_TEST_CASE(RunLoop_ExceptionParent) {
   RunLoopTest(false, true);
 }
 
 
+// Utility functions and variables for test case IsolateInterrupt starts here.
 static Monitor* sync = NULL;
 static Dart_Isolate shared_isolate = NULL;
+static bool main_entered = false;
+
+
+void MarkMainEntered(Dart_NativeArguments args) {
+  Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
+  // Indicate that main has been entered.
+  {
+    MonitorLocker ml(sync);
+    main_entered = true;
+    ml.Notify();
+  }
+  Dart_SetReturnValue(args, Dart_Null());
+  Dart_ExitScope();
+}
+
+
+static Dart_NativeFunction IsolateInterruptTestNativeLookup(
+    Dart_Handle name, int argument_count) {
+  return reinterpret_cast<Dart_NativeFunction>(&MarkMainEntered);
+}
+
+
 void BusyLoop_start(uword unused) {
   // TODO(turnidge): Get rid of call to 'function' after interrupts
   // are checked on backward branches.
   const char* kScriptChars =
+      "class Native {\n"
+      "  static void markMainEntered() native 'MarkMainEntered';\n"
+      "}\n"
       "void function([foo='hi']) {\n"
       "}\n"
       "\n"
       "void main() {\n"
+      "  Native.markMainEntered();\n"
       "  while (true) {\n"  // Infinite loop.
       "    function();\n"
       "  }\n"
       "}\n";
 
 
   // Tell the other thread that shared_isolate is created.
   Dart_Handle lib;
   {
     sync->Enter();
     char* error = NULL;
     shared_isolate = Dart_CreateIsolate(NULL, NULL, &error);
     EXPECT(shared_isolate != NULL);
     Dart_EnterScope();
     Dart_Handle url = Dart_NewString(TestCase::url());
     Dart_Handle source = Dart_NewString(kScriptChars);
     lib = Dart_LoadScript(url, source, TestCase::library_handler);
     EXPECT_VALID(lib);
+    Dart_Handle result = Dart_SetNativeResolver(
+        lib, &IsolateInterruptTestNativeLookup);
+    DART_CHECK_VALID(result);
 
     sync->Notify();
     sync->Exit();
   }
 
   Dart_Handle result = Dart_InvokeStatic(lib,
                                          Dart_NewString(""),
                                          Dart_NewString("main"),
                                          0,
                                          NULL);
   EXPECT(Dart_IsError(result));
   EXPECT(Dart_ErrorHasException(result));
   EXPECT_SUBSTRING("Unhandled exception:\nfoo\n",
                    Dart_GetError(result));
 
-  // Tell the other thread that we are done.
-  {
-    MonitorLocker ml(sync);
-    shared_isolate = NULL;
-    ml.Notify();
-  }
-
   Dart_ExitScope();
   Dart_ShutdownIsolate();
+
+  // Tell the other thread that we are done (don't use MonitorLocker
+  // as there is no current isolate any more).
+  sync->Enter();
+  shared_isolate = NULL;
+  sync->Notify();
+  sync->Exit();
 }
 
 
 // This callback handles isolate interrupts for the IsolateInterrupt
 // test.  It ignores the first two interrupts and throws an exception
 // on the third interrupt.
 static int interrupt_count = 0;
 static bool IsolateInterruptTestCallback() {
-  interrupt_count++;
-  OS::Print(" =========== Interrupt callback called #%d\n", interrupt_count);
+  OS::Print(" ========== Interrupt callback called #%d\n", interrupt_count + 1);
+  {
+    MonitorLocker ml(sync);
+    interrupt_count++;
+    ml.Notify();
+  }
   if (interrupt_count >= 3) {
     Dart_EnterScope();
     Dart_Handle lib = Dart_LookupLibrary(Dart_NewString(TestCase::url()));
     EXPECT_VALID(lib);
     Dart_Handle exc = Dart_NewString("foo");
     EXPECT_VALID(exc);
     Dart_Handle result = Dart_ThrowException(exc);
     EXPECT_VALID(result);
     UNREACHABLE();  // Dart_ThrowException only returns if it gets an error.
     return false;
   }
   return true;
 }
 
 
 TEST_CASE(IsolateInterrupt) {
   Dart_IsolateInterruptCallback saved = Isolate::InterruptCallback();
   Isolate::SetInterruptCallback(IsolateInterruptTestCallback);
 
   sync = new Monitor();
   Thread* thread = new Thread(BusyLoop_start, 0);
   EXPECT(thread != NULL);
 
   {
     MonitorLocker ml(sync);
-    // Wait for the other isolate to start.
-    while (shared_isolate == NULL) {
+    // Wait for the other isolate to enter main.
+    while (!main_entered) {
       ml.Wait();
     }
   }
 
   // Send three interrupts to the other isolate.  The first two allow
   // execution to continue.  The third causes an exception in the
   // isolate.
-  Dart_InterruptIsolate(shared_isolate);
-  OS::Sleep(5);
-  Dart_InterruptIsolate(shared_isolate);
-  OS::Sleep(5);
-  Dart_InterruptIsolate(shared_isolate);
+  for (int i = 0; i < 3; i++) {

[Ivan Posva, 2011/12/21 08:31:16]

I would prefer if we spaced the interrupts out a bit.

For example:
OS::Sleep(i * 1);

While at it can you also get rid of the magic value 3 by using a constant?

+    Dart_InterruptIsolate(shared_isolate);
+    {
+      MonitorLocker ml(sync);
+      // Wait for interrupt_count to be increased.
+      while (interrupt_count == i) {
+        ml.Wait();
+      }
+      OS::Print(" ========== Interrupt processed #%d\n", interrupt_count);
+    }
+  }
 
   {
     MonitorLocker ml(sync);
     // Wait for our isolate to finish.
     while (shared_isolate != NULL) {
       ml.Wait();
     }
   }
 
   // We should have received 3 interrupts.
   EXPECT_EQ(3, interrupt_count);
 
   // Give the spawned thread enough time to properly exit.
-  OS::Sleep(20);
   Isolate::SetInterruptCallback(saved);
 }
 
 #endif  // TARGET_ARCH_IA32.
 
 }  // namespace dart