- Refactor the isolate callback mechanism to also include creation of the

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 314 matching lines @@
       "    return obj;\n"
       "  }\n"
       "}\n";
   Dart_Handle result;
 
   uint8_t* buffer;
 
   // Start an Isolate, load a script and create a full snapshot.
   Timer timer1(true, "Snapshot_test");
   timer1.Start();
-  Dart_CreateIsolate(NULL, NULL);
   {
-    Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
+    TestIsolateScope __test_isolate__;
 
     // Create a test library and Load up a test script in it.
     TestCase::LoadTestScript(kScriptChars, NULL);
     timer1.Stop();
     OS::PrintErr("Without Snapshot: %dus\n", timer1.TotalElapsedTime());
 
     // Write snapshot with object content.
     Isolate* isolate = Isolate::Current();
     Zone zone(isolate);
     HandleScope scope(isolate);
     SnapshotWriter writer(true, &buffer, &allocator);
     writer.WriteFullSnapshot();
-
-    Dart_ExitScope();  // Exit the Dart API scope.
   }
-  Dart_ShutdownIsolate();
 
   // Now Create another isolate using the snapshot and execute a method
   // from the script.
   Timer timer2(true, "Snapshot_test");
   timer2.Start();
-  Dart_CreateIsolate(buffer, NULL);
+  TestCase::CreateTestIsolateFromSnapshot(buffer);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     timer2.Stop();
     OS::PrintErr("From Snapshot: %dus\n", timer2.TotalElapsedTime());
 
     // Invoke a function which returns an object.
     result = Dart_InvokeStatic(TestCase::lib(),
                                Dart_NewString("FieldsTest"),
                                Dart_NewString("testMain"),
                                0,
                                NULL);
     EXPECT_VALID(result);
-
-    Dart_ExitScope();  // Exit the Dart API scope.
+    Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
-
   free(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;
 
   // Start an Isolate, load a script and create a full snapshot.
   Timer timer1(true, "Snapshot_test");
   timer1.Start();
-  Dart_CreateIsolate(NULL, NULL);
   {
-    Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
+    TestIsolateScope __test_isolate__;
+
     Isolate* isolate = Isolate::Current();
     Zone zone(isolate);
     HandleScope scope(isolate);
 
     // Create a test library and Load up a test script in it.
     Dart_Handle lib = TestCase::LoadTestScript(kScriptChars, NULL);
     ClassFinalizer::FinalizePendingClasses();
     timer1.Stop();
     OS::PrintErr("Without Snapshot: %dus\n", timer1.TotalElapsedTime());
 
     // Write snapshot with object content.
     SnapshotWriter writer(true, &buffer, &allocator);
     writer.WriteFullSnapshot();
 
     // Invoke a function which returns an object.
     Dart_Handle result = Dart_InvokeStatic(lib,
                                Dart_NewString("FieldsTest"),
                                Dart_NewString("testMain"),
                                0,
                                NULL);
     EXPECT_VALID(result);
-
-    Dart_ExitScope();  // Exit the Dart API scope.
   }
-  Dart_ShutdownIsolate();
 
   // Now Create another isolate using the snapshot and execute a method
   // from the script.
   Timer timer2(true, "Snapshot_test");
   timer2.Start();
-  Dart_CreateIsolate(buffer, NULL);
+  TestCase::CreateTestIsolateFromSnapshot(buffer);
   {
     Dart_EnterScope();  // Start a Dart API scope for invoking API functions.
     timer2.Stop();
     OS::PrintErr("From Snapshot: %dus\n", timer2.TotalElapsedTime());
 
     // Invoke a function which returns an object.
     Dart_Handle result = Dart_InvokeStatic(TestCase::lib(),
                                Dart_NewString("FieldsTest"),
                                Dart_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();  // Exit the Dart API scope.
+    Dart_ExitScope();
   }
   Dart_ShutdownIsolate();
-
   free(buffer);
 }
 #endif  // TARGET_ARCH_IA32.
 
 }  // namespace dart