- reorganize DartUtils::PrepareForScriptLoading so that it does not have the wait for service load …

runtime/bin/dartutils.h

 // 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.
 
 #ifndef BIN_DARTUTILS_H_
 #define BIN_DARTUTILS_H_
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 
+#include "bin/isolate_data.h"
+
 namespace dart {
 namespace bin {
 
 // Forward declarations.
 class File;
 class OSError;
 
 /* Handles error handles returned from Dart API functions.  If a value
  * is an error, uses Dart_PropagateError to throw it to the enclosing
  * Dart activation.  Otherwise, returns the original handle.
@@ skipping 92 matching lines @@
   static void* OpenFile(const char* name, bool write);
   static void ReadFile(const uint8_t** data, intptr_t* file_len, void* stream);
   static void WriteFile(const void* buffer, intptr_t num_bytes, void* stream);
   static void CloseFile(void* stream);
   static bool EntropySource(uint8_t* buffer, intptr_t length);
   static Dart_Handle ReadStringFromFile(const char* filename);
   static Dart_Handle MakeUint8Array(const uint8_t* buffer, intptr_t length);
   static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag,
                                        Dart_Handle library,
                                        Dart_Handle url);
-  static Dart_Handle LoadScript(const char* script_uri,
-                                Dart_Handle builtin_lib);
-  static Dart_Handle PrepareBuiltinLibrary(Dart_Handle builtin_lib,
-                                           Dart_Handle internal_lib,
-                                           bool is_service_isolate,
-                                           bool trace_loading,
-                                           const char* package_root,
-                                           const char* packages_file);
-  static Dart_Handle PrepareCoreLibrary(Dart_Handle core_lib,
-                                 Dart_Handle builtin_lib,
-                                 bool is_service_isolate);
-  static Dart_Handle PrepareAsyncLibrary(Dart_Handle async_lib,
-                                  Dart_Handle isolate_lib);
-  static Dart_Handle PrepareIOLibrary(Dart_Handle io_lib);
-  static Dart_Handle PrepareIsolateLibrary(Dart_Handle isolate_lib);
-  static Dart_Handle PrepareForScriptLoading(const char* package_root,
-                                             const char* packages_file,
-                                             bool is_service_isolate,
-                                             bool trace_loading,
-                                             Dart_Handle builtin_lib);
+  static Dart_Handle LoadScript(const char* script_uri);
+  static Dart_Handle PrepareForScriptLoading(bool is_service_isolate,
+                                             bool trace_loading);
+  static Dart_Handle SetupServiceLoadPort();
+  static Dart_Handle SetupPackageRoot(const char* package_root,
+                                      const char* packages_file);
   static Dart_Handle SetupIOLibrary(const char* script_uri);
 
   static bool PostNull(Dart_Port port_id);
   static bool PostInt32(Dart_Port port_id, int32_t value);
   static bool PostInt64(Dart_Port port_id, int64_t value);
 
   static Dart_Handle GetDartType(const char* library_url,
                                  const char* class_name);
   // Create a new Dart OSError object with the current OS error.
   static Dart_Handle NewDartOSError();
@@ skipping 16 matching lines @@
   static Dart_Handle NewString(const char* str) {
     ASSERT(str != NULL);
     return Dart_NewStringFromUTF8(reinterpret_cast<const uint8_t*>(str),
                                   strlen(str));
   }
 
   // Create a new Dart InternalError object with the provided message.
   static Dart_Handle NewError(const char* format, ...);
   static Dart_Handle NewInternalError(const char* message);
 
+  static Dart_Handle BuiltinLib() {
+    IsolateData* isolate_data =
+        reinterpret_cast<IsolateData*>(Dart_CurrentIsolateData());
+    return isolate_data->builtin_lib();
+  }
+
   static bool SetOriginalWorkingDirectory();
 
   static const char* MapLibraryUrl(CommandLineOptions* url_mapping,
                                    const char* url_string);
 
-  static Dart_Handle SetWorkingDirectory(Dart_Handle builtin_lib);
-
-  static Dart_Handle ResolveUriInWorkingDirectory(Dart_Handle script_uri,
-                                                  Dart_Handle builtin_lib);
-
-  static Dart_Handle FilePathFromUri(Dart_Handle script_uri,
-                                     Dart_Handle builtin_lib);
-
-  static Dart_Handle ExtensionPathFromUri(Dart_Handle extension_uri,
-                                          Dart_Handle builtin_lib);
-
-  static Dart_Handle ResolveUri(Dart_Handle library_url,
-                                Dart_Handle url,
-                                Dart_Handle builtin_lib);
+  static Dart_Handle ResolveUriInWorkingDirectory(Dart_Handle script_uri);
+  static Dart_Handle FilePathFromUri(Dart_Handle script_uri);
+  static Dart_Handle ResolveUri(Dart_Handle library_url, Dart_Handle url);
 
   // Sniffs the specified text_buffer to see if it contains the magic number
   // representing a script snapshot. If the text_buffer is a script snapshot
   // the return value is an updated pointer to the text_buffer pointing past
   // the magic number value. The 'buffer_len' parameter is also appropriately
   // adjusted.
   static const uint8_t* SniffForMagicNumber(const uint8_t* text_buffer,
                                             intptr_t* buffer_len,
                                             bool* is_snapshot);
 
@@ skipping 12 matching lines @@
   static const char* const kIsolateLibURL;
   static const char* const kIOLibURL;
   static const char* const kIOLibPatchURL;
   static const char* const kUriLibURL;
   static const char* const kHttpScheme;
   static const char* const kVMServiceLibURL;
 
   static const uint8_t magic_number[];
 
  private:
+  static Dart_Handle SetWorkingDirectory();
+  static Dart_Handle ExtensionPathFromUri(Dart_Handle extension_uri);
+
+  static Dart_Handle PrepareBuiltinLibrary(Dart_Handle builtin_lib,
+                                           Dart_Handle internal_lib,
+                                           bool is_service_isolate,
+                                           bool trace_loading);
+  static Dart_Handle PrepareCoreLibrary(Dart_Handle core_lib,
+                                 Dart_Handle builtin_lib,
+                                 bool is_service_isolate);
+  static Dart_Handle PrepareAsyncLibrary(Dart_Handle async_lib,
+                                  Dart_Handle isolate_lib);
+  static Dart_Handle PrepareIOLibrary(Dart_Handle io_lib);
+  static Dart_Handle PrepareIsolateLibrary(Dart_Handle isolate_lib);
+
   DISALLOW_ALLOCATION();
   DISALLOW_IMPLICIT_CONSTRUCTORS(DartUtils);
 };
 
 
 class CObject {
  public:
   // These match the constants in sdk/lib/io/common.dart.
   static const int kSuccess = 0;
   static const int kArgumentError = 1;
@@ skipping 341 matching lines @@
 
   ~ScopedBlockingCall() {
     Dart_ThreadEnableProfiling();
   }
 };
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // BIN_DARTUTILS_H_