Make the lock/unlock and Enter/Exit methods in Mutex and Monitor private so taht we always use the …

runtime/vm/thread_interrupter.cc

 // Copyright (c) 2013, 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 "vm/thread_interrupter.h"
 
 #include "vm/flags.h"
 #include "vm/lockers.h"
 #include "vm/os.h"
 #include "vm/simulator.h"
@@ skipping 80 matching lines @@
 
 void ThreadInterrupter::Shutdown() {
   {
     MonitorLocker shutdown_ml(monitor_);
     if (shutdown_) {
       // Already shutdown.
       return;
     }
     shutdown_ = true;
     // Notify.
-    monitor_->Notify();
+    shutdown_ml.Notify();
     ASSERT(initialized_);
     if (FLAG_trace_thread_interrupter) {
       OS::Print("ThreadInterrupter shutting down.\n");
     }
   }
 
   // Join the thread.
   ASSERT(interrupter_thread_id_ != OSThread::kInvalidThreadJoinId);
   OSThread::Join(interrupter_thread_id_);
   interrupter_thread_id_ = OSThread::kInvalidThreadJoinId;
@@ skipping 64 matching lines @@
         // Woken up from deep sleep.
         ASSERT(interrupted_thread_count == 0);
         // Return to regular interrupts.
         current_wait_time_ = interrupt_period_;
       }
 
       // Reset count before interrupting any threads.
       interrupted_thread_count = 0;
 
       // Temporarily drop the monitor while we interrupt threads.
-      monitor_->Exit();
+      wait_ml.Exit();
 
       {
         OSThreadIterator it;
         while (it.HasNext()) {
           OSThread* thread = it.Next();
           if (thread->ThreadInterruptsEnabled()) {
             interrupted_thread_count++;
             InterruptThread(thread);
           }
         }
       }
 
       // Take the monitor lock again.
-      monitor_->Enter();
+      wait_ml.Enter();
 
       // Now that we have the lock, check if we were signaled to wake up while
       // interrupting threads.
       if (!woken_up_ && (interrupted_thread_count == 0)) {
         // No threads were interrupted and we were not signaled to interrupt
         // new threads. In order to reduce unnecessary CPU load, we will wait
         // until we are notified before attempting to interrupt again.
         current_wait_time_ = Monitor::kNoTimeout;
         continue;
       }
@@ skipping 11 matching lines @@
     // Signal to main thread we are exiting.
     MonitorLocker shutdown_ml(monitor_);
     thread_running_ = false;
     shutdown_ml.Notify();
   }
 }
 
 #endif  // !PRODUCT
 
 }  // namespace dart