fixup! process: split execution into main scripts

joyeecheung · joyeecheung · commit 455c9234591a · 2019-01-30T07:20:53.000+08:00
diff --git a/src/node.cc b/src/node.cc
@@ -777,7 +777,7 @@ MaybeLocal<Value> StartMainThreadExecution(Environment* env) {
     return StartExecution(env, "internal/main/print_bash_completion");
   }
 
-  if (per_process::cli_options->prof_process) {
+  if (env->options()->prof_process) {
     env->set_execution_mode(Environment::ExecutionMode::kPrintBashCompletion);
     return StartExecution(env, "internal/main/prof_process");
   }
diff --git a/src/node_options.cc b/src/node_options.cc
@@ -205,6 +205,11 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() {
   AddOption("--preserve-symlinks-main",
             "preserve symbolic links when resolving the main module",
             &EnvironmentOptions::preserve_symlinks_main);
+  AddOption("--prof-process",
+            "process V8 profiler output generated using --prof",
+            &EnvironmentOptions::prof_process);
+  // Options after --prof-process are passed through to the prof processor.
+  AddAlias("--prof-process", { "--prof-process", "--" });
   AddOption("--redirect-warnings",
             "write warnings to file instead of stderr",
             &EnvironmentOptions::redirect_warnings,
@@ -382,11 +387,6 @@ PerProcessOptionsParser::PerProcessOptionsParser() {
   AddOption("--v8-options",
             "print V8 command line options",
             &PerProcessOptions::print_v8_help);
-  AddOption("--prof-process",
-            "process V8 profiler output generated using --prof",
-            &PerProcessOptions::prof_process);
-  // Options after --prof-process are passed through to the prof processor.
-  AddAlias("--prof-process", {"--prof-process", "--"});
 
 #ifdef NODE_HAVE_I18N_SUPPORT
   AddOption("--icu-data-dir",
diff --git a/src/node_options.h b/src/node_options.h
@@ -107,6 +107,7 @@ class EnvironmentOptions : public Options {
   bool pending_deprecation = false;
   bool preserve_symlinks = false;
   bool preserve_symlinks_main = false;
+  bool prof_process = false;
   std::string redirect_warnings;
   bool throw_deprecation = false;
   bool trace_deprecation = false;
@@ -174,7 +175,6 @@ class PerProcessOptions : public Options {
   bool print_help = false;
   bool print_v8_help = false;
   bool print_version = false;
-  bool prof_process = false;
 
 #ifdef NODE_HAVE_I18N_SUPPORT
   std::string icu_data_dir;
diff --git a/src/node_process_object.cc b/src/node_process_object.cc
@@ -238,7 +238,7 @@ MaybeLocal<Object> CreateProcessObject(
 
   // --prof-process
   // TODO(addaleax): Remove this.
-  if (per_process::cli_options->prof_process) {
+  if (env->options()->prof_process) {
     READONLY_PROPERTY(process, "profProcess", True(env->isolate()));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -777,7 +777,7 @@ MaybeLocal<Value> StartMainThreadExecution(Environment* env) {`
`777`	`777`	`return StartExecution(env, "internal/main/print_bash_completion");`
`778`	`778`	`}`
`779`	`779`
`780`		`- if (per_process::cli_options->prof_process) {`
	`780`	`+ if (env->options()->prof_process) {`
`781`	`781`	`env->set_execution_mode(Environment::ExecutionMode::kPrintBashCompletion);`
`782`	`782`	`return StartExecution(env, "internal/main/prof_process");`
`783`	`783`	`}`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ MaybeLocal<Object> CreateProcessObject(`
`238`	`238`
`239`	`239`	`// --prof-process`
`240`	`240`	`// TODO(addaleax): Remove this.`
`241`		`- if (per_process::cli_options->prof_process) {`
	`241`	`+ if (env->options()->prof_process) {`
`242`	`242`	`READONLY_PROPERTY(process, "profProcess", True(env->isolate()));`
`243`	`243`	`}`
`244`	`244`