- First step in refactoring ports with the goal of moving

runtime/vm/custom_isolate_test.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 "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "vm/unit_test.h"
 
 // Custom Isolate Test.
 //
 // This mid-size test uses the Dart Embedding Api to create a custom
 // isolate abstraction.  Instead of having a dedicated thread for each
 // isolate, as is the case normally, this implementation shares a
 // single thread among the isolates using an event queue.
 
 namespace dart {
 
 static void native_echo(Dart_NativeArguments args);
 static void CustomIsolateImpl_start(Dart_NativeArguments args);
 static Dart_NativeFunction NativeLookup(Dart_Handle name,
                                         int argc,
                                         bool* auto_setup_scope);
 
 
 static const char* kCustomIsolateScriptChars =
     "import 'dart:isolate';\n"
     "\n"
-    "RawReceivePort mainPort;\n"
+    "final RawReceivePort mainPort = new RawReceivePort();\n"
     "\n"
     "echo(arg) native \"native_echo\";\n"
     "\n"
     "class CustomIsolateImpl implements CustomIsolate {\n"
     "  CustomIsolateImpl(String entry) : _entry = entry{\n"
     "    echo('Constructing isolate');\n"
     "  }\n"
     "\n"
     "  SendPort spawn() {\n"
     "    return _start(_entry);\n"
@@ skipping 123 matching lines @@
   const char* main_;
 };
 
 
 void StartEvent::Process() {
   OS::Print(">> StartEvent with isolate(%p)--\n", isolate());
   Dart_EnterIsolate(isolate());
   Dart_EnterScope();
   Dart_Handle result;
 
-  // Reload all the test classes here.
-  //
-  // TODO(turnidge): Use the create isolate callback instead?
-  Dart_Handle lib = TestCase::LoadTestScript(kCustomIsolateScriptChars,
-                                             NativeLookup);
+  Dart_Handle lib = Dart_LookupLibrary(NewString(TestCase::url()));
   EXPECT_VALID(lib);
 
-  Dart_Handle recv_port = Dart_GetReceivePort(Dart_GetMainPortId());
-  EXPECT_VALID(recv_port);
-  result = Dart_SetField(lib, NewString("mainPort"), recv_port);
-  EXPECT_VALID(result);
-
   result = Dart_Invoke(lib, NewString(main_), 0, NULL);
   EXPECT_VALID(result);
   free(const_cast<char*>(main_));
   main_ = NULL;
 
   Dart_ExitScope();
   Dart_ExitIsolate();
 }
 
 
@@ skipping 85 matching lines @@
   isolate_main = strdup(isolate_main);
 
   // Save current isolate.
   Dart_Isolate saved_isolate = Dart_CurrentIsolate();
   Dart_ExitIsolate();
 
   // Create a new Dart_Isolate.
   Dart_Isolate new_isolate = TestCase::CreateTestIsolate();
   EXPECT(new_isolate != NULL);
   Dart_SetMessageNotifyCallback(&NotifyMessage);
-  Dart_Port new_port = Dart_GetMainPortId();
+  Dart_EnterScope();
+  // Reload all the test classes here.
+  //
+  // TODO(turnidge): Use the create isolate callback instead?
+  Dart_Handle lib = TestCase::LoadTestScript(kCustomIsolateScriptChars,
+                                             NativeLookup);
+  EXPECT_VALID(lib);
+
+  Dart_Handle main_port = Dart_GetField(lib, NewString("mainPort"));
+  EXPECT_VALID(main_port);
+  Dart_Port main_port_id;
+  Dart_Handle err = Dart_PortGetId(main_port, &main_port_id);
+  EXPECT_VALID(err);
 
   OS::Print("-- Adding StartEvent to queue --\n");
   event_queue->Add(new StartEvent(new_isolate, isolate_main));
 
   // Restore the original isolate.
+  Dart_ExitScope();
   Dart_ExitIsolate();
   Dart_EnterIsolate(saved_isolate);
   Dart_EnterScope();
 
-  Dart_Handle send_port = Dart_NewSendPort(new_port);
+  Dart_Handle send_port = Dart_NewSendPort(main_port_id);
   EXPECT_VALID(send_port);
   Dart_SetReturnValue(args, send_port);
 
   OS::Print("-- Exit: CustomIsolateImpl_start --\n");
   Dart_ExitScope();
 }
 
 
 UNIT_TEST_CASE(CustomIsolates) {
   event_queue = new EventQueue();
@@ skipping 28 matching lines @@
     event = event_queue->Get();
   }
   OS::Print("-- Finished event loop --\n");
   EXPECT_STREQ("Received: 43", saved_echo);
   free(const_cast<char*>(saved_echo));
 
   delete event_queue;
 }
 
 }  // namespace dart