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

runtime/vm/message_handler.h

 // 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.
 
 #ifndef VM_MESSAGE_HANDLER_H_
 #define VM_MESSAGE_HANDLER_H_
 
 #include "vm/isolate.h"
+#include "vm/lockers.h"
 #include "vm/message.h"
 #include "vm/os_thread.h"
 #include "vm/thread_pool.h"
 
 namespace dart {
 
-// Forward declarations.
-class MonitorLocker;
-
 // A MessageHandler is an entity capable of accepting messages.
 class MessageHandler {
  protected:
   MessageHandler();
 
  public:
   enum MessageStatus {
     kOK,        // We successfully handled a message.
     kError,     // We encountered an error handling a message.
     kRestart,   // The VM is restarting.
@@ skipping 87 matching lines @@
   }
 
   // Timestamp of the paused on start or paused on exit.
   int64_t paused_timestamp() const {
     return paused_timestamp_;
   }
 
   void PausedOnStart(bool paused);
   void PausedOnExit(bool paused);
 
+  // Gives temporary ownership of |queue| and |oob_queue|. Using this object
+  // has the side effect that no OOB messages will be handled if a stack
+  // overflow interrupt is delivered.
   class AcquiredQueues : public ValueObject {
    public:
-    AcquiredQueues();
+    explicit AcquiredQueues(MessageHandler* handler);
 
     ~AcquiredQueues();
 
     MessageQueue* queue() {
       if (handler_ == NULL) {
         return NULL;
       }
       return handler_->queue_;
     }
 
     MessageQueue* oob_queue() {
       if (handler_ == NULL) {
         return NULL;
       }
       return handler_->oob_queue_;
     }
 
    private:
-    void Reset(MessageHandler* handler);
-
     MessageHandler* handler_;
+    SafepointMonitorLocker ml_;
 
     friend class MessageHandler;
   };
 
-  // Gives temporary ownership of |queue| and |oob_queue|. Calling this
-  // has the side effect that no OOB messages will be handled if a stack
-  // overflow interrupt is delivered.
-  void AcquireQueues(AcquiredQueues* acquired_queue);
-
 #if defined(DEBUG)
   // Check that it is safe to access this message handler.
   //
   // For example, if this MessageHandler is an isolate, then it is
   // only safe to access it when the MessageHandler is the current
   // isolate.
   virtual void CheckAccess();
 #endif
 
  protected:
@@ skipping 43 matching lines @@
  private:
   friend class PortMap;
   friend class MessageHandlerTestPeer;
   friend class MessageHandlerTask;
 
   // Called by MessageHandlerTask to process our task queue.
   void TaskCallback();
 
   // NOTE: These two functions release and reacquire the monitor, you may
   // need to call HandleMessages to ensure all pending messages are handled.
-  void PausedOnStartLocked(bool paused);
-  void PausedOnExitLocked(bool paused);
+  void PausedOnStartLocked(MonitorLocker* ml, bool paused);
+  void PausedOnExitLocked(MonitorLocker* ml, bool paused);
 
   // Dequeue the next message.  Prefer messages from the oob_queue_ to
   // messages from the queue_.
   Message* DequeueMessage(Message::Priority min_priority);
 
   void ClearOOBQueue();
 
   // Handles any pending messages.
   MessageStatus HandleMessages(MonitorLocker* ml,
                                bool allow_normal_messages,
@@ skipping 17 matching lines @@
   StartCallback start_callback_;
   EndCallback end_callback_;
   CallbackData callback_data_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageHandler);
 };
 
 }  // namespace dart
 
 #endif  // VM_MESSAGE_HANDLER_H_