Lazy loading of deferred libraries

runtime/bin/dartutils.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 "bin/dartutils.h"
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
 #include "platform/assert.h"
 #include "platform/globals.h"
 
 #include "bin/crypto.h"
 #include "bin/directory.h"
 #include "bin/extensions.h"
 #include "bin/file.h"
 #include "bin/io_buffer.h"
 #include "bin/socket.h"
 #include "bin/utils.h"
 
 namespace dart {
 namespace bin {
 
 const char* DartUtils::original_working_directory = NULL;
 const char* DartUtils::kDartScheme = "dart:";
 const char* DartUtils::kDartExtensionScheme = "dart-ext:";
 const char* DartUtils::kAsyncLibURL = "dart:async";
-const char* DartUtils::kBuiltinLibURL = "dart:builtin";
+const char* DartUtils::kBuiltinLibURL = "dart:_builtin";
 const char* DartUtils::kCoreLibURL = "dart:core";
 const char* DartUtils::kInternalLibURL = "dart:_internal";
 const char* DartUtils::kIsolateLibURL = "dart:isolate";
 const char* DartUtils::kIOLibURL = "dart:io";
 const char* DartUtils::kIOLibPatchURL = "dart:io-patch";
 const char* DartUtils::kUriLibURL = "dart:uri";
 const char* DartUtils::kHttpScheme = "http:";
 const char* DartUtils::kVMServiceLibURL = "dart:vmservice";
 
 uint8_t DartUtils::magic_number[] = { 0xf5, 0xf5, 0xdc, 0xdc };
@@ skipping 633 matching lines @@
 
 
 // Callback function that gets called from asynchronous script loading code
 // when the data has been read. Loads the script or snapshot into the VM.
 void FUNCTION_NAME(Builtin_LoadScript)(Dart_NativeArguments args) {
   Dart_Handle resolved_script_uri = Dart_GetNativeArgument(args, 0);
   Dart_Handle data = Dart_GetNativeArgument(args, 1);
 
   intptr_t num_bytes = 0;
   Dart_Handle result = Dart_ListLength(data, &num_bytes);
-  DART_CHECK_VALID(result);
+  if (Dart_IsError(result)) {
+    Dart_PropagateError(result);
+  }
 
   uint8_t* buffer = reinterpret_cast<uint8_t*>(malloc(num_bytes));
   Dart_ListGetAsBytes(data, 0, buffer, num_bytes);
 
   bool is_snapshot = false;
   const uint8_t *payload =
       DartUtils::SniffForMagicNumber(buffer, &num_bytes, &is_snapshot);
 
   if (is_snapshot) {
     result = Dart_LoadScriptFromSnapshot(payload, num_bytes);
@@ skipping 39 matching lines @@
   } else {
     ASSERT(tag == Dart_kSourceTag);
     Dart_Handle library = Dart_LookupLibrary(library_uri);
     DART_CHECK_VALID(library);
     result = Dart_LoadSource(library, resolved_script_uri, sourceText);
   }
   if (Dart_IsError(result)) Dart_PropagateError(result);
 }
 
 
+// Callback function that gets called from dartutils when there are
+// no more outstanding load requests. Invoke Dart core library function
+// that completes futures of loadLibrary calls (deferred library loading).
+// Invoking this function finalizes newly loaded classes as a side
+// effect.
+void FUNCTION_NAME(Builtin_DoneLoading)(Dart_NativeArguments args) {
+  Dart_Handle corelib_url = DartUtils::NewString(DartUtils::kCoreLibURL);
+  DART_CHECK_VALID(corelib_url);
+  Dart_Handle corelib = Dart_LookupLibrary(corelib_url);
+  DART_CHECK_VALID(corelib);
+  Dart_Handle res =
+      Dart_Invoke(corelib,
+                  DartUtils::NewString("_completeDeferredLoads"),
+                  0,
+                  NULL);
+  if (Dart_IsError(res)) {
+    Dart_PropagateError(res);
+  }
+}
+
+
 Dart_Handle DartUtils::LoadSource(Dart_Handle library,
                                   Dart_Handle url,
                                   Dart_LibraryTag tag,
                                   const char* url_string) {
   bool is_http_scheme_url = DartUtils::IsHttpSchemeURL(url_string);
   Dart_Handle source;
   if (is_http_scheme_url) {
     // Read the file over http.
     source = DartUtils::ReadStringFromHttp(url_string);
   } else {
@@ skipping 389 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart