Refactor isolate startup code in preparation for making isolate spawning more truly non-blocking.

runtime/vm/port_test.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 "platform/assert.h"
 #include "vm/lockers.h"
 #include "vm/message_handler.h"
 #include "vm/os.h"
 #include "vm/port.h"
 #include "vm/unit_test.h"
 
 namespace dart {
 
 // Provides private access to PortMap for testing.
 class PortMapTestPeer {
  public:
   static bool IsActivePort(Dart_Port port) {
     MutexLocker ml(PortMap::mutex_);
     return (PortMap::FindPort(port) >= 0);
   }
 
   static bool IsLivePort(Dart_Port port) {
     MutexLocker ml(PortMap::mutex_);
     intptr_t index = PortMap::FindPort(port);
     if (index < 0) {
       return false;
     }
-    return PortMap::map_[index].live;
+    return PortMap::map_[index].state == PortMap::kLivePort;
   }
 };
 
 
 class PortTestMessageHandler : public MessageHandler {
  public:
   PortTestMessageHandler() : notify_count(0) {}
 
   void MessageNotify(Message::Priority priority) {
     notify_count++;
@@ skipping 54 matching lines @@
   PortTestMessageHandler handler;
   for (int i = 0; i < 32; i++) {
     Dart_Port port = PortMap::CreatePort(&handler);
     EXPECT(PortMapTestPeer::IsActivePort(port));
     PortMap::ClosePort(port);
     EXPECT(!PortMapTestPeer::IsActivePort(port));
   }
 }
 
 
-TEST_CASE(PortMap_SetLive) {
+TEST_CASE(PortMap_SetPortState) {
   PortTestMessageHandler handler;
+
+  // Regular port.
   Dart_Port port = PortMap::CreatePort(&handler);
   EXPECT_NE(0, port);
   EXPECT(PortMapTestPeer::IsActivePort(port));
   EXPECT(!PortMapTestPeer::IsLivePort(port));
 
-  PortMap::SetLive(port);
+  PortMap::SetPortState(port, PortMap::kLivePort);
   EXPECT(PortMapTestPeer::IsActivePort(port));
   EXPECT(PortMapTestPeer::IsLivePort(port));
 
   PortMap::ClosePort(port);
   EXPECT(!PortMapTestPeer::IsActivePort(port));
   EXPECT(!PortMapTestPeer::IsLivePort(port));
+
+  // Control port.
+  port = PortMap::CreatePort(&handler);
+  EXPECT_NE(0, port);
+  EXPECT(PortMapTestPeer::IsActivePort(port));
+  EXPECT(!PortMapTestPeer::IsLivePort(port));
+
+  PortMap::SetPortState(port, PortMap::kControlPort);
+  EXPECT(PortMapTestPeer::IsActivePort(port));
+  EXPECT(!PortMapTestPeer::IsLivePort(port));
+
+  PortMap::ClosePort(port);
+  EXPECT(!PortMapTestPeer::IsActivePort(port));
+  EXPECT(!PortMapTestPeer::IsLivePort(port));
 }
 
 
 TEST_CASE(PortMap_PostMessage) {
   PortTestMessageHandler handler;
   Dart_Port port = PortMap::CreatePort(&handler);
   EXPECT_EQ(0, handler.notify_count);
 
   const char* message = "msg";
   intptr_t message_len = strlen(message) + 1;
@@ skipping 16 matching lines @@
 
   const char* message = "msg";
   intptr_t message_len = strlen(message) + 1;
 
   EXPECT(!PortMap::PostMessage(new Message(
       port, reinterpret_cast<uint8_t*>(strdup(message)), message_len,
       Message::kNormalPriority)));
 }
 
 }  // namespace dart