Skip to content
Permalink
Browse files

src: fewer uses of NODE_USE_V8_PLATFORM

PR-URL: #30029
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Gus Caplan <me@gus.host>
Reviewed-By: Minwoo Jung <nodecorelab@gmail.com>
Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
  • Loading branch information...
codebytere authored and addaleax committed Oct 18, 2019
1 parent 701933c commit 71b342f93725a9bba5fa1f83a9f0fa88a482d759
Showing with 10 additions and 10 deletions.
  1. +1 −1 src/env.h
  2. +1 −1 src/node.cc
  3. +1 −1 src/node_main_instance.cc
  4. +6 −6 src/node_worker.cc
  5. +1 −1 src/node_worker.h
@@ -868,7 +868,7 @@ class Environment : public MemoryRetainer {
void CreateProperties();
// Should be called before InitializeInspector()
void InitializeDiagnostics();
#if HAVE_INSPECTOR && NODE_USE_V8_PLATFORM
#if HAVE_INSPECTOR
// If the environment is created for a worker, pass parent_handle and
// the ownership if transferred into the Environment.
int InitializeInspector(inspector::ParentInspectorHandle* parent_handle);
@@ -226,7 +226,7 @@ MaybeLocal<Value> ExecuteBootstrapper(Environment* env,
return scope.EscapeMaybe(result);
}

#if HAVE_INSPECTOR && NODE_USE_V8_PLATFORM
#if HAVE_INSPECTOR
int Environment::InitializeInspector(
inspector::ParentInspectorHandle* parent_handle) {
std::string inspector_path;
@@ -204,7 +204,7 @@ std::unique_ptr<Environment> NodeMainInstance::CreateMainEnvironment(

// TODO(joyeecheung): when we snapshot the bootstrapped context,
// the inspector and diagnostics setup should after after deserialization.
#if HAVE_INSPECTOR && NODE_USE_V8_PLATFORM
#if HAVE_INSPECTOR
*exit_code = env->InitializeInspector(nullptr);
#endif
if (*exit_code != 0) {
@@ -8,7 +8,7 @@
#include "util-inl.h"
#include "async_wrap-inl.h"

#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
#if HAVE_INSPECTOR
#include "inspector/worker_inspector.h" // ParentInspectorHandle
#endif

@@ -39,7 +39,7 @@ namespace worker {

namespace {

#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
#if HAVE_INSPECTOR
void WaitForWorkerInspectorToStop(Environment* child) {
child->inspector_agent()->WaitForDisconnect();
child->inspector_agent()->Stop();
@@ -82,7 +82,7 @@ Worker::Worker(Environment* env,
Number::New(env->isolate(), static_cast<double>(thread_id_)))
.Check();

#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
#if HAVE_INSPECTOR
inspector_parent_handle_ =
env->inspector_agent()->GetParentHandle(thread_id_, url);
#endif
@@ -193,7 +193,7 @@ void Worker::Run() {
Locker locker(isolate_);
Isolate::Scope isolate_scope(isolate_);
SealHandleScope outer_seal(isolate_);
#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
#if HAVE_INSPECTOR
bool inspector_started = false;
#endif

@@ -225,7 +225,7 @@ void Worker::Run() {
env_->stop_sub_worker_contexts();
env_->RunCleanup();
RunAtExit(env_.get());
#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
#if HAVE_INSPECTOR
if (inspector_started)
WaitForWorkerInspectorToStop(env_.get());
#endif
@@ -270,7 +270,7 @@ void Worker::Run() {
if (is_stopped()) return;
{
env_->InitializeDiagnostics();
#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
#if HAVE_INSPECTOR
env_->InitializeInspector(inspector_parent_handle_.release());
inspector_started = true;
#endif
@@ -65,7 +65,7 @@ class Worker : public AsyncWrap {
bool start_profiler_idle_notifier_;
uv_thread_t tid_;

#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
#if HAVE_INSPECTOR
std::unique_ptr<inspector::ParentInspectorHandle> inspector_parent_handle_;
#endif

0 comments on commit 71b342f

Please sign in to comment.
You can’t perform that action at this time.