OOB messages and general message refactor.

runtime/vm/port.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/port.h"
 
 #include "vm/dart_api_impl.h"
 #include "vm/isolate.h"
+#include "vm/message_queue.h"
 #include "vm/thread.h"
 #include "vm/utils.h"
 
 namespace dart {
 
 
 Mutex* PortMap::mutex_ = NULL;
 
 PortMap::Entry* PortMap::map_ = NULL;
 Isolate* PortMap::deleted_entry_ = reinterpret_cast<Isolate*>(1);
@@ skipping 138 matching lines @@
     map_[index].isolate = deleted_entry_;
     isolate->decrement_num_ports();
     if (map_[index].live) {
       isolate->decrement_live_ports();
     }
 
     used_--;
     deleted_++;
     MaintainInvariants();
   }
-
-  // Notify the embedder that this port is closed.
-  Dart_ClosePortCallback callback = isolate->close_port_callback();
-  ASSERT(callback);
-  ASSERT(port != kCloseAllPorts);
-  (*callback)(Api::CastIsolate(isolate), port);
+  isolate->ClosePort(port);
 }
 
 
 void PortMap::ClosePorts() {
   Isolate* isolate = Isolate::Current();
   {
     MutexLocker ml(mutex_);
     for (intptr_t i = 0; i < capacity_; i++) {
       if (map_[i].isolate == isolate) {
         // Mark the slot as deleted.
         map_[i].port = 0;
         map_[i].isolate = deleted_entry_;
         isolate->decrement_num_ports();
 
         used_--;
         deleted_++;
       }
     }
     MaintainInvariants();
   }
-
-  // Notify the embedder that all ports are closed.
-  Dart_ClosePortCallback callback = isolate->close_port_callback();
-  ASSERT(callback);
-  (*callback)(Api::CastIsolate(isolate), kCloseAllPorts);
+  isolate->CloseAllPorts();
 }
 
 
-bool PortMap::PostMessage(Dart_Port dest_port,
-                          Dart_Port reply_port,
-                          Dart_Message message) {
+bool PortMap::PostMessage(Message* message) {
   mutex_->Lock();

[Ivan Posva, 2012/01/23 22:00:43]

MutexLocker ml(mutex_);

[turnidge, 2012/01/23 22:32:52]

We can post from a non-isolate via Dart_PostIntArray and MutexLocker is a stack
resource.  Added a TODO.

-  intptr_t index = FindPort(dest_port);
+  intptr_t index = FindPort(message->dest_port());
   if (index < 0) {
     free(message);
     mutex_->Unlock();
     return false;
   }
   ASSERT(index >= 0);
   ASSERT(index < capacity_);
   Isolate* isolate = map_[index].isolate;
   ASSERT(map_[index].port != 0);
   ASSERT((isolate != NULL) && (isolate != deleted_entry_));
-
-  // Delegate message delivery to the embedder.
-  Dart_PostMessageCallback callback = isolate->post_message_callback();
-  ASSERT(callback);
-  bool result =
-      (*callback)(Api::CastIsolate(isolate), dest_port, reply_port, message);
-
+  isolate->PostMessage(message);
   mutex_->Unlock();
-  return result;
+  return true;
 }
 
 
 void PortMap::InitOnce() {
   mutex_ = new Mutex();
 
   static const intptr_t kInitialCapacity = 8;
   // TODO(iposva): Verify whether we want to keep exponentially growing.
   ASSERT(Utils::IsPowerOfTwo(kInitialCapacity));
   map_ = new Entry[kInitialCapacity];
   memset(map_, 0, kInitialCapacity * sizeof(Entry));
   capacity_ = kInitialCapacity;
   used_ = 0;
   deleted_ = 0;
 }
 
 
 }  // namespace dart