First step towards splitting a full snapshot into a vm isolate snapshot and a

runtime/vm/snapshot_test.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 "platform/globals.h"
 
 #include "include/dart_debugger_api.h"
 #include "platform/assert.h"
 #include "vm/class_finalizer.h"
 #include "vm/dart_api_impl.h"
@@ skipping 1011 matching lines @@
       "class FieldsTest {\n"
       "  static Fields testMain() {\n"
       "    Expect.equals(true, Fields.bigint_sfld == 0xfffffffffff);\n"
       "    Fields obj = new Fields(10, 20);\n"
       "    Expect.equals(true, obj.bigint_fld == 0xfffffffffff);\n"
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
-  uint8_t* buffer;
+  uint8_t* vm_isolate_snapshot_buffer;
+  uint8_t* isolate_snapshot_buffer;
 
   // Start an Isolate, load a script and create a full snapshot.
   Timer timer1(true, "Snapshot_test");
   timer1.Start();
   {
     TestIsolateScope __test_isolate__;
 
     Isolate* isolate = Isolate::Current();
     StackZone zone(isolate);
     HandleScope scope(isolate);
 
     // Create a test library and Load up a test script in it.
     TestCase::LoadTestScript(kScriptChars, NULL);
     EXPECT_VALID(Api::CheckAndFinalizePendingClasses(isolate));
     timer1.Stop();
     OS::PrintErr("Without Snapshot: %" Pd64 "us\n", timer1.TotalElapsedTime());
 
     // Write snapshot with object content.
-    FullSnapshotWriter writer(&buffer, &malloc_allocator);
+    FullSnapshotWriter writer(&vm_isolate_snapshot_buffer,
+                              &isolate_snapshot_buffer,
+                              &malloc_allocator);
     writer.WriteFullSnapshot();
   }
 
   // Now Create another isolate using the snapshot and execute a method
   // from the script.
   Timer timer2(true, "Snapshot_test");
   timer2.Start();
-  TestCase::CreateTestIsolateFromSnapshot(buffer);
+  TestCase::CreateTestIsolateFromSnapshot(isolate_snapshot_buffer);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     timer2.Stop();
     OS::PrintErr("From Snapshot: %" Pd64 "us\n", timer2.TotalElapsedTime());
 
     // Invoke a function which returns an object.
     Dart_Handle cls =
         Dart_GetClass(TestCase::lib(), NewString("FieldsTest"));
     result = Dart_Invoke(cls, NewString("testMain"), 0, NULL);
     EXPECT_VALID(result);
     Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
-  free(buffer);
+  free(isolate_snapshot_buffer);
 }
 
 
 UNIT_TEST_CASE(FullSnapshot1) {
   // This buffer has to be static for this to compile with Visual Studio.
   // If it is not static compilation of this file with Visual Studio takes
   // more than 30 minutes!
   static const char kFullSnapshotScriptChars[] = {
 #include "snapshot_test.dat"
   };
   const char* kScriptChars = kFullSnapshotScriptChars;
 
-  uint8_t* buffer;
+  uint8_t* vm_isolate_snapshot_buffer;
+  uint8_t* isolate_snapshot_buffer;
 
   // Start an Isolate, load a script and create a full snapshot.
   Timer timer1(true, "Snapshot_test");
   timer1.Start();
   {
     TestIsolateScope __test_isolate__;
 
     Isolate* isolate = Isolate::Current();
     StackZone zone(isolate);
     HandleScope scope(isolate);
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
     EXPECT_VALID(Api::CheckAndFinalizePendingClasses(isolate));
     timer1.Stop();
     OS::PrintErr("Without Snapshot: %" Pd64 "us\n", timer1.TotalElapsedTime());
 
     // Write snapshot with object content.
-    FullSnapshotWriter writer(&buffer, &malloc_allocator);
+    FullSnapshotWriter writer(&vm_isolate_snapshot_buffer,
+                              &isolate_snapshot_buffer,
+                              &malloc_allocator);
     writer.WriteFullSnapshot();
 
     // Invoke a function which returns an object.
     Dart_Handle cls = Dart_GetClass(lib, NewString("FieldsTest"));
     Dart_Handle result = Dart_Invoke(cls, NewString("testMain"), 0, NULL);
     EXPECT_VALID(result);
   }
 
   // Now Create another isolate using the snapshot and execute a method
   // from the script.
   Timer timer2(true, "Snapshot_test");
   timer2.Start();
-  TestCase::CreateTestIsolateFromSnapshot(buffer);
+  TestCase::CreateTestIsolateFromSnapshot(isolate_snapshot_buffer);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     timer2.Stop();
     OS::PrintErr("From Snapshot: %" Pd64 "us\n", timer2.TotalElapsedTime());
 
     // Invoke a function which returns an object.
     Dart_Handle cls = Dart_GetClass(TestCase::lib(),
                                     NewString("FieldsTest"));
     Dart_Handle result = Dart_Invoke(cls, NewString("testMain"), 0, NULL);
     if (Dart_IsError(result)) {
       // Print the error.  It is probably an unhandled exception.
       fprintf(stderr, "%s\n", Dart_GetError(result));
     }
     EXPECT_VALID(result);
     Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
-  free(buffer);
+  free(isolate_snapshot_buffer);
 }
 
 
 UNIT_TEST_CASE(ScriptSnapshot) {
   const char* kLibScriptChars =
       "library dart_import_lib;"
       "class LibFields  {"
       "  LibFields(int i, int j) : fld1 = i, fld2 = j {}"
       "  int fld1;"
       "  final int fld2;"
@@ skipping 29 matching lines @@
       "    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* vm_isolate_snapshot = NULL;
+  intptr_t vm_isolate_snapshot_size;
+  uint8_t* isolate_snapshot = NULL;
+  intptr_t isolate_snapshot_size;
   uint8_t* full_snapshot = NULL;
   uint8_t* script_snapshot = NULL;
   intptr_t expected_num_libs;
   intptr_t actual_num_libs;
 
   {
     // 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);
+    result = Dart_CreateSnapshot(&vm_isolate_snapshot,
+                                 &vm_isolate_snapshot_size,
+                                 &isolate_snapshot,
+                                 &isolate_snapshot_size);
     EXPECT_VALID(result);
-    full_snapshot = reinterpret_cast<uint8_t*>(malloc(size));
-    memmove(full_snapshot, buffer, size);
+    full_snapshot = reinterpret_cast<uint8_t*>(malloc(isolate_snapshot_size));
+    memmove(full_snapshot, isolate_snapshot, isolate_snapshot_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.
 
     // Load the library.
@@ skipping 57 matching lines @@
 UNIT_TEST_CASE(ScriptSnapshot1) {
   const char* kScriptChars =
     "class _SimpleNumEnumerable<T extends num> {"
       "final Iterable<T> _source;"
       "const _SimpleNumEnumerable(this._source) : super();"
     "}";
 
   Dart_Handle result;
   uint8_t* buffer;
   intptr_t size;
+  uint8_t* vm_isolate_snapshot = NULL;
+  intptr_t vm_isolate_snapshot_size;
+  uint8_t* isolate_snapshot = NULL;
+  intptr_t isolate_snapshot_size;
   uint8_t* full_snapshot = NULL;
   uint8_t* script_snapshot = NULL;
 
   {
     // 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);
+    result = Dart_CreateSnapshot(&vm_isolate_snapshot,
+                                 &vm_isolate_snapshot_size,
+                                 &isolate_snapshot,
+                                 &isolate_snapshot_size);
     EXPECT_VALID(result);
-    full_snapshot = reinterpret_cast<uint8_t*>(malloc(size));
-    memmove(full_snapshot, buffer, size);
+    full_snapshot = reinterpret_cast<uint8_t*>(malloc(isolate_snapshot_size));
+    memmove(full_snapshot, isolate_snapshot, isolate_snapshot_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.
@@ skipping 44 matching lines @@
       "test_i() {"
       "  i;"
       "}"
       "test_b() {"
       "  b = 0;"
       "}";
   Dart_Handle result;
 
   uint8_t* buffer;
   intptr_t size;
+  uint8_t* vm_isolate_snapshot = NULL;
+  intptr_t vm_isolate_snapshot_size;
+  uint8_t* isolate_snapshot = NULL;
+  intptr_t isolate_snapshot_size;
   uint8_t* full_snapshot = NULL;
   uint8_t* script_snapshot = NULL;
 
   // Force creation of snapshot in production mode.
   bool saved_mode = FLAG_enable_type_checks;
   FLAG_enable_type_checks = false;
 
   {
     // 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);
+    result = Dart_CreateSnapshot(&vm_isolate_snapshot,
+                                 &vm_isolate_snapshot_size,
+                                 &isolate_snapshot,
+                                 &isolate_snapshot_size);
     EXPECT_VALID(result);
-    full_snapshot = reinterpret_cast<uint8_t*>(malloc(size));
-    memmove(full_snapshot, buffer, size);
+    full_snapshot = reinterpret_cast<uint8_t*>(malloc(isolate_snapshot_size));
+    memmove(full_snapshot, isolate_snapshot, isolate_snapshot_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.
 
     // Load the library.
@@ skipping 1349 matching lines @@
   StackZone zone(Isolate::Current());
   uint8_t* buffer;
   MessageWriter writer(&buffer, &zone_allocator, true);
   writer.WriteInlinedObjectHeader(kOmittedObjectId);
   // For performance, we'd like single-byte headers when ids are omitted.
   // If this starts failing, consider renumbering the snapshot ids.
   EXPECT_EQ(1, writer.BytesWritten());
 }
 
 }  // namespace dart