Start using Dart_SetField and Dart_GetField in the vm.

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 "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 {
 
 // Only ia32 and x64 can run execution tests.
 #if defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64)
 
 static void native_echo(Dart_NativeArguments args);
 static void CustomIsolateImpl_start(Dart_NativeArguments args);
 static Dart_NativeFunction NativeLookup(Dart_Handle name, int argc);
 
 
 static const char* kCustomIsolateScriptChars =
     "#import('dart:isolate');\n"
     "\n"
-    "class GlobalsHack {\n"
-    "  static ReceivePort _receivePort;\n"
-    "}\n"
-    "\n"
-    "ReceivePort get receivePort() {\n"
-    "  return GlobalsHack._receivePort;\n"
-    "}\n"
+    "ReceivePort mainPort;\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"
     "  Future<SendPort> spawn() {\n"
     "    Completer<SendPort> completer = new Completer<SendPort>();\n"
     "    SendPort port = _start(_entry);\n"
     "    completer.complete(port);\n"
     "    return completer.future;\n"
     "  }\n"
     "\n"
     "  static SendPort _start(entry)\n"
     "      native \"CustomIsolateImpl_start\";\n"
     "\n"
     "  String _entry;\n"
     "}\n"
     "\n"
     "interface CustomIsolate default CustomIsolateImpl {\n"
     "  CustomIsolate(String entry);\n"
     "\n"
     "  Future<SendPort> spawn();\n"
     "}\n"
     "\n"
     "isolateMain() {\n"
     "   echo('Running isolateMain');\n"
-    "   receivePort.receive((message, SendPort replyTo) {\n"
+    "   mainPort.receive((message, SendPort replyTo) {\n"
     "     echo('Received: ' + message);\n"
     "     replyTo.send((message + 1), null);\n"
     "   });\n"
     "}\n"
     "\n"
     "main() {\n"
     "  var isolate = new CustomIsolate(\"isolateMain\");\n"
     "  isolate.spawn().then((SendPort port) {\n"
     "    port.call(42).receive((message, replyTo) {\n"
     "      echo('Received: ' + message);\n"
@@ skipping 102 matching lines @@
   // Reload all the test classes here.
   //
   // TODO(turnidge): Use the create isolate callback instead?
   Dart_Handle lib = TestCase::LoadTestScript(kCustomIsolateScriptChars,
                                              NativeLookup);
   EXPECT_VALID(lib);
   EXPECT_VALID(Dart_CompileAll());
 
   Dart_Handle recv_port = Dart_GetReceivePort(Dart_GetMainPortId());
   EXPECT_VALID(recv_port);
-
-  // TODO(turnidge): Provide a way to set a top-level variable from
-  // the dart embedding api.
-  Dart_Handle hidden = Dart_GetClass(lib, Dart_NewString("GlobalsHack"));
-  EXPECT_VALID(hidden);
-  result = Dart_SetStaticField(hidden, Dart_NewString("_receivePort"),
-                               recv_port);
+  result = Dart_SetField(lib, Dart_NewString("mainPort"), recv_port);
   EXPECT_VALID(result);
 
   result = Dart_InvokeStatic(lib,
                              Dart_NewString(""),
                              Dart_NewString(main_),
                              0,
                              NULL);
   EXPECT_VALID(result);
   free(const_cast<char*>(main_));
   main_ = NULL;
@@ skipping 152 matching lines @@
   OS::Print("-- Finished event loop --\n");
   EXPECT_STREQ("Received: 43", saved_echo);
   free(const_cast<char*>(saved_echo));
 
   delete event_queue;
 }
 
 #endif  // defined(TARGET_ARCH_IA32) || defined(TARGET_ARCH_X64).
 
 }  // namespace dart