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

vm/snapshot_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 "vm/snapshot.h"
 
 #include "vm/assert.h"
 #include "vm/bigint_operations.h"
 #include "vm/class_finalizer.h"
 #include "vm/unit_test.h"
@@ skipping 257 matching lines @@
   String& url = String::Handle(String::New("dart-test:SerializeScript"));
   String& source = String::Handle(String::New(kScriptChars));
   Script& script = Script::Handle(Script::New(url, source, RawScript::kSource));
   const String& lib_url = String::Handle(String::NewSymbol("TestLib"));
   Library& lib = Library::Handle(Library::New(lib_url));
   lib.Register();
   EXPECT(CompilerTest::TestCompileScript(lib, script));
 
   // Write snapshot with object content.
   uint8_t* buffer;
-  SnapshotWriter writer(Snapshot::kMessage, &buffer, &allocator);
+  SnapshotWriter writer(Snapshot::kScript, &buffer, &allocator);
   writer.WriteObject(script.raw());
   writer.FinalizeBuffer();
 
   // Create a snapshot object using the buffer.
   const Snapshot* snapshot = Snapshot::SetupFromBuffer(buffer);
 
   // Read object back from the snapshot.
   Isolate* isolate= Isolate::Current();
   SnapshotReader reader(snapshot, isolate->heap(), isolate->object_store());
   Script& serialized_script = Script::Handle();
@@ skipping 146 matching lines @@
     EXPECT_VALID(result);
     Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
   free(buffer);
 }
 
 
 UNIT_TEST_CASE(ScriptSnapshot) {
   const char* kScriptChars =
-      "class Fields  {\n"
-      "  Fields(int i, int j) : fld1 = i, fld2 = j {}\n"
-      "  int fld1;\n"
-      "  final int fld2;\n"
-      "  static int fld3;\n"
-      "  static final int fld4 = 10;\n"
-      "}\n"
-      "class FieldsTest {\n"
-      "  static Fields testMain() {\n"
-      "    Fields obj = new Fields(10, 20);\n"
-      "    return obj;\n"
-      "  }\n"
-      "}\n";
+      "class Fields  {"
+      "  Fields(int i, int j) : fld1 = i, fld2 = j {}"
+      "  int fld1;"
+      "  final int fld2;"
+      "  static int fld3;"
+      "  static final int fld4 = 10;"
+      "}"
+      "class FieldsTest {"
+      "  static Fields testMain() {"
+      "    Fields obj = new Fields(10, 20);"
+      "    Fields.fld3 = 100;"
+      "    if (obj === null) {"
+      "      throw new Exception('Allocation failure');"
+      "    }"
+      "    if (obj.fld1 != 10) {"
+      "      throw new Exception('fld1 needs to be 10');"
+      "    }"
+      "    if (obj.fld2 != 20) {"
+      "      throw new Exception('fld2 needs to be 20');"
+      "    }"
+      "    if (Fields.fld3 != 100) {"
+      "      throw new Exception('Fields.fld3 needs to be 100');"
+      "    }"
+      "    if (Fields.fld4 != 10) {"
+      "      throw new Exception('Fields.fld4 needs to be 10');"
+      "    }"
+      "    return obj;"
+      "  }"
+      "}";
   Dart_Handle result;
 
   uint8_t* buffer;
   intptr_t size;
+  uint8_t* full_snapshot = NULL;
+  uint8_t* script_snapshot = NULL;
 
-  // Start an Isolate, load a script and create a script snapshot.
   {
+    // Start an Isolate, and create a full snapshot of it.
     TestIsolateScope __test_isolate__;
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
+    // Write out the script snapshot.
+    result = Dart_CreateSnapshot(&buffer, &size);
+    EXPECT_VALID(result);
+    full_snapshot = reinterpret_cast<uint8_t*>(malloc(size));
+    memmove(full_snapshot, buffer, size);
+    Dart_ExitScope();
+  }
+
+  {
+    // Create an Isolate using the full snapshot, load a script and create
+    // a script snapshot of the script.
+    TestCase::CreateTestIsolateFromSnapshot(full_snapshot);
+    Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
+
     // Create a test library and Load up a test script in it.
     TestCase::LoadTestScript(kScriptChars, NULL);
 
     // Write out the script snapshot.
-    result = Dart_CreateScriptSnapshot(TestCase::lib(), &buffer, &size);
+    result = Dart_CreateScriptSnapshot(&buffer, &size);
     EXPECT_VALID(result);
+    script_snapshot = reinterpret_cast<uint8_t*>(malloc(size));
+    memmove(script_snapshot, buffer, size);
     Dart_ExitScope();
+    Dart_ShutdownIsolate();
   }
 
-  // Now Create another isolate and load the application snapshot and
-  // execute it.
   {
-    TestIsolateScope __test_isolate__;
+    // Now Create an Isolate using the full snapshot and load the
+    // script snapshot created above and execute it.
+    TestCase::CreateTestIsolateFromSnapshot(full_snapshot);
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
 
     // Load the test library from the snapshot.
-    result = Dart_LoadScriptFromSnapshot(buffer);
+    EXPECT(script_snapshot != NULL);
+    result = Dart_LoadScriptFromSnapshot(script_snapshot);
     EXPECT_VALID(result);
 
     // Invoke a function which returns an object.
     result = Dart_InvokeStatic(result,
                                Dart_NewString("FieldsTest"),
                                Dart_NewString("testMain"),
                                0,
                                NULL);
     EXPECT_VALID(result);
     Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
-  free(buffer);
+  free(full_snapshot);
+  free(script_snapshot);
 }
 
 #endif  // TARGET_ARCH_IA32.
 
 }  // namespace dart