Pass ArrayBuffer::Allocator via Isolate::CreateParams

test/cctest/test-log.cc

 // Copyright 2006-2009 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 36 matching lines @@
 #include "test/cctest/cctest.h"
 
 using v8::internal::Address;
 using v8::internal::EmbeddedVector;
 using v8::internal::Logger;
 using v8::internal::StrLength;
 
 namespace {
 
 
+#define SETUP_FLAGS()                            \
+  bool saved_log = i::FLAG_log;                  \
+  bool saved_prof = i::FLAG_prof;                \
+  i::FLAG_log = true;                            \
+  i::FLAG_prof = true;                           \
+  i::FLAG_logfile = i::Log::kLogToTemporaryFile; \
+  i::FLAG_logfile_per_isolate = false
+
+
 class ScopedLoggerInitializer {
  public:
-  ScopedLoggerInitializer()
-      : saved_log_(i::FLAG_log),
-        saved_prof_(i::FLAG_prof),
+  ScopedLoggerInitializer(bool saved_log, bool saved_prof, v8::Isolate* isolate)
+      : saved_log_(saved_log),
+        saved_prof_(saved_prof),
         temp_file_(NULL),
-        // Need to run this prior to creating the scope.
-        trick_to_run_init_flags_(init_flags_()),
-        isolate_(v8::Isolate::New()),
-        isolate_scope_(isolate_),
-        scope_(isolate_),
-        env_(v8::Context::New(isolate_)),
-        logger_(reinterpret_cast<i::Isolate*>(isolate_)->logger()) {
+        isolate_(isolate),
+        isolate_scope_(isolate),
+        scope_(isolate),
+        env_(v8::Context::New(isolate)),
+        logger_(reinterpret_cast<i::Isolate*>(isolate)->logger()) {
     env_->Enter();
   }
 
   ~ScopedLoggerInitializer() {
     env_->Exit();
     logger_->TearDown();
     if (temp_file_ != NULL) fclose(temp_file_);
     i::FLAG_prof = saved_prof_;
     i::FLAG_log = saved_log_;
   }
 
   v8::Handle<v8::Context>& env() { return env_; }
 
   v8::Isolate* isolate() { return isolate_; }
 
   Logger* logger() { return logger_; }
 
   FILE* StopLoggingGetTempFile() {
     temp_file_ = logger_->TearDown();
     CHECK(temp_file_);
     fflush(temp_file_);
     rewind(temp_file_);
     return temp_file_;
   }
 
  private:
-  static bool init_flags_() {
-    i::FLAG_log = true;
-    i::FLAG_prof = true;
-    i::FLAG_logfile = i::Log::kLogToTemporaryFile;
-    i::FLAG_logfile_per_isolate = false;
-    return false;
-  }
-
   const bool saved_log_;
   const bool saved_prof_;
   FILE* temp_file_;
-  const bool trick_to_run_init_flags_;
   v8::Isolate* isolate_;
   v8::Isolate::Scope isolate_scope_;
   v8::HandleScope scope_;
   v8::Handle<v8::Context> env_;
   Logger* logger_;
 
   DISALLOW_COPY_AND_ASSIGN(ScopedLoggerInitializer);
 };
 
 }  // namespace
@@ skipping 212 matching lines @@
   // Must not crash.
   CcTest::i_isolate()->logger()->LogCompiledFunctions();
 }
 
 
 static void ObjMethod1(const v8::FunctionCallbackInfo<v8::Value>& args) {
 }
 
 
 TEST(LogCallbacks) {
-  v8::Isolate* isolate;
+  SETUP_FLAGS();
+  v8::Isolate::CreateParams create_params;
+  create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
+  v8::Isolate* isolate = v8::Isolate::New(create_params);
   {
-    ScopedLoggerInitializer initialize_logger;
-    isolate = initialize_logger.isolate();
+    ScopedLoggerInitializer initialize_logger(saved_log, saved_prof, isolate);
     Logger* logger = initialize_logger.logger();
 
     v8::Local<v8::FunctionTemplate> obj = v8::Local<v8::FunctionTemplate>::New(
         isolate, v8::FunctionTemplate::New(isolate));
     obj->SetClassName(v8_str("Obj"));
     v8::Handle<v8::ObjectTemplate> proto = obj->PrototypeTemplate();
     v8::Local<v8::Signature> signature = v8::Signature::New(isolate, obj);
     proto->Set(v8_str("method1"),
                v8::FunctionTemplate::New(isolate, ObjMethod1,
                                          v8::Handle<v8::Value>(), signature),
@@ skipping 29 matching lines @@
                         v8::Local<v8::Value> value,
                         const v8::PropertyCallbackInfo<void>& info) {
 }
 
 static void Prop2Getter(v8::Local<v8::String> property,
                         const v8::PropertyCallbackInfo<v8::Value>& info) {
 }
 
 
 TEST(LogAccessorCallbacks) {
-  v8::Isolate* isolate;
+  SETUP_FLAGS();
+  v8::Isolate::CreateParams create_params;
+  create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
+  v8::Isolate* isolate = v8::Isolate::New(create_params);
   {
-    ScopedLoggerInitializer initialize_logger;
-    isolate = initialize_logger.isolate();
+    ScopedLoggerInitializer initialize_logger(saved_log, saved_prof, isolate);
     Logger* logger = initialize_logger.logger();
 
     v8::Local<v8::FunctionTemplate> obj = v8::Local<v8::FunctionTemplate>::New(
         isolate, v8::FunctionTemplate::New(isolate));
     obj->SetClassName(v8_str("Obj"));
     v8::Handle<v8::ObjectTemplate> inst = obj->InstanceTemplate();
     inst->SetAccessor(v8_str("prop1"), Prop1Getter, Prop1Setter);
     inst->SetAccessor(v8_str("prop2"), Prop2Getter);
 
     logger->LogAccessorCallbacks();
@@ skipping 32 matching lines @@
 // Test that logging of code create / move events is equivalent to traversal of
 // a resulting heap.
 TEST(EquivalenceOfLoggingAndTraversal) {
   // This test needs to be run on a "clean" V8 to ensure that snapshot log
   // is loaded. This is always true when running using tools/test.py because
   // it launches a new cctest instance for every test. To be sure that launching
   // cctest manually also works, please be sure that no tests below
   // are using V8.
 
   // Start with profiling to capture all code events from the beginning.
-  v8::Isolate* isolate;
+  SETUP_FLAGS();
+  v8::Isolate::CreateParams create_params;
+  create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
+  v8::Isolate* isolate = v8::Isolate::New(create_params);
   {
-    ScopedLoggerInitializer initialize_logger;
-    isolate = initialize_logger.isolate();
+    ScopedLoggerInitializer initialize_logger(saved_log, saved_prof, isolate);
     Logger* logger = initialize_logger.logger();
 
     // Compile and run a function that creates other functions.
     CompileRun(
         "(function f(obj) {\n"
         "  obj.test =\n"
         "    (function a(j) { return function b() { return j; } })(100);\n"
         "})(this);");
     logger->StopProfiler();
     reinterpret_cast<i::Isolate*>(isolate)->heap()->CollectAllGarbage(
@@ skipping 38 matching lines @@
       // Make sure that our output is written prior crash due to CHECK failure.
       fflush(stdout);
       CHECK(false);
     }
   }
   isolate->Dispose();
 }
 
 
 TEST(LogVersion) {
-  v8::Isolate* isolate;
+  SETUP_FLAGS();
+  v8::Isolate::CreateParams create_params;
+  create_params.array_buffer_allocator = CcTest::array_buffer_allocator();
+  v8::Isolate* isolate = v8::Isolate::New(create_params);
   {
-    ScopedLoggerInitializer initialize_logger;
-    isolate = initialize_logger.isolate();
+    ScopedLoggerInitializer initialize_logger(saved_log, saved_prof, isolate);
     bool exists = false;
     i::Vector<const char> log(
         i::ReadFile(initialize_logger.StopLoggingGetTempFile(), &exists, true));
     CHECK(exists);
     i::EmbeddedVector<char, 100> ref_data;
     i::SNPrintF(ref_data, "v8-version,%d,%d,%d,%d,%d", i::Version::GetMajor(),
                 i::Version::GetMinor(), i::Version::GetBuild(),
                 i::Version::GetPatch(), i::Version::IsCandidate());
     CHECK(StrNStr(log.start(), ref_data.start(), log.length()));
     log.Dispose();
   }
   isolate->Dispose();
 }