Use the ThreadPool for all isolates and native ports. Previously,

runtime/vm/message.cc

Index: runtime/vm/message.cc
===================================================================
--- runtime/vm/message.cc	(revision 6698)
+++ runtime/vm/message.cc	(working copy)
@@ -8,193 +8,86 @@
 
 DECLARE_FLAG(bool, trace_isolates);
 
-
-MessageHandler::MessageHandler()
-    : live_ports_(0),
-      queue_(new MessageQueue()) {
-  ASSERT(queue_ != NULL);
-}
-
-
-MessageHandler::~MessageHandler() {
-  delete queue_;
-}
-
-
-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::PostMessage(Message* message) {
-  if (FLAG_trace_isolates) {
-    const char* source_name = "<native code>";
-    Isolate* source_isolate = Isolate::Current();
-    if (source_isolate) {
-      source_name = source_isolate->name();
-    }
-    OS::Print("[>] Posting message:\n"
-              "\tsource:     %s\n"
-              "\treply_port: %lld\n"
-              "\tdest:       %s\n"
-              "\tdest_port:  %lld\n",
-              source_name, message->reply_port(), name(), message->dest_port());
-  }
-
-  Message::Priority priority = message->priority();
-  queue()->Enqueue(message);
-  message = NULL;  // Do not access message.  May have been deleted.
-
-  // Invoke any custom message notification.
-  MessageNotify(priority);
-}
-
-
-void MessageHandler::ClosePort(Dart_Port port) {
-  queue()->Flush(port);
-}
-
-
-void MessageHandler::CloseAllPorts() {
-  queue()->FlushAll();
-}
-
-
 MessageQueue::MessageQueue() {
-  for (int p = Message::kFirstPriority; p < Message::kNumPriorities; p++) {
-    head_[p] = NULL;
-    tail_[p] = NULL;
-  }
+  head_ = NULL;
+  tail_ = NULL;
 }
 
 
 MessageQueue::~MessageQueue() {
   // Ensure that all pending messages have been released.
 #if defined(DEBUG)
-  for (int p = Message::kFirstPriority; p < Message::kNumPriorities; p++) {
-    ASSERT(head_[p] == NULL);
-  }
+  ASSERT(head_ == NULL);
 #endif
 }
 
 
 void MessageQueue::Enqueue(Message* msg) {
-  MonitorLocker ml(&monitor_);
-  Message::Priority p = msg->priority();
   // Make sure messages are not reused.
   ASSERT(msg->next_ == NULL);
-  if (head_[p] == NULL) {
+  if (head_ == NULL) {
     // Only element in the queue.
-    head_[p] = msg;
-    tail_[p] = msg;
-
-    // We only need to notify if the queue was empty.
-    monitor_.Notify();
+    ASSERT(tail_ == NULL);
+    head_ = msg;
+    tail_ = msg;
   } else {
-    ASSERT(tail_[p] != NULL);
+    ASSERT(tail_ != NULL);
     // Append at the tail.
-    tail_[p]->next_ = msg;
-    tail_[p] = msg;
+    tail_->next_ = msg;
+    tail_ = msg;
   }
 }
 
 
-Message* MessageQueue::DequeueNoWait() {
-  MonitorLocker ml(&monitor_);
-  return DequeueNoWaitHoldsLock(Message::kFirstPriority);
-}
-
-
-Message* MessageQueue::DequeueNoWaitWithPriority(
-    Message::Priority min_priority) {
-  MonitorLocker ml(&monitor_);
-  return DequeueNoWaitHoldsLock(min_priority);
-}
-
-
-Message* MessageQueue::DequeueNoWaitHoldsLock(Message::Priority min_priority) {
-  // Look for the highest priority available message.
-  for (int p = Message::kNumPriorities-1; p >= min_priority; p--) {
-    Message* result = head_[p];
-    if (result != NULL) {
-      head_[p] = result->next_;
-      // The following update to tail_ is not strictly needed.
-      if (head_[p] == NULL) {
-        tail_[p] = NULL;
-      }
+Message* MessageQueue::Dequeue() {
+  Message* result = head_;
+  if (result != NULL) {
+    head_ = result->next_;
+    // The following update to tail_ is not strictly needed.
+    if (head_ == NULL) {
+      tail_ = NULL;
+    }
 #if defined(DEBUG)
-      result->next_ = result;  // Make sure to trigger ASSERT in Enqueue.
+    result->next_ = result;  // Make sure to trigger ASSERT in Enqueue.
 #endif  // DEBUG
-      return result;
-    }
+    return result;
   }
   return NULL;
 }
 
 
-Message* MessageQueue::Dequeue(int64_t millis) {
-  ASSERT(millis >= 0);
-  MonitorLocker ml(&monitor_);
-  Message* result = DequeueNoWaitHoldsLock(Message::kFirstPriority);
-  if (result == NULL) {
-    // No message available at any priority.
-    monitor_.Wait(millis);
-    result = DequeueNoWaitHoldsLock(Message::kFirstPriority);
-  }
-  return result;
-}
-
-
 void MessageQueue::Flush(Dart_Port port) {
-  MonitorLocker ml(&monitor_);
-  for (int p = Message::kFirstPriority; p < Message::kNumPriorities; p++) {
-    Message* cur = head_[p];
-    Message* prev = NULL;
-    while (cur != NULL) {
-      Message* next = cur->next_;
-      // If the message matches, then remove it from the queue and delete it.
-      if (cur->dest_port() == port) {
-        if (prev != NULL) {
-          prev->next_ = next;
-        } else {
-          head_[p] = next;
-        }
-        delete cur;
+  Message* cur = head_;
+  Message* prev = NULL;
+  while (cur != NULL) {
+    Message* next = cur->next_;
+    // If the message matches, then remove it from the queue and delete it.
+    if (cur->dest_port() == port) {
+      if (prev != NULL) {
+        prev->next_ = next;
       } else {
-        // Move prev forward.
-        prev = cur;
+        head_ = next;
       }
-      // Advance to the next message in the queue.
-      cur = next;
+      delete cur;
+    } else {
+      // Move prev forward.
+      prev = cur;
     }
-    tail_[p] = prev;
+    // Advance to the next message in the queue.
+    cur = next;
   }
+  tail_ = prev;
 }
 
 
 void MessageQueue::FlushAll() {
-  MonitorLocker ml(&monitor_);
-  for (int p = Message::kFirstPriority; p < Message::kNumPriorities; p++) {
-    Message* cur = head_[p];
-    head_[p] = NULL;
-    tail_[p] = NULL;
-    while (cur != NULL) {
-      Message* next = cur->next_;
-      delete cur;
-      cur = next;
-    }
+  Message* cur = head_;
+  head_ = NULL;
+  tail_ = NULL;
+  while (cur != NULL) {
+    Message* next = cur->next_;
+    delete cur;
+    cur = next;
   }
 }