Allow embedders to provide custom message delivery for an isolate.

runtime/vm/isolate.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/isolate.h"
 
 #include "include/dart_api.h"

[siva, 2011/10/14 21:01:52]

The style has been to leave a blank line here (i.e when the directory name
changes).

[turnidge, 2011/10/14 23:08:02]

Done.

-
 #include "vm/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/debuginfo.h"
 #include "vm/heap.h"
+#include "vm/message_queue.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"
 

[siva, 2011/10/14 21:01:52]

extra blank line here.

[turnidge, 2011/10/14 23:08:02]

Done.

+
 namespace dart {
 
 DEFINE_FLAG(bool, report_invocation_count, false,
     "Count function invocations and report.");
 DECLARE_FLAG(bool, generate_gdb_symbols);
 
 
 Isolate::Isolate()
     : store_buffer_(),
-      monitor_(NULL),
       message_queue_(NULL),
+      post_message_callback_(NULL),
+      close_port_callback_(NULL),
       active_ports_(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),
 #endif
       random_seed_(Random::kDefaultRandomSeed),
       bigint_store_(NULL),
       top_exit_frame_info_(0),
       init_callback_data_(NULL),
       library_tag_handler_(NULL),
       api_state_(NULL),
       stub_code_(NULL),
       code_index_table_(NULL),
       long_jump_base_(NULL),
       timer_list_(),
       stack_limit_(0),
       stack_limit_on_overflow_exception_(0),
       ast_node_id_(AstNode::kInvalidId) {
 }
 
 
 Isolate::~Isolate() {
-  delete monitor_;
   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_;
 }
 
 
+static bool StandardPostMessageCallback(Dart_Isolate dart_isolate,
+                                        Dart_Port dest_port,
+                                        Dart_Port reply_port,
+                                        Dart_Message dart_message) {
+  Isolate* isolate = reinterpret_cast<Isolate*>(dart_isolate);
+  ASSERT(isolate != NULL);
+  PortMessage* message = new PortMessage(dest_port, reply_port, dart_message);
+  isolate->message_queue()->Enqueue(message);
+  return true;
+}
+
+
+static void StandardClosePortCallback(Dart_Isolate dart_isolate,
+                                      Dart_Port port) {
+  // Remove the pending messages for this port.
+  Isolate* isolate = reinterpret_cast<Isolate*>(dart_isolate);
+  ASSERT(isolate != NULL);
+  if (port == kCloseAllPorts) {
+    isolate->message_queue()->FlushAll();
+  } else {
+    isolate->message_queue()->Flush(port);
+  }
+}
+
+
 Isolate* Isolate::Init() {
   Isolate* result = new Isolate();
   ASSERT(result != NULL);
 
   // TODO(5411455): For now just set the recently created isolate as
   // the current isolate.
   SetCurrent(result);
 
-  // Setup the isolate monitor.
-  Monitor* monitor = new Monitor();
-  ASSERT(monitor != NULL);
-  result->set_monitor(monitor);
-
+  // Set up the isolate message queue.
   MessageQueue* queue = new MessageQueue();
   ASSERT(queue != NULL);
   result->set_message_queue(queue);
+  result->set_post_message_callback(&StandardPostMessageCallback);
+  result->set_close_port_callback(&StandardClosePortCallback);
 
   // 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.
@@ skipping 69 matching lines @@
   ASSERT(this == Isolate::Current());
   ASSERT(top_resource_ == NULL);
   ASSERT((heap_ == NULL) || heap_->Verify());
 
   // Close all the ports owned by this isolate.
   PortMap::ClosePorts();
 
   delete message_queue();
   set_message_queue(NULL);
 
-  // Remove the monitor associated with this isolate.
-  delete monitor();
-  set_monitor(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();
   }
 
   // TODO(5411455): For now just make sure there are no current isolates
   // as we are shutting down the isolate.
   SetCurrent(NULL);
 }
 
 
 Dart_IsolateInitCallback Isolate::init_callback_ = NULL;
 
 
 void Isolate::SetInitCallback(Dart_IsolateInitCallback callback) {
   init_callback_ = callback;
 }
 
 
 Dart_IsolateInitCallback Isolate::InitCallback() {
   return init_callback_;
 }
 
 
+void Isolate::StandardRunLoop() {
+  ASSERT(long_jump_base() != NULL);
+  ASSERT(post_message_callback() == &StandardPostMessageCallback);
+  ASSERT(close_port_callback() == &StandardClosePortCallback);
+
+  while (active_ports() > 0) {
+    Zone zone;
+    HandleScope handle_scope;
+
+    PortMessage* message = message_queue()->Dequeue();
+    if (message == NULL) {
+      message_queue()->Wait(0);
+      message = message_queue()->Dequeue();
+    }

[siva, 2011/10/14 21:01:52]

Why not make the Dequeue method wait if there is no message instead of having it
return null and then having to explicitly call wait again.

[turnidge, 2011/10/14 23:08:02]

Done.  Thanks, that's better.

+    if (message) {
+      Dart_HandleMessage(
+          message->dest_port(), message->reply_port(), message->data());
+      // message->Handle();

[siva, 2011/10/14 21:01:52]

Is this commented out code still necessary?

[turnidge, 2011/10/14 23:08:02]

Removed.

+      delete message;
+    }
+  }
+}
+
+
 void Isolate::VisitObjectPointers(ObjectPointerVisitor* visitor,
                                   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 16 matching lines @@
   // Visit all objects in the code index table.
   if (code_index_table() != NULL) {
     code_index_table()->VisitObjectPointers(visitor);
   }
 
   // Visit the top context which is stored in the isolate.
   visitor->VisitPointer(reinterpret_cast<RawObject**>(&top_context_));
 }
 
 }  // namespace dart