- Add assertions in MutexLocker/MonitorLocker to ensure that the code enclosed

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/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 193 matching lines @@
   void PausedOnStartLocked(bool paused);
   void PausedOnExitLocked(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(bool allow_normal_messages,
+  MessageStatus HandleMessages(MonitorLocker* ml,
+                               bool allow_normal_messages,
                                bool allow_multiple_normal_messages);
 
   Monitor monitor_;  // Protects all fields in MessageHandler.
   MessageQueue* queue_;
   MessageQueue* oob_queue_;
   // This flag is not thread safe and can only reliably be accessed on a single
   // thread.
   bool oob_message_handling_allowed_;
   intptr_t live_ports_;  // The number of open ports, including control ports.
   intptr_t paused_;  // The number of pause messages received.
   bool should_pause_on_start_;
   bool should_pause_on_exit_;
   bool is_paused_on_start_;
   bool is_paused_on_exit_;
   int64_t paused_timestamp_;
   ThreadPool* pool_;
   ThreadPool::Task* task_;
   StartCallback start_callback_;
   EndCallback end_callback_;
   CallbackData callback_data_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageHandler);
 };
 
 }  // namespace dart
 
 #endif  // VM_MESSAGE_HANDLER_H_