| Index: runtime/vm/message_handler.cc
|
| diff --git a/runtime/vm/message_handler.cc b/runtime/vm/message_handler.cc
|
| index 4d3ab69c852986cac5dc70a779e93905203d05e0..2a8d21f3944a5221427cd2f5ea846415069dfc85 100644
|
| --- a/runtime/vm/message_handler.cc
|
| +++ b/runtime/vm/message_handler.cc
|
| @@ -12,7 +12,6 @@
|
| #include "vm/port.h"
|
| #include "vm/thread_interrupter.h"
|
|
|
| -
|
| namespace dart {
|
|
|
| DECLARE_FLAG(bool, trace_service_pause_events);
|
| @@ -34,7 +33,6 @@ class MessageHandlerTask : public ThreadPool::Task {
|
| DISALLOW_COPY_AND_ASSIGN(MessageHandlerTask);
|
| };
|
|
|
| -
|
| // static
|
| const char* MessageHandler::MessageStatusString(MessageStatus status) {
|
| switch (status) {
|
| @@ -52,7 +50,6 @@ const char* MessageHandler::MessageStatusString(MessageStatus status) {
|
| }
|
| }
|
|
|
| -
|
| MessageHandler::MessageHandler()
|
| : queue_(new MessageQueue()),
|
| oob_queue_(new MessageQueue()),
|
| @@ -74,7 +71,6 @@ MessageHandler::MessageHandler()
|
| ASSERT(oob_queue_ != NULL);
|
| }
|
|
|
| -
|
| MessageHandler::~MessageHandler() {
|
| delete queue_;
|
| delete oob_queue_;
|
| @@ -84,24 +80,20 @@ MessageHandler::~MessageHandler() {
|
| task_ = NULL;
|
| }
|
|
|
| -
|
| const char* MessageHandler::name() const {
|
| return "<unnamed>";
|
| }
|
|
|
| -
|
| #if defined(DEBUG)
|
| void MessageHandler::CheckAccess() {
|
| // By default there is no checking.
|
| }
|
| #endif
|
|
|
| -
|
| void MessageHandler::MessageNotify(Message::Priority priority) {
|
| // By default, there is no custom message notification.
|
| }
|
|
|
| -
|
| void MessageHandler::Run(ThreadPool* pool,
|
| StartCallback start_callback,
|
| EndCallback end_callback,
|
| @@ -125,7 +117,6 @@ void MessageHandler::Run(ThreadPool* pool,
|
| ASSERT(task_running);
|
| }
|
|
|
| -
|
| void MessageHandler::PostMessage(Message* message, bool before_events) {
|
| Message::Priority saved_priority;
|
| bool task_running = true;
|
| @@ -167,7 +158,6 @@ void MessageHandler::PostMessage(Message* message, bool before_events) {
|
| MessageNotify(saved_priority);
|
| }
|
|
|
| -
|
| Message* MessageHandler::DequeueMessage(Message::Priority min_priority) {
|
| // TODO(turnidge): Add assert that monitor_ is held here.
|
| Message* message = oob_queue_->Dequeue();
|
| @@ -177,12 +167,10 @@ Message* MessageHandler::DequeueMessage(Message::Priority min_priority) {
|
| return message;
|
| }
|
|
|
| -
|
| void MessageHandler::ClearOOBQueue() {
|
| oob_queue_->Clear();
|
| }
|
|
|
| -
|
| MessageHandler::MessageStatus MessageHandler::HandleMessages(
|
| MonitorLocker* ml,
|
| bool allow_normal_messages,
|
| @@ -257,7 +245,6 @@ MessageHandler::MessageStatus MessageHandler::HandleMessages(
|
| return max_status;
|
| }
|
|
|
| -
|
| MessageHandler::MessageStatus MessageHandler::HandleNextMessage() {
|
| // We can only call HandleNextMessage when this handler is not
|
| // assigned to a thread pool.
|
| @@ -270,7 +257,6 @@ MessageHandler::MessageStatus MessageHandler::HandleNextMessage() {
|
| return HandleMessages(&ml, true, false);
|
| }
|
|
|
| -
|
| MessageHandler::MessageStatus MessageHandler::HandleAllMessages() {
|
| // We can only call HandleAllMessages when this handler is not
|
| // assigned to a thread pool.
|
| @@ -283,7 +269,6 @@ MessageHandler::MessageStatus MessageHandler::HandleAllMessages() {
|
| return HandleMessages(&ml, true, true);
|
| }
|
|
|
| -
|
| MessageHandler::MessageStatus MessageHandler::HandleOOBMessages() {
|
| if (!oob_message_handling_allowed_) {
|
| return kOK;
|
| @@ -296,7 +281,6 @@ MessageHandler::MessageStatus MessageHandler::HandleOOBMessages() {
|
| return HandleMessages(&ml, false, false);
|
| }
|
|
|
| -
|
| bool MessageHandler::ShouldPauseOnStart(MessageStatus status) const {
|
| Isolate* owning_isolate = isolate();
|
| if (owning_isolate == NULL) {
|
| @@ -309,7 +293,6 @@ bool MessageHandler::ShouldPauseOnStart(MessageStatus status) const {
|
| should_pause_on_start() && owning_isolate->is_runnable();
|
| }
|
|
|
| -
|
| bool MessageHandler::ShouldPauseOnExit(MessageStatus status) const {
|
| Isolate* owning_isolate = isolate();
|
| if (owning_isolate == NULL) {
|
| @@ -320,13 +303,11 @@ bool MessageHandler::ShouldPauseOnExit(MessageStatus status) const {
|
| should_pause_on_exit() && owning_isolate->is_runnable();
|
| }
|
|
|
| -
|
| bool MessageHandler::HasOOBMessages() {
|
| MonitorLocker ml(&monitor_);
|
| return !oob_queue_->IsEmpty();
|
| }
|
|
|
| -
|
| void MessageHandler::TaskCallback() {
|
| ASSERT(Isolate::Current() == NULL);
|
| MessageStatus status = kOK;
|
| @@ -445,7 +426,6 @@ void MessageHandler::TaskCallback() {
|
| }
|
| }
|
|
|
| -
|
| void MessageHandler::ClosePort(Dart_Port port) {
|
| MonitorLocker ml(&monitor_);
|
| if (FLAG_trace_isolates) {
|
| @@ -459,7 +439,6 @@ void MessageHandler::ClosePort(Dart_Port port) {
|
| }
|
| }
|
|
|
| -
|
| void MessageHandler::CloseAllPorts() {
|
| MonitorLocker ml(&monitor_);
|
| if (FLAG_trace_isolates) {
|
| @@ -472,7 +451,6 @@ void MessageHandler::CloseAllPorts() {
|
| oob_queue_->Clear();
|
| }
|
|
|
| -
|
| void MessageHandler::RequestDeletion() {
|
| ASSERT(OwnedByPortMap());
|
| {
|
| @@ -488,7 +466,6 @@ void MessageHandler::RequestDeletion() {
|
| delete this;
|
| }
|
|
|
| -
|
| void MessageHandler::increment_live_ports() {
|
| MonitorLocker ml(&monitor_);
|
| #if defined(DEBUG)
|
| @@ -497,7 +474,6 @@ void MessageHandler::increment_live_ports() {
|
| live_ports_++;
|
| }
|
|
|
| -
|
| void MessageHandler::decrement_live_ports() {
|
| MonitorLocker ml(&monitor_);
|
| #if defined(DEBUG)
|
| @@ -506,18 +482,15 @@ void MessageHandler::decrement_live_ports() {
|
| live_ports_--;
|
| }
|
|
|
| -
|
| void MessageHandler::PausedOnStart(bool paused) {
|
| MonitorLocker ml(&monitor_);
|
| PausedOnStartLocked(&ml, paused);
|
| }
|
|
|
| -
|
| void MessageHandler::DebugDump() {
|
| PortMap::DebugDumpForMessageHandler(this);
|
| }
|
|
|
| -
|
| void MessageHandler::PausedOnStartLocked(MonitorLocker* ml, bool paused) {
|
| if (paused) {
|
| ASSERT(!is_paused_on_start_);
|
| @@ -545,13 +518,11 @@ void MessageHandler::PausedOnStartLocked(MonitorLocker* ml, bool paused) {
|
| }
|
| }
|
|
|
| -
|
| void MessageHandler::PausedOnExit(bool paused) {
|
| MonitorLocker ml(&monitor_);
|
| PausedOnExitLocked(&ml, paused);
|
| }
|
|
|
| -
|
| void MessageHandler::PausedOnExitLocked(MonitorLocker* ml, bool paused) {
|
| if (paused) {
|
| ASSERT(!is_paused_on_exit_);
|
| @@ -579,14 +550,12 @@ void MessageHandler::PausedOnExitLocked(MonitorLocker* ml, bool paused) {
|
| }
|
| }
|
|
|
| -
|
| MessageHandler::AcquiredQueues::AcquiredQueues(MessageHandler* handler)
|
| : handler_(handler), ml_(&handler->monitor_) {
|
| ASSERT(handler != NULL);
|
| handler_->oob_message_handling_allowed_ = false;
|
| }
|
|
|
| -
|
| MessageHandler::AcquiredQueues::~AcquiredQueues() {
|
| ASSERT(handler_ != NULL);
|
| handler_->oob_message_handling_allowed_ = true;
|
|
|