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

runtime/vm/isolate.cc

 // Copyright (c) 2012, 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/isolate.h"
 
 #include "include/dart_api.h"
 #include "platform/assert.h"
 #include "vm/compiler_stats.h"
 #include "vm/dart_api_state.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/debuginfo.h"
 #include "vm/heap.h"
-#include "vm/message.h"
+#include "vm/message_handler.h"
 #include "vm/object_store.h"
 #include "vm/parser.h"
 #include "vm/port.h"
 #include "vm/random.h"
 #include "vm/stack_frame.h"
 #include "vm/stub_code.h"
 #include "vm/thread.h"
 #include "vm/timer.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 DEFINE_FLAG(bool, report_usage_count, false,
             "Track function usage and report.");
 DEFINE_FLAG(bool, trace_isolates, false,
             "Trace isolate creation and shut down.");
 DECLARE_FLAG(bool, generate_gdb_symbols);
 
 
 class IsolateMessageHandler : public MessageHandler {
  public:
   explicit IsolateMessageHandler(Isolate* isolate);
   ~IsolateMessageHandler();
 
   const char* name() const;
   void MessageNotify(Message::Priority priority);
+  bool HandleMessage(Message* message);
 
 #if defined(DEBUG)
   // Check that it is safe to access this handler.
   void CheckAccess();
 #endif
  private:
   Isolate* isolate_;
 };
 
 
@@ skipping 16 matching lines @@
     isolate_->ScheduleInterrupts(Isolate::kMessageInterrupt);
   }
   Dart_MessageNotifyCallback callback = isolate_->message_notify_callback();
   if (callback) {
     // Allow the embedder to handle message notification.
     (*callback)(Api::CastIsolate(isolate_));
   }
 }
 
 
+static RawInstance* DeserializeMessage(void* data) {
+  // Create a snapshot object using the buffer.
+  const Snapshot* snapshot = Snapshot::SetupFromBuffer(data);
+  ASSERT(snapshot->IsMessageSnapshot());
+
+  // Read object back from the snapshot.
+  SnapshotReader reader(snapshot, Isolate::Current());
+  Instance& instance = Instance::Handle();
+  instance ^= reader.ReadObject();
+  return instance.raw();
+}
+
+
+bool IsolateMessageHandler::HandleMessage(Message* message) {
+  StartIsolateScope start_scope(isolate_);
+  Zone zone(isolate_);
+  HandleScope handle_scope(isolate_);
+
+  const Instance& msg =
+      Instance::Handle(DeserializeMessage(message->data()));
+  if (message->IsOOB()) {
+    // For now the only OOB messages are Mirrors messages.
+    const Object& result = Object::Handle(
+        DartLibraryCalls::HandleMirrorsMessage(
+            message->dest_port(), message->reply_port(), msg));
+    delete message;
+    if (result.IsError()) {
+      // TODO(turnidge): Propagating the error is probably wrong here.
+      Error& error = Error::Handle();
+      error ^= result.raw();
+      isolate_->object_store()->set_sticky_error(error);
+      return false;
+    }
+    ASSERT(result.IsNull());
+  } else {
+    const Object& result = Object::Handle(
+        DartLibraryCalls::HandleMessage(
+            message->dest_port(), message->reply_port(), msg));
+    delete message;
+    if (result.IsError()) {
+      Error& error = Error::Handle();
+      error ^= result.raw();
+      isolate_->object_store()->set_sticky_error(error);
+      return false;
+    }
+    ASSERT(result.IsNull());
+  }
+  return true;
+}
+
+
 #if defined(DEBUG)
 void IsolateMessageHandler::CheckAccess() {
   ASSERT(isolate_ == Isolate::Current());
 }
 #endif
 
 
 #if defined(DEBUG)
 // static
 void BaseIsolate::AssertCurrent(BaseIsolate* isolate) {
@@ skipping 15 matching lines @@
       init_callback_data_(NULL),
       library_tag_handler_(NULL),
       api_state_(NULL),
       stub_code_(NULL),
       debugger_(NULL),
       long_jump_base_(NULL),
       timer_list_(),
       ast_node_id_(AstNode::kNoId),
       mutex_(new Mutex()),
       stack_limit_(0),
-      saved_stack_limit_(0) {
+      saved_stack_limit_(0),
+      message_handler_(NULL),
+      spawn_data_(NULL) {
 }
 
 
 Isolate::~Isolate() {
   delete [] name_;
   delete heap_;
   delete object_store_;
   delete api_state_;
   delete stub_code_;
   delete debugger_;
@@ skipping 236 matching lines @@
 void Isolate::SetInterruptCallback(Dart_IsolateInterruptCallback cb) {
   interrupt_callback_ = cb;
 }
 
 
 Dart_IsolateInterruptCallback Isolate::InterruptCallback() {
   return interrupt_callback_;
 }
 
 
-static RawInstance* DeserializeMessage(void* data) {
-  // Create a snapshot object using the buffer.
-  const Snapshot* snapshot = Snapshot::SetupFromBuffer(data);
-  ASSERT(snapshot->IsMessageSnapshot());
-
-  // Read object back from the snapshot.
-  SnapshotReader reader(snapshot, Isolate::Current());
-  Instance& instance = Instance::Handle();
-  instance ^= reader.ReadObject();
-  return instance.raw();
-}
-
-
-
-RawError* Isolate::StandardRunLoop() {
-  ASSERT(message_notify_callback() == NULL);
-  ASSERT(message_handler() != NULL);
-
-  while (message_handler()->HasLivePorts()) {
-    ASSERT(this == Isolate::Current());
-    Zone zone(this);
-    HandleScope handle_scope(this);
-
-    // TODO(turnidge): This code is duplicated elsewhere.  Consolidate.
-    Message* message = message_handler()->queue()->Dequeue(0);
-    if (message != NULL) {
-      const Instance& msg =
-          Instance::Handle(DeserializeMessage(message->data()));
-      if (message->priority() >= Message::kOOBPriority) {
-        // For now the only OOB messages are Mirrors messages.
-        const Object& result = Object::Handle(
-            DartLibraryCalls::HandleMirrorsMessage(
-                message->dest_port(), message->reply_port(), msg));
-        delete message;
-        if (result.IsError()) {
-          // TODO(turnidge): Propagating the error is probably wrong here.
-          Error& error = Error::Handle();
-          error ^= result.raw();
-          return error.raw();
-        }
-        ASSERT(result.IsNull());
-      } else {
-        const Object& result = Object::Handle(
-            DartLibraryCalls::HandleMessage(
-                message->dest_port(), message->reply_port(), msg));
-        delete message;
-        if (result.IsError()) {
-          Error& error = Error::Handle();
-          error ^= result.raw();
-          return error.raw();
-        }
-        ASSERT(result.IsNull());
-      }
-    }
-  }
-
-  // Indicates success.
-  return Error::null();
-}
-
-
 void Isolate::VisitObjectPointers(ObjectPointerVisitor* visitor,
                                   bool visit_prologue_weak_handles,
                                   bool validate_frames) {
   ASSERT(visitor != NULL);
 
   // Visit objects in the object store.
   object_store()->VisitObjectPointers(visitor);
 
   // Visit objects in per isolate stubs.
   StubCode::VisitObjectPointers(visitor);
@@ skipping 23 matching lines @@
 
 
 void Isolate::VisitWeakPersistentHandles(HandleVisitor* visitor,
                                          bool visit_prologue_weak_handles) {
   if (api_state() != NULL) {
     api_state()->VisitWeakHandles(visitor, visit_prologue_weak_handles);
   }
 }
 
 }  // namespace dart