From ee7a838b071968736d6c1f0bc2ba8da68e098a19 Mon Sep 17 00:00:00 2001
From: Daniel Bevenius <daniel.bevenius@gmail.com>
Date: Tue, 3 Jul 2018 09:37:07 +0200
Subject: [PATCH] src: add InitializeV8Platform function

This commit adds an InitializeV8Platform function which calls
v8_platform's Initialize to create the NodePlatform and also set the
structs members.

When running cctests this functions was not being called (it is called
from the Start function but that function is not called by the test
fixture.

The motivation for adding this is that I'm guessing that embedders
would might need the ability to do the same thing.

Refs: https://github.com/nodejs/node-v8/issues/69
---
 src/node.cc                     | 8 +++++++-
 src/node.h                      | 1 +
 test/cctest/node_test_fixture.h | 8 +++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/node.cc b/src/node.cc
index 3c2ca23ef684d0..704f260068ab84 100644
--- a/src/node.cc
+++ b/src/node.cc
@@ -3602,6 +3602,12 @@ MultiIsolatePlatform* CreatePlatform(
 }
 
 
+MultiIsolatePlatform* InitializeV8Platform(int thread_pool_size) {
+  v8_platform.Initialize(thread_pool_size);
+  return v8_platform.Platform();
+}
+
+
 void FreePlatform(MultiIsolatePlatform* platform) {
   delete platform;
 }
@@ -3816,7 +3822,7 @@ int Start(int argc, char** argv) {
   V8::SetEntropySource(crypto::EntropySource);
 #endif  // HAVE_OPENSSL
 
-  v8_platform.Initialize(v8_thread_pool_size);
+  InitializeV8Platform(v8_thread_pool_size);
   V8::Initialize();
   performance::performance_v8_start = PERFORMANCE_NOW();
   v8_initialized = true;
diff --git a/src/node.h b/src/node.h
index 292abdd4378015..eb883b1c402307 100644
--- a/src/node.h
+++ b/src/node.h
@@ -284,6 +284,7 @@ NODE_EXTERN MultiIsolatePlatform* GetMainThreadMultiIsolatePlatform();
 NODE_EXTERN MultiIsolatePlatform* CreatePlatform(
     int thread_pool_size,
     v8::TracingController* tracing_controller);
+MultiIsolatePlatform* InitializeV8Platform(int thread_pool_size);
 NODE_EXTERN void FreePlatform(MultiIsolatePlatform* platform);
 
 NODE_EXTERN void EmitBeforeExit(Environment* env);
diff --git a/test/cctest/node_test_fixture.h b/test/cctest/node_test_fixture.h
index 4a729be09c2d0b..775a211f54380a 100644
--- a/test/cctest/node_test_fixture.h
+++ b/test/cctest/node_test_fixture.h
@@ -70,9 +70,9 @@ class NodeTestFixture : public ::testing::Test {
     tracing_controller.reset(new v8::TracingController());
     node::tracing::TraceEventHelper::SetTracingController(
         tracing_controller.get());
-    platform.reset(new node::NodePlatform(4, nullptr));
     CHECK_EQ(0, uv_loop_init(&current_loop));
-    v8::V8::InitializePlatform(platform.get());
+    platform.reset(static_cast<node::NodePlatform*>(
+          node::InitializeV8Platform(4)));
     v8::V8::Initialize();
   }
 
@@ -88,10 +88,8 @@ class NodeTestFixture : public ::testing::Test {
   virtual void SetUp() {
     allocator = ArrayBufferUniquePtr(node::CreateArrayBufferAllocator(),
                                      &node::FreeArrayBufferAllocator);
-    isolate_ = NewIsolate(allocator.get());
+    isolate_ = NewIsolate(allocator.get(), &current_loop);
     CHECK_NE(isolate_, nullptr);
-    platform->RegisterIsolate(isolate_, &current_loop);
-    v8::Isolate::Initialize(isolate_, params);
   }
 
   virtual void TearDown() {