Profiler Take 2

runtime/vm/thread_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 "platform/assert.h"
 #include "vm/isolate.h"
 #include "vm/unit_test.h"
-#include "vm/signal_handler.h"
+#include "vm/profiler.h"
 #include "vm/thread.h"
 
 namespace dart {
 
 UNIT_TEST_CASE(Mutex) {
   // This unit test case needs a running isolate.
   Isolate* isolate = Isolate::Init(NULL);
 
   Mutex* mutex = new Mutex();
   mutex->Lock();
   EXPECT_EQ(false, mutex->TryLock());
   mutex->Unlock();
   EXPECT_EQ(true, mutex->TryLock());
   mutex->Unlock();
   {
     MutexLocker ml(mutex);
     EXPECT_EQ(false, mutex->TryLock());
   }
   // The isolate shutdown and the destruction of the mutex are out-of-order on
   // purpose.
   isolate->Shutdown();
   delete isolate;
   delete mutex;
 }
 
 
 UNIT_TEST_CASE(Monitor) {
   // This unit test case needs a running isolate.
   Isolate* isolate = Isolate::Init(NULL);
-
+  // Profiler interrupts interfere with this test.
+  Profiler::EndExecution(isolate);
   Monitor* monitor = new Monitor();
   monitor->Enter();
   monitor->Exit();
 
   const int kNumAttempts = 5;
   int attempts = 0;
   while (attempts < kNumAttempts) {
-    // This test verifies that a monitor returns after the specified timeout. If
-    // a signal is delivered to this thread, the monitor may return early.
-    // Block signal delivery in this scope.
-    ScopedSignalBlocker ssb;
     MonitorLocker ml(monitor);
     int64_t start = OS::GetCurrentTimeMillis();
     int64_t wait_time = 2017;
     Monitor::WaitResult wait_result = ml.Wait(wait_time);
     int64_t stop = OS::GetCurrentTimeMillis();
 
     // We expect to be timing out here.
     EXPECT_EQ(Monitor::kTimedOut, wait_result);
 
     // Check whether this attempt falls within the exptected time limits.
@@ skipping 12 matching lines @@
   EXPECT_LT(attempts, kNumAttempts);
 
   // The isolate shutdown and the destruction of the mutex are out-of-order on
   // purpose.
   isolate->Shutdown();
   delete isolate;
   delete monitor;
 }
 
 }  // namespace dart