Add support for native ports in the vm.

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/bigint_store.h"
 #include "vm/code_index_table.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_queue.h"
+#include "vm/message.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_invocation_count, false,
             "Count function invocations 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);
+
+#if defined(DEBUG)
+  // Check that it is safe to access this handler.
+  void CheckAccess();
+#endif
+ private:
+  Isolate* isolate_;
+};
+
+
+IsolateMessageHandler::IsolateMessageHandler(Isolate* isolate)
+    : isolate_(isolate) {
+}
+
+
+IsolateMessageHandler::~IsolateMessageHandler() {
+}
+
+const char* IsolateMessageHandler::name() const {
+  return isolate_->name();
+}
+
+
+void IsolateMessageHandler::MessageNotify(Message::Priority priority) {
+  ASSERT(priority < Message::kOOBPriority);

[Søren Gjesse, 2012/01/27 13:33:14]

With this ASSERT the condition of the if statement is always false.

[turnidge, 2012/01/31 20:04:31]

Yes.  OOB messages are only partway done.  I've added a TODO to make this less
confusing.

On 2012/01/27 13:33:14, Søren Gjesse wrote:

+  if (priority >= Message::kOOBPriority) {
+    // Handle out of band messages even if the isolate is busy.
+    isolate_->ScheduleInterrupts(Isolate::kMessageInterrupt);
+  }
+  Dart_MessageNotifyCallback callback = isolate_->message_notify_callback();
+  if (callback) {
+    // Allow the embedder to handle message notification.
+    (*callback)(Api::CastIsolate(isolate_));
+  }
+}
+
+
+#if defined(DEBUG)
+void IsolateMessageHandler::CheckAccess() {
+  ASSERT(isolate_ == Isolate::Current());
+}
+#endif
+
+
 Isolate::Isolate()
     : store_buffer_(),
-      message_queue_(NULL),
       message_notify_callback_(NULL),
       name_(NULL),
-      num_ports_(0),
-      live_ports_(0),
       main_port_(0),
       heap_(NULL),
       object_store_(NULL),
       top_resource_(NULL),
       top_context_(Context::null()),
       current_zone_(NULL),
 #if defined(DEBUG)
       no_gc_scope_depth_(0),
       no_handle_scope_depth_(0),
       top_handle_scope_(NULL),
@@ skipping 11 matching lines @@
       timer_list_(),
       ast_node_id_(AstNode::kNoId),
       mutex_(new Mutex()),
       stack_limit_(0),
       saved_stack_limit_(0) {
 }
 
 
 Isolate::~Isolate() {
   delete [] name_;
-  delete message_queue_;
   delete heap_;
   delete object_store_;
   // Do not delete stack resources: top_resource_ and current_zone_.
   delete bigint_store_;
   delete api_state_;
   delete stub_code_;
   delete code_index_table_;
   delete debugger_;
   delete mutex_;
   mutex_ = NULL;  // Fail fast if interrupts are scheduled on a dead isolate.
-}
-
-
-void Isolate::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();
-  message_queue()->Enqueue(message);
-  message = NULL;  // Do not access message.  May have been deleted.
-
-  ASSERT(priority < Message::kOOBPriority);
-  if (priority >= Message::kOOBPriority) {
-    // Handle out of band messages even if the isolate is busy.
-    ScheduleInterrupts(Isolate::kMessageInterrupt);
-  }
-  Dart_MessageNotifyCallback callback = message_notify_callback();
-  if (callback) {
-    // Allow the embedder to handle message notification.
-    (*callback)(Api::CastIsolate(this));
-  }
-}
-
-
-void Isolate::ClosePort(Dart_Port port) {
-  message_queue()->Flush(port);
-}
-
-
-void Isolate::CloseAllPorts() {
-  message_queue()->FlushAll();
+  delete message_handler_;

[siva, 2012/01/28 00:21:05]

similar to mutex_ = NULL set message_handler_ = NULL ?

[turnidge, 2012/01/31 20:04:31]

Done.  Maybe we should set all of these to NULL...

 }
 
 
 Isolate* Isolate::Init(const char* name_prefix) {
   Isolate* result = new Isolate();
   ASSERT(result != NULL);
 
   // TODO(5411455): For now just set the recently created isolate as
   // the current isolate.
   SetCurrent(result);
 
-  // Set up the isolate message queue.
-  MessageQueue* queue = new MessageQueue();
-  ASSERT(queue != NULL);
-  result->set_message_queue(queue);
+  // Setup the isolate message handler.
+  MessageHandler* handler = new IsolateMessageHandler(result);
+  ASSERT(handler != NULL);
+  result->set_message_handler(handler);
 
   // Setup the Dart API state.
   ApiState* state = new ApiState();
   ASSERT(state != NULL);
   result->set_api_state(state);
 
   // Initialize stack top and limit in case we are running the isolate in the
   // main thread.
   // TODO(5411455): Need to figure out how to set the stack limit for the
   // main thread.
   result->SetStackLimitFromCurrentTOS(reinterpret_cast<uword>(&result));
-  result->set_main_port(PortMap::CreatePort());
+  result->set_main_port(PortMap::CreatePort(result->message_handler()));
   result->BuildName(name_prefix);
 
   result->debugger_ = new Debugger();
   result->debugger_->Initialize(result);
   if (FLAG_trace_isolates) {
-    if (strcmp(name_prefix, "vm-isolate") != 0) {
+    if (name_prefix == NULL || strcmp(name_prefix, "vm-isolate") != 0) {
       OS::Print("[+] Starting isolate:\n"
                 "\tisolate:    %s\n", result->name());
     }
   }
   return result;
 }
 
 
 void Isolate::BuildName(const char* name_prefix) {
   ASSERT(name_ == NULL);
@@ skipping 110 matching lines @@
   // Clean up debugger resources. Shutting down the debugger
   // requires a handle zone. We must set up a temporary zone because
   // Isolate::Shutdown is called without a zone.
   {
     Zone zone(this);
     HandleScope handle_scope(this);
     debugger_->Shutdown();
   }
 
   // Close all the ports owned by this isolate.
-  PortMap::ClosePorts();
+  PortMap::ClosePorts(message_handler());
 
-  delete message_queue();
-  set_message_queue(NULL);
+  // Fail fast if anybody tries to post any more messsages to this isolate.
+  delete message_handler();
+  set_message_handler(NULL);
 
   // Dump all accumalated timer data for the isolate.
   timer_list_.ReportTimers();
   if (FLAG_report_invocation_count) {
     PrintInvokedFunctions();
   }
   CompilerStats::Print();
   if (FLAG_generate_gdb_symbols) {
     DebugInfo::UnregisterAllSections();
   }
@@ skipping 40 matching lines @@
   SnapshotReader reader(snapshot, Isolate::Current());
   Instance& instance = Instance::Handle();
   instance ^= reader.ReadObject();
   return instance.raw();
 }
 
 
 
 RawObject* Isolate::StandardRunLoop() {
   ASSERT(long_jump_base() != NULL);
   ASSERT(message_notify_callback() == NULL);

[siva, 2012/01/28 00:21:05]

ASSERT(message_handler() != NULL);

[turnidge, 2012/01/31 20:04:31]

Done.

 
-  while (live_ports() > 0) {
+  while (message_handler()->HasLivePorts()) {
     ASSERT(this == Isolate::Current());
     Zone zone(this);
     HandleScope handle_scope(this);
 
-    Message* message = message_queue()->Dequeue(0);
+    Message* message = message_handler()->queue()->Dequeue(0);
     if (message != NULL) {
       if (message->priority() >= Message::kOOBPriority) {
         // TODO(turnidge): Out of band messages will not go through the
         // regular message handler.  Instead they will be dispatched to
         // special vm code.  Implement.
         UNIMPLEMENTED();
       }
       const Instance& msg =
           Instance::Handle(DeserializeMessage(message->data()));
       const Object& result = Object::Handle(
@@ skipping 51 matching lines @@
 }
 
 
 void Isolate::VisitWeakPersistentHandles(HandleVisitor* visitor) {
   if (api_state() != NULL) {
     api_state()->VisitWeakHandles(visitor);
   }
 }
 
 }  // namespace dart