Skip to content
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.

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

src: split per-process initialization and teardown routines #27276

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
46 changes: 32 additions & 14 deletions src/node.cc
Original file line number Diff line number Diff line change
Expand Up @@ -752,7 +752,7 @@ void Init(int* argc,
argv[i] = strdup(argv_[i].c_str());
}

int Start(int argc, char** argv) {
InitializationResult InitializeOncePerProcess(int argc, char** argv) {
atexit([] () { uv_tty_reset_mode(); });
PlatformInit();
per_process::node_start_time = uv_hrtime();
Expand All @@ -770,20 +770,27 @@ int Start(int argc, char** argv) {
// Hack around with the argv pointer. Used for process.title = "blah".
argv = uv_setup_args(argc, argv);

std::vector<std::string> args(argv, argv + argc);
std::vector<std::string> exec_args;
InitializationResult result;
result.args = std::vector<std::string>(argv, argv + argc);
std::vector<std::string> errors;

// This needs to run *before* V8::Initialize().
{
const int exit_code = InitializeNodeWithArgs(&args, &exec_args, &errors);
result.exit_code =
InitializeNodeWithArgs(&(result.args), &(result.exec_args), &errors);
for (const std::string& error : errors)
fprintf(stderr, "%s: %s\n", args.at(0).c_str(), error.c_str());
if (exit_code != 0) return exit_code;
fprintf(stderr, "%s: %s\n", result.args.at(0).c_str(), error.c_str());
if (result.exit_code != 0) {
result.early_return = true;
return result;
}
}

if (per_process::cli_options->print_version) {
printf("%s\n", NODE_VERSION);
return 0;
result.exit_code = 0;
result.early_return = true;
return result;
}

if (per_process::cli_options->print_v8_help) {
Expand Down Expand Up @@ -811,13 +818,10 @@ int Start(int argc, char** argv) {
V8::Initialize();
performance::performance_v8_start = PERFORMANCE_NOW();
per_process::v8_initialized = true;
return result;
}

int exit_code = 0;
{
NodeMainInstance main_instance(uv_default_loop(), args, exec_args);
exit_code = main_instance.Run();
}

void TearDownOncePerProcess() {
per_process::v8_initialized = false;
V8::Dispose();

Expand All @@ -828,8 +832,22 @@ int Start(int argc, char** argv) {
// Since uv_run cannot be called, uv_async handles held by the platform
// will never be fully cleaned up.
per_process::v8_platform.Dispose();
}

int Start(int argc, char** argv) {
InitializationResult result = InitializeOncePerProcess(argc, argv);
if (result.early_return) {
return result.exit_code;
}

{
NodeMainInstance main_instance(
uv_default_loop(), result.args, result.exec_args);
result.exit_code = main_instance.Run();
}

return exit_code;
TearDownOncePerProcess();
return result.exit_code;
}

int Stop(Environment* env) {
Expand Down
9 changes: 9 additions & 0 deletions src/node_internals.h
Original file line number Diff line number Diff line change
Expand Up @@ -311,6 +311,15 @@ v8::MaybeLocal<v8::Value> ExecuteBootstrapper(
std::vector<v8::Local<v8::Value>>* arguments);
void MarkBootstrapComplete(const v8::FunctionCallbackInfo<v8::Value>& args);

struct InitializationResult {
int exit_code = 0;
std::vector<std::string> args;
std::vector<std::string> exec_args;
bool early_return = false;
};
InitializationResult InitializeOncePerProcess(int argc, char** argv);
void TearDownOncePerProcess();

#if HAVE_INSPECTOR
namespace profiler {
void StartCoverageCollection(Environment* env);
Expand Down