Move service into VM

runtime/bin/main.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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
@@ skipping 524 matching lines @@
       Dart_GetType(io_lib, platform_class_name, 0, NULL);
   CHECK_RESULT(platform_type);
   Dart_Handle script_name_name = DartUtils::NewString("_nativeScript");
   CHECK_RESULT(script_name_name);
   Dart_Handle dart_script = DartUtils::NewString(script_uri);
   CHECK_RESULT(dart_script);
   Dart_Handle set_script_name =
       Dart_SetField(platform_type, script_name_name, dart_script);
   CHECK_RESULT(set_script_name);
 
-  VmService::SendIsolateStartupMessage();
+  Dart_RegisterWithService();
 
   // Make the isolate runnable so that it is ready to handle messages.
   Dart_ExitScope();
   Dart_ExitIsolate();
   bool retval = Dart_IsolateMakeRunnable(isolate);
   if (!retval) {
     *error = strdup("Invalid isolate state - Unable to make it runnable");
     Dart_EnterIsolate(isolate);
     Dart_ShutdownIsolate();
     return NULL;
@@ skipping 21 matching lines @@
   }
   IsolateData* isolate_data = new IsolateData(script_uri);
   return CreateIsolateAndSetupHelper(script_uri,
                                      main,
                                      isolate_data,
                                      error,
                                      &is_compile_error);
 }
 
 
+static Dart_Isolate CreateServiceIsolate(void* data, char** error) {
+  const char* script_uri = "dart:vmservice";

[siva, 2014/01/10 00:01:54]

You could add a DartUtils::kVMServiceLibURL value for "dart:vmservice"

[Cutch, 2014/01/10 21:01:42]

Done.

+  bool is_compile_error_ = false;
+  bool *is_compile_error = &is_compile_error_;

[siva, 2014/01/10 00:01:54]

I don't see the variables is_compile_error and is_compile_error_ being used in
here?

[Cutch, 2014/01/10 21:01:42]

They are used in the CHECK_RESULT macro. I've added a comment.

+  IsolateData* isolate_data = new IsolateData(script_uri);
+  Dart_Isolate isolate =
+      Dart_CreateIsolate(script_uri, "main", snapshot_buffer, isolate_data,
+                         error);
+  if (isolate == NULL) {
+    return NULL;
+  }
+  Dart_EnterScope();
+  if (snapshot_buffer != NULL) {
+    // Setup the native resolver as the snapshot does not carry it.
+    Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
+    Builtin::SetNativeResolver(Builtin::kIOLibrary);
+  }
+  // Set up the library tag handler for this isolate.
+  Dart_Handle result = Dart_SetLibraryTagHandler(DartUtils::LibraryTagHandler);
+  CHECK_RESULT(result);
+  result = Dart_SetEnvironmentCallback(EnvironmentCallback);
+  CHECK_RESULT(result);
+  // Prepare builtin and its dependent libraries for use to resolve URIs.
+  Dart_Handle builtin_lib =
+      Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
+  CHECK_RESULT(builtin_lib);
+  // Prepare for script loading by setting up the 'print' and 'timer'
+  // closures and setting up 'package root' for URI resolution.
+  result = DartUtils::PrepareForScriptLoading(package_root, builtin_lib);
+  CHECK_RESULT(result);
+  Platform::SetPackageRoot(package_root);
+  Dart_Handle io_lib_url = DartUtils::NewString("dart:io");

[siva, 2014/01/10 00:01:54]

DartUtils::kIOLibURL instead of "dart:io"

[Cutch, 2014/01/10 21:01:42]

Done here and elsewhere.

+  CHECK_RESULT(io_lib_url);
+  Dart_Handle io_lib = Dart_LookupLibrary(io_lib_url);
+  CHECK_RESULT(io_lib);
+  Dart_Handle platform_class_name = DartUtils::NewString("Platform");
+  CHECK_RESULT(platform_class_name);
+  Dart_Handle platform_type =
+      Dart_GetType(io_lib, platform_class_name, 0, NULL);

[siva, 2014/01/10 00:01:54]

You could use
Dart_Handle platform_type = DartUtils::GetDartType(DartUtils::kIOLibURL,
"Platform");

[Cutch, 2014/01/10 21:01:42]

Done here and elsewhere.

+  CHECK_RESULT(platform_type);
+  Dart_Handle script_name_name = DartUtils::NewString("_nativeScript");

[siva, 2014/01/10 00:01:54]

Why does the variable have to be called script_name_name and not just
script_name

[Cutch, 2014/01/10 21:01:42]

Done here and elsewhere.

+  CHECK_RESULT(script_name_name);
+  Dart_Handle dart_script = DartUtils::NewString(script_uri);
+  CHECK_RESULT(dart_script);
+  Dart_Handle set_script_name =
+      Dart_SetField(platform_type, script_name_name, dart_script);
+  CHECK_RESULT(set_script_name);
+  Dart_ExitScope();
+  Dart_ExitIsolate();
+  return isolate;
+}
+
+
 static void PrintVersion() {
   Log::PrintErr("Dart VM version: %s\n", Dart_VersionString());
 }
 
 
 static void PrintUsage() {
   Log::PrintErr(
       "Usage: dart [<vm-flags>] <dart-script-file> [<dart-options>]\n"
       "\n"
       "Executes the Dart script passed as <dart-script-file>.\n"
@@ skipping 112 matching lines @@
   if (!Dart_IsError(error)) {
     return;
   }
   const int exit_code = Dart_IsCompilationError(error) ?
       kCompilationErrorExitCode : kErrorExitCode;
   ErrorExit(exit_code, "%s\n", Dart_GetError(error));
 }
 
 
 static void ShutdownIsolate(void* callback_data) {
-  VmService::VmServiceShutdownCallback(callback_data);
+  Dart_UnregisterFromService();
   IsolateData* isolate_data = reinterpret_cast<IsolateData*>(callback_data);
   delete isolate_data;
 }
 
 
 static Dart_Handle GenerateScriptSource() {
   Dart_Handle library_url = Dart_LibraryUrl(Dart_RootLibrary());
   if (Dart_IsError(library_url)) {
     return library_url;
   }
@@ skipping 75 matching lines @@
   }
 
   Dart_SetVMFlags(vm_options.count(), vm_options.arguments());
 
   // Initialize the Dart VM.
   if (!Dart_Initialize(CreateIsolateAndSetup, NULL, NULL, ShutdownIsolate,
                        DartUtils::OpenFile,
                        DartUtils::ReadFile,
                        DartUtils::WriteFile,
                        DartUtils::CloseFile,
-                       DartUtils::EntropySource)) {
+                       DartUtils::EntropySource,
+                       CreateServiceIsolate)) {
     fprintf(stderr, "%s", "VM initialization failed\n");
     fflush(stderr);
     exit(kErrorExitCode);
   }
 
   // Start the debugger wire protocol handler if necessary.
   if (start_debugger) {
     ASSERT(debug_port >= 0);
     bool print_msg = verbose_debug_seen || (debug_port == 0);
     debug_port = DebuggerConnectionHandler::StartHandler(debug_ip, debug_port);
@@ skipping 159 matching lines @@
   exit(Process::GlobalExitCode());
 }
 
 }  // namespace bin
 }  // namespace dart
 
 int main(int argc, char** argv) {
   dart::bin::main(argc, argv);
   UNREACHABLE();
 }