Update the isolate interrupt test

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 3028 matching lines @@
   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.
+const int kInterruptCount = 10;
 static int interrupt_count = 0;
 static bool IsolateInterruptTestCallback() {
   OS::Print(" ========== Interrupt callback called #%d\n", interrupt_count + 1);
   {
     MonitorLocker ml(sync);
     interrupt_count++;
     ml.Notify();
   }
-  if (interrupt_count >= 3) {
+  if (interrupt_count == kInterruptCount) {
     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;
   }
+  ASSERT(interrupt_count < kInterruptCount);
   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 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.
-  for (int i = 0; i < 3; i++) {
+  // Send a number of interrupts to the other isolate. All but the
+  // last allow execution to continue. The last causes an exception in
+  // the isolate.
+  for (int i = 0; i < kInterruptCount; i++) {
     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);
     }
+    // Space out the interrupts a bit.
+    OS::Sleep(i + 1);

[Ivan Posva, 2011/12/21 17:27:14]

If you move OS::Sleep(i) before the call to Dart_InterruptIsolate you will not
waste" time waiting here after delivering the last interrupt.

[Søren Gjesse, 2011/12/22 08:21:26]

Done.

   }
 
   {
     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);
+  // We should have received the expected number of interrupts.
+  EXPECT_EQ(kInterruptCount, interrupt_count);
 
   // Give the spawned thread enough time to properly exit.
   Isolate::SetInterruptCallback(saved);
 }
 
 #endif  // TARGET_ARCH_IA32.
 
 }  // namespace dart