From 299aefd81a1e70ddfce3e02eb6447dffe40e5983 Mon Sep 17 00:00:00 2001 From: Anna Henningsen Date: Sun, 6 Jan 2019 22:55:09 +0100 Subject: [PATCH] src: clean up `node::Init()` wrt embedder scenarios This makes the STL variant of `node::Init()` a bit more suitable for inclusion in a proper embedder API, as errors or other output are reported to the caller rather than directly being printed, and the process is not exited directly either. PR-URL: https://github.com/nodejs/node/pull/25370 Reviewed-By: Ben Noordhuis Reviewed-By: James M Snell Reviewed-By: Joyee Cheung --- src/node.cc | 115 +++++++++++++++++++++++++++++----------------------- 1 file changed, 64 insertions(+), 51 deletions(-) diff --git a/src/node.cc b/src/node.cc index 504e3b79f98f94..7b3ff284cc1239 100644 --- a/src/node.cc +++ b/src/node.cc @@ -1151,42 +1151,23 @@ inline void PlatformInit() { #endif // _WIN32 } -void ProcessArgv(std::vector* args, - std::vector* exec_args, - bool is_env) { +int ProcessGlobalArgs(std::vector* args, + std::vector* exec_args, + std::vector* errors, + bool is_env) { // Parse a few arguments which are specific to Node. std::vector v8_args; - std::vector errors{}; - { - // TODO(addaleax): The mutex here should ideally be held during the - // entire function, but that doesn't play well with the exit() calls below. - Mutex::ScopedLock lock(per_process::cli_options_mutex); - options_parser::PerProcessOptionsParser::instance.Parse( - args, - exec_args, - &v8_args, - per_process::cli_options.get(), - is_env ? kAllowedInEnvironment : kDisallowedInEnvironment, - &errors); - } - - if (!errors.empty()) { - for (auto const& error : errors) { - fprintf(stderr, "%s: %s\n", args->at(0).c_str(), error.c_str()); - } - exit(9); - } + Mutex::ScopedLock lock(per_process::cli_options_mutex); + options_parser::PerProcessOptionsParser::instance.Parse( + args, + exec_args, + &v8_args, + per_process::cli_options.get(), + is_env ? kAllowedInEnvironment : kDisallowedInEnvironment, + errors); - if (per_process::cli_options->print_version) { - printf("%s\n", NODE_VERSION); - exit(0); - } - - if (per_process::cli_options->print_v8_help) { - V8::SetFlagsFromString("--help", 6); - exit(0); - } + if (!errors->empty()) return 9; for (const std::string& cve : per_process::cli_options->security_reverts) Revert(cve.c_str()); @@ -1226,19 +1207,17 @@ void ProcessArgv(std::vector* args, } // Anything that's still in v8_argv is not a V8 or a node option. - for (size_t i = 1; i < v8_args_as_char_ptr.size(); i++) { - fprintf(stderr, "%s: bad option: %s\n", - args->at(0).c_str(), v8_args_as_char_ptr[i]); - } + for (size_t i = 1; i < v8_args_as_char_ptr.size(); i++) + errors->push_back("bad option: " + std::string(v8_args_as_char_ptr[i])); - if (v8_args_as_char_ptr.size() > 1) { - exit(9); - } -} + if (v8_args_as_char_ptr.size() > 1) return 9; + return 0; +} -void Init(std::vector* argv, - std::vector* exec_argv) { +int Init(std::vector* argv, + std::vector* exec_argv, + std::vector* errors) { // Initialize prog_start_time to get relative uptime. per_process::prog_start_time = static_cast(uv_now(uv_default_loop())); @@ -1299,11 +1278,13 @@ void Init(std::vector* argv, std::vector env_argv = SplitString("x " + node_options, ' '); env_argv[0] = argv->at(0); - ProcessArgv(&env_argv, nullptr, true); + const int exit_code = ProcessGlobalArgs(&env_argv, nullptr, errors, true); + if (exit_code != 0) return exit_code; } #endif - ProcessArgv(argv, exec_argv, false); + const int exit_code = ProcessGlobalArgs(argv, exec_argv, errors, false); + if (exit_code != 0) return exit_code; // Set the process.title immediately after processing argv if --title is set. if (!per_process::cli_options->title.empty()) @@ -1317,11 +1298,9 @@ void Init(std::vector* argv, // Initialize ICU. // If icu_data_dir is empty here, it will load the 'minimal' data. if (!i18n::InitializeICUDirectory(per_process::cli_options->icu_data_dir)) { - fprintf(stderr, - "%s: could not initialize ICU " - "(check NODE_ICU_DATA or --icu-data-dir parameters)\n", - argv->at(0).c_str()); - exit(9); + errors->push_back("could not initialize ICU " + "(check NODE_ICU_DATA or --icu-data-dir parameters)\n"); + return 9; } per_process::metadata.versions.InitializeIntlVersions(); #endif @@ -1330,6 +1309,7 @@ void Init(std::vector* argv, // otherwise embedders using node::Init to initialize everything will not be // able to set it and native modules will not load for them. node_is_initialized = true; + return 0; } // TODO(addaleax): Deprecate and eventually remove this. @@ -1339,8 +1319,25 @@ void Init(int* argc, const char*** exec_argv) { std::vector argv_(argv, argv + *argc); // NOLINT std::vector exec_argv_; + std::vector errors; + + // This (approximately) duplicates some logic that has been moved to + // node::Start(), with the difference that here we explicitly call `exit()`. + int exit_code = Init(&argv_, &exec_argv_, &errors); - Init(&argv_, &exec_argv_); + for (const std::string& error : errors) + fprintf(stderr, "%s: %s\n", argv_.at(0).c_str(), error.c_str()); + if (exit_code != 0) exit(exit_code); + + if (per_process::cli_options->print_version) { + printf("%s\n", NODE_VERSION); + exit(0); + } + + if (per_process::cli_options->print_v8_help) { + V8::SetFlagsFromString("--help", 6); // Doesn't return. + UNREACHABLE(); + } *argc = argv_.size(); *exec_argc = exec_argv_.size(); @@ -1657,6 +1654,16 @@ inline int Start(uv_loop_t* event_loop, if (isolate == nullptr) return 12; // Signal internal error. + if (per_process::cli_options->print_version) { + printf("%s\n", NODE_VERSION); + return 0; + } + + if (per_process::cli_options->print_v8_help) { + V8::SetFlagsFromString("--help", 6); // Doesn't return. + UNREACHABLE(); + } + { Mutex::ScopedLock scoped_lock(per_process::main_isolate_mutex); CHECK_NULL(per_process::main_isolate); @@ -1716,8 +1723,14 @@ int Start(int argc, char** argv) { std::vector args(argv, argv + argc); std::vector exec_args; + std::vector errors; // This needs to run *before* V8::Initialize(). - Init(&args, &exec_args); + { + const int exit_code = Init(&args, &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; + } #if HAVE_OPENSSL {