Changes to create an application snapshot which can be layered on top

vm/dart_api_impl.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/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/compiler.h"
 #include "vm/dart.h"
@@ skipping 595 matching lines @@
                                   old_size,
                                   new_size);
   return reinterpret_cast<uint8_t*>(new_ptr);
 }
 
 
 DART_EXPORT Dart_Handle Dart_CreateSnapshot(uint8_t** buffer,
                                             intptr_t* size) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  TIMERSCOPE(time_creating_snapshot);
   if (buffer == NULL) {
     return Api::Error("%s expects argument 'buffer' to be non-null.",
                       CURRENT_FUNC);
   }
   if (size == NULL) {
     return Api::Error("%s expects argument 'size' to be non-null.",
                       CURRENT_FUNC);
   }
   const char* msg = CheckIsolateState(isolate,
                                       ClassFinalizer::kGeneratingSnapshot);
   if (msg != NULL) {
     return Api::Error(msg);
   }
   // Since this is only a snapshot the root library should not be set.
   isolate->object_store()->set_root_library(Library::Handle());
   SnapshotWriter writer(Snapshot::kFull, buffer, ApiAllocator);
   writer.WriteFullSnapshot();
   *size = writer.Size();
   return Api::Success();
 }
 
 
-DART_EXPORT Dart_Handle Dart_CreateScriptSnapshot(Dart_Handle library,
-                                                  uint8_t** buffer,
+DART_EXPORT Dart_Handle Dart_CreateScriptSnapshot(uint8_t** buffer,
                                                   intptr_t* size) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  TIMERSCOPE(time_creating_snapshot);
   if (buffer == NULL) {
     return Api::Error("%s expects argument 'buffer' to be non-null.",
                       CURRENT_FUNC);
   }
   if (size == NULL) {
     return Api::Error("%s expects argument 'size' to be non-null.",
                       CURRENT_FUNC);
   }
-  const Library& root_lib = Api::UnwrapLibraryHandle(library);
-  if (root_lib.IsNull()) {
-    RETURN_TYPE_ERROR(library, Library);
-  }
   const char* msg = CheckIsolateState(isolate);
   if (msg != NULL) {
     return Api::Error(msg);
   }
-  ScriptSnapshotWriter writer(root_lib, buffer, ApiAllocator);
-  writer.WriteScriptSnapshot();
+  Library& library = Library::Handle(isolate->object_store()->root_library());
+  if (library.IsNull()) {
+    return Api::Error("%s expects the isolate to have a script loaded in it.",
+                      CURRENT_FUNC);
+  }
+  ScriptSnapshotWriter writer(buffer, ApiAllocator);
+  writer.WriteScriptSnapshot(library);
   *size = writer.Size();
   return Api::Success();
 }
 
 
 DART_EXPORT void Dart_InterruptIsolate(Dart_Isolate isolate) {
   if (isolate == NULL) {
     FATAL1("%s expects argument 'isolate' to be non-null.",  CURRENT_FUNC);
   }
   Isolate* iso = reinterpret_cast<Isolate*>(isolate);
@@ skipping 1609 matching lines @@
                 source_str,
                 RawScript::kScript,
                 &result);
   return result;
 }
 
 
 DART_EXPORT Dart_Handle Dart_LoadScriptFromSnapshot(const uint8_t* buffer) {
   Isolate* isolate = Isolate::Current();
   DARTSCOPE(isolate);
+  TIMERSCOPE(time_script_loading);
   if (buffer == NULL) {
     return Api::Error("%s expects argument 'buffer' to be non-null.",
                       CURRENT_FUNC);
   }
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
   if (!snapshot->IsScriptSnapshot()) {
     return Api::Error("%s expects parameter 'buffer' to be a script type"
                       " snapshot", CURRENT_FUNC);
   }
   Library& library = Library::Handle(isolate->object_store()->root_library());
   if (!library.IsNull()) {
     const String& library_url = String::Handle(library.url());
     return Api::Error("%s: A script has already been loaded from '%s'.",
                       CURRENT_FUNC, library_url.ToCString());
   }
   SnapshotReader reader(snapshot, isolate->heap(), isolate->object_store());
   const Object& tmp = Object::Handle(reader.ReadObject());
   if (!tmp.IsLibrary()) {
     return Api::Error("%s: Unable to deserialize snapshot correctly.",
                       CURRENT_FUNC);
   }
   library ^= tmp.raw();
+  library.Register();
   isolate->object_store()->set_root_library(library);
   return Api::NewLocalHandle(library);
 }
 
 
 DEFINE_FLAG(bool, compile_all, false, "Eagerly compile all code.");
 
 static void CompileAll(Isolate* isolate, Dart_Handle* result) {
   *result = Api::Success();
   if (FLAG_compile_all) {
@@ skipping 190 matching lines @@
     }
     delete debug_region;
   } else {
     *buffer = NULL;
     *buffer_size = 0;
   }
 }
 
 
 }  // namespace dart