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 2877 matching lines @@
   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.

[Ivan Posva, 2011/12/19 16:27:50]

This block should move after the isolate has been shutdown. Then I think we can
avoid the OS:Sleep(20) in the driver.

[Søren Gjesse, 2011/12/20 09:21:26]

Done.

   {
     MonitorLocker ml(sync);
     shared_isolate = NULL;
     ml.Notify();
   }
 
   Dart_ExitScope();
   Dart_ShutdownIsolate();
 }
 
 
 // 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++;
+  {
+    MonitorLocker ml(sync);
+    interrupt_count++;
+    ml.Notify();
+  }
   OS::Print(" =========== Interrupt callback called #%d\n", interrupt_count);
   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.
@@ skipping 15 matching lines @@
     MonitorLocker ml(sync);
     // Wait for the other isolate to start.
     while (shared_isolate == NULL) {
       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++) {
+    Dart_InterruptIsolate(shared_isolate);
+    OS::Sleep(5);
+    {
+      MonitorLocker ml(sync);
+      // Wait for interrupt_count to be increased.
+      while (interrupt_count == i) {
+        ml.Wait();
+      }
+    }
+  }
 
   {
     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