Skip to content

bootstrap: reorganize the bootstrap process #27539

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
joyeecheung wants to merge 6 commits into from
Closed

bootstrap: reorganize the bootstrap process #27539

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7de0af7
src: inline ProcessCliArgs in the Environment constructor
joyeecheung May 20, 2019
3070585
src: create Environment properties in Environment::CreateProperties()
joyeecheung May 20, 2019
6430100
src: reorganize inspector and diagnostics initialization
joyeecheung May 20, 2019
8d400df
src: Split `RunBootstrapping()`
joyeecheung May 20, 2019
1de0c1a
fixup! src: create Environment properties in Environment::CreatePrope…
joyeecheung May 31, 2019
bd13830
fixup! src: reorganize inspector and diagnostics initialization
joyeecheung Jun 1, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
fixup! src: reorganize inspector and diagnostics initialization
  • Loading branch information
@joyeecheung
joyeecheung committed Jun 1, 2019
commit bd13830d0ba1c6ba2d8ffa5dc15c6cb7c4ae2995
3 changes: 2 additions & 1 deletion src/env.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -799,12 +799,13 @@ class Environment : public MemoryRetainer {
void MemoryInfo(MemoryTracker* tracker) const override;

void CreateProperties();
// Should be called before InitializeInspector()
void InitializeDiagnostics();
#if HAVE_INSPECTOR && NODE_USE_V8_PLATFORM
// 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);
#endif
void InitializeDiagnostics();

v8::MaybeLocal<v8::Value> BootstrapInternalLoaders();
v8::MaybeLocal<v8::Value> BootstrapNode();
Expand Down
1 change: 1 addition & 0 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ int Environment::InitializeInspector(
} else {
inspector_path = argv_.size() > 1 ? argv_[1].c_str() : "";
}

CHECK(!inspector_agent_->IsListening());
// Inspector agent can't fail to start, but if it was configured to listen
// right away on the websocket port and fails to bind/etc, this will return
Expand Down
2 changes: 1 addition & 1 deletion src/node_main_instance.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,6 +194,7 @@ std::unique_ptr<Environment> NodeMainInstance::CreateMainEnvironment(
Environment::kOwnsProcessState |
Environment::kOwnsInspector));
env->InitializeLibuv(per_process::v8_is_profiling);
env->InitializeDiagnostics();

// TODO(joyeecheung): when we snapshot the bootstrapped context,
// the inspector and diagnostics setup should after after deserialization.
Expand All @@ -204,7 +205,6 @@ std::unique_ptr<Environment> NodeMainInstance::CreateMainEnvironment(
return env;
}

env->InitializeDiagnostics();
if (env->RunBootstrapping().IsEmpty()) {
*exit_code = 1;
}
Expand Down
3 changes: 1 addition & 2 deletions src/node_worker.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ Worker::Worker(Environment* env,
per_isolate_opts_(per_isolate_opts),
exec_argv_(exec_argv),
platform_(env->isolate_data()->platform()),
// XXX(joyeecheung): should this be per_process::v8_is_profiling instead?
start_profiler_idle_notifier_(env->profiler_idle_notifier_started()),
Comment thread
joyeecheung marked this conversation as resolved.
thread_id_(Environment::AllocateThreadId()),
env_vars_(env->env_vars()) {
Expand Down Expand Up @@ -263,11 +262,11 @@ void Worker::Run() {
Debug(this, "Created Environment for worker with id %llu", thread_id_);
if (is_stopped()) return;
{
env_->InitializeDiagnostics();
#if NODE_USE_V8_PLATFORM && HAVE_INSPECTOR
env_->InitializeInspector(inspector_parent_handle_.release());
inspector_started = true;
#endif
env_->InitializeDiagnostics();
HandleScope handle_scope(isolate_);
AsyncCallbackScope callback_scope(env_.get());
env_->async_hooks()->push_async_ids(1, 0);
Expand Down