Display isolate message queue in Observatory debugger

runtime/vm/message_handler.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 "vm/message_handler.h"
 
 #include "vm/dart.h"
 #include "vm/lockers.h"
 #include "vm/port.h"
 
@@ skipping 16 matching lines @@
  private:
   MessageHandler* handler_;
 
   DISALLOW_COPY_AND_ASSIGN(MessageHandlerTask);
 };
 
 
 MessageHandler::MessageHandler()
     : queue_(new MessageQueue()),
       oob_queue_(new MessageQueue()),
+      oob_message_handling_allowed_(true),
       live_ports_(0),
       paused_(0),
       pause_on_start_(false),
       pause_on_exit_(false),
       paused_on_start_(false),
       paused_on_exit_(false),
       pool_(NULL),
       task_(NULL),
       start_callback_(NULL),
       end_callback_(NULL),
@@ skipping 154 matching lines @@
   MonitorLocker ml(&monitor_);
   ASSERT(pool_ == NULL);
 #if defined(DEBUG)
   CheckAccess();
 #endif
   return HandleMessages(true, false);
 }
 
 
 bool MessageHandler::HandleOOBMessages() {
+  if (!oob_message_handling_allowed_) {
+    return true;
+  }
   MonitorLocker ml(&monitor_);
 #if defined(DEBUG)
   CheckAccess();
 #endif
   return HandleMessages(false, false);
 }
 
 
 bool MessageHandler::HasOOBMessages() {
   MonitorLocker ml(&monitor_);
@@ skipping 105 matching lines @@
 
 
 void MessageHandler::decrement_live_ports() {
   MonitorLocker ml(&monitor_);
 #if defined(DEBUG)
   CheckAccess();
 #endif
   live_ports_--;
 }
 
+
+MessageHandler::AcquiredQueues::AcquiredQueues()
+    : handler_(NULL) {
+}
+
+
+MessageHandler::AcquiredQueues::~AcquiredQueues() {
+  if (handler_ != NULL) {
+    // Release ownership.
+    handler_->oob_message_handling_allowed_ = true;
+    handler_->monitor_.Exit();
+  }

[turnidge, 2015/05/04 17:47:13]

Move the bulk of this into Reset.

[Cutch, 2015/05/04 19:56:51]

Done.

+  Reset(NULL);
+}
+
+
+void MessageHandler::AcquiredQueues::Reset(MessageHandler* handler) {
+  handler_ = handler;
+  if (handler_ == NULL) {
+    return;
+  }
+  ASSERT(handler_ != NULL);
+  // Take ownership.
+  handler_->monitor_.Enter();
+  handler_->oob_message_handling_allowed_ = false;

[turnidge, 2015/05/04 17:47:13]

Does this need to be done under the monitor here?

[Cutch, 2015/05/04 19:56:51]

Done.

+}
+
+
+void MessageHandler::AcquireQueues(AcquiredQueues* acquired_queues) {
+  ASSERT(acquired_queues != NULL);
+  // No double dipping.
+  ASSERT(acquired_queues->handler_ == NULL);
+  acquired_queues->Reset(this);
+}
+
 }  // namespace dart