diff options
author | Joyee Cheung <joyeec9h3@gmail.com> | 2019-03-23 07:39:52 +0800 |
---|---|---|
committer | Joyee Cheung <joyeec9h3@gmail.com> | 2019-04-19 15:38:23 +0800 |
commit | e0e308448240260c207958dfc3dd9245d903af85 (patch) | |
tree | 611f54d2aac113f735f7a3047f2857561192e969 /src | |
parent | 57ab3b56fcba725e1af4ed7f8a05bbdbd0b8a4d9 (diff) | |
download | android-node-v8-e0e308448240260c207958dfc3dd9245d903af85.tar.gz android-node-v8-e0e308448240260c207958dfc3dd9245d903af85.tar.bz2 android-node-v8-e0e308448240260c207958dfc3dd9245d903af85.zip |
inspector: implement --cpu-prof[-path]
This patch introduces a CLI flag --cpu-prof that starts the V8
CPU profiler on start up, and ends the profiler then writes the
CPU profile before the Node.js instance (on the main thread or
the worker thread) exits. By default the profile is written to
`${cwd}/CPU.${yyyymmdd}.${hhmmss}.${pid}.${tid}.${seq}.cpuprofile`.
The patch also introduces a --cpu-prof-path flag for the user
to specify the path the profile will be written to.
Refs: https://github.com/nodejs/node/issues/26878
PR-URL: https://github.com/nodejs/node/pull/27147
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Diffstat (limited to 'src')
-rw-r--r-- | src/env-inl.h | 19 | ||||
-rw-r--r-- | src/env.h | 10 | ||||
-rw-r--r-- | src/inspector_profiler.cc | 146 | ||||
-rw-r--r-- | src/inspector_profiler.h | 18 | ||||
-rw-r--r-- | src/node.cc | 6 | ||||
-rw-r--r-- | src/node_internals.h | 1 | ||||
-rw-r--r-- | src/node_options.cc | 12 | ||||
-rw-r--r-- | src/node_options.h | 4 |
8 files changed, 213 insertions, 3 deletions
diff --git a/src/env-inl.h b/src/env-inl.h index e8943ffaf5..3a6caa19f8 100644 --- a/src/env-inl.h +++ b/src/env-inl.h @@ -659,6 +659,25 @@ inline profiler::V8CoverageConnection* Environment::coverage_connection() { inline const std::string& Environment::coverage_directory() const { return coverage_directory_; } + +inline void Environment::set_cpu_profiler_connection( + std::unique_ptr<profiler::V8CpuProfilerConnection> connection) { + CHECK_NULL(cpu_profiler_connection_); + std::swap(cpu_profiler_connection_, connection); +} + +inline profiler::V8CpuProfilerConnection* +Environment::cpu_profiler_connection() { + return cpu_profiler_connection_.get(); +} + +inline void Environment::set_cpu_profile_path(const std::string& path) { + cpu_profile_path_ = path; +} + +inline const std::string& Environment::cpu_profile_path() const { + return cpu_profile_path_; +} #endif // HAVE_INSPECTOR inline std::shared_ptr<HostPort> Environment::inspector_host_port() { @@ -71,6 +71,7 @@ class AgentWriterHandle; #if HAVE_INSPECTOR namespace profiler { class V8CoverageConnection; +class V8CpuProfilerConnection; } // namespace profiler #endif // HAVE_INSPECTOR @@ -1129,6 +1130,13 @@ class Environment : public MemoryRetainer { inline void set_coverage_directory(const char* directory); inline const std::string& coverage_directory() const; + + void set_cpu_profiler_connection( + std::unique_ptr<profiler::V8CpuProfilerConnection> connection); + profiler::V8CpuProfilerConnection* cpu_profiler_connection(); + + inline void set_cpu_profile_path(const std::string& path); + inline const std::string& cpu_profile_path() const; #endif // HAVE_INSPECTOR private: @@ -1163,7 +1171,9 @@ class Environment : public MemoryRetainer { #if HAVE_INSPECTOR std::unique_ptr<profiler::V8CoverageConnection> coverage_connection_; + std::unique_ptr<profiler::V8CpuProfilerConnection> cpu_profiler_connection_; std::string coverage_directory_; + std::string cpu_profile_path_; #endif // HAVE_INSPECTOR std::shared_ptr<EnvironmentOptions> options_; diff --git a/src/inspector_profiler.cc b/src/inspector_profiler.cc index 27b1db14c9..46d4c4fec8 100644 --- a/src/inspector_profiler.cc +++ b/src/inspector_profiler.cc @@ -23,10 +23,14 @@ using v8::Value; using v8_inspector::StringBuffer; using v8_inspector::StringView; -#ifdef __POSIX__ -const char* const kPathSeparator = "/"; -#else +#ifdef _WIN32 const char* const kPathSeparator = "\\/"; +/* MAX_PATH is in characters, not bytes. Make sure we have enough headroom. */ +#define CWD_BUFSIZE (MAX_PATH * 4) +#else +#include <climits> // PATH_MAX on Solaris. +const char* const kPathSeparator = "/"; +#define CWD_BUFSIZE (PATH_MAX) #endif std::unique_ptr<StringBuffer> ToProtocolString(Isolate* isolate, @@ -180,6 +184,116 @@ void V8CoverageConnection::End() { DispatchMessage(end); } +void V8CpuProfilerConnection::OnMessage( + const v8_inspector::StringView& message) { + Debug(env(), + DebugCategory::INSPECTOR_PROFILER, + "Receive cpu profiling message, ending = %s\n", + ending_ ? "true" : "false"); + if (!ending_) { + return; + } + Isolate* isolate = env()->isolate(); + HandleScope handle_scope(isolate); + Local<Context> context = env()->context(); + Context::Scope context_scope(context); + Local<String> result; + if (!String::NewFromTwoByte(isolate, + message.characters16(), + NewStringType::kNormal, + message.length()) + .ToLocal(&result)) { + fprintf(stderr, "Failed to convert profiling message\n"); + } + WriteCpuProfile(result); +} + +void V8CpuProfilerConnection::WriteCpuProfile(Local<String> message) { + const std::string& path = env()->cpu_profile_path(); + CHECK(!path.empty()); + std::string directory = path.substr(0, path.find_last_of(kPathSeparator)); + if (directory != path) { + uv_fs_t req; + int ret = fs::MKDirpSync(nullptr, &req, directory, 0777, nullptr); + uv_fs_req_cleanup(&req); + if (ret < 0 && ret != UV_EEXIST) { + char err_buf[128]; + uv_err_name_r(ret, err_buf, sizeof(err_buf)); + fprintf(stderr, + "%s: Failed to create cpu profile directory %s\n", + err_buf, + directory.c_str()); + return; + } + } + MaybeLocal<String> result = GetResult(message); + if (!result.IsEmpty()) { + WriteResult(path.c_str(), result.ToLocalChecked()); + } +} + +MaybeLocal<String> V8CpuProfilerConnection::GetResult(Local<String> message) { + Local<Context> context = env()->context(); + Isolate* isolate = env()->isolate(); + Local<Value> parsed; + if (!v8::JSON::Parse(context, message).ToLocal(&parsed) || + !parsed->IsObject()) { + fprintf(stderr, "Failed to parse CPU profile result as JSON object\n"); + return MaybeLocal<String>(); + } + + Local<Value> result_v; + if (!parsed.As<Object>() + ->Get(context, FIXED_ONE_BYTE_STRING(isolate, "result")) + .ToLocal(&result_v)) { + fprintf(stderr, "Failed to get result from CPU profile message\n"); + return MaybeLocal<String>(); + } + + if (!result_v->IsObject()) { + fprintf(stderr, "'result' from CPU profile message is not an object\n"); + return MaybeLocal<String>(); + } + + Local<Value> profile_v; + if (!result_v.As<Object>() + ->Get(context, FIXED_ONE_BYTE_STRING(isolate, "profile")) + .ToLocal(&profile_v)) { + fprintf(stderr, "'profile' from CPU profile result is undefined\n"); + return MaybeLocal<String>(); + } + + Local<String> result_s; + if (!v8::JSON::Stringify(context, profile_v).ToLocal(&result_s)) { + fprintf(stderr, "Failed to stringify CPU profile result\n"); + return MaybeLocal<String>(); + } + + return result_s; +} + +void V8CpuProfilerConnection::Start() { + Debug(env(), DebugCategory::INSPECTOR_PROFILER, "Sending Profiler.start\n"); + Isolate* isolate = env()->isolate(); + Local<String> enable = FIXED_ONE_BYTE_STRING( + isolate, R"({"id": 1, "method": "Profiler.enable"})"); + Local<String> start = FIXED_ONE_BYTE_STRING( + isolate, R"({"id": 2, "method": "Profiler.start"})"); + DispatchMessage(enable); + DispatchMessage(start); +} + +void V8CpuProfilerConnection::End() { + CHECK_EQ(ending_, false); + ending_ = true; + Debug(env(), DebugCategory::INSPECTOR_PROFILER, "Sending Profiler.stop\n"); + Isolate* isolate = env()->isolate(); + HandleScope scope(isolate); + Local<String> end = + FIXED_ONE_BYTE_STRING(isolate, R"({"id": 3, "method": "Profiler.stop"})"); + DispatchMessage(end); +} + // For now, we only support coverage profiling, but we may add more // in the future. void EndStartedProfilers(Environment* env) { @@ -190,6 +304,12 @@ void EndStartedProfilers(Environment* env) { env, DebugCategory::INSPECTOR_PROFILER, "Ending coverage collection\n"); connection->End(); } + + connection = env->cpu_profiler_connection(); + if (connection != nullptr && !connection->ending()) { + Debug(env, DebugCategory::INSPECTOR_PROFILER, "Ending cpu profiling\n"); + connection->End(); + } } void StartCoverageCollection(Environment* env) { @@ -198,6 +318,26 @@ void StartCoverageCollection(Environment* env) { env->coverage_connection()->Start(); } +void StartCpuProfiling(Environment* env, const std::string& profile_path) { + std::string path; + if (profile_path.empty()) { + char cwd[CWD_BUFSIZE]; + size_t size = CWD_BUFSIZE; + int err = uv_cwd(cwd, &size); + // TODO(joyeecheung): fallback to exec path / argv[0] + CHECK_EQ(err, 0); + CHECK_GT(size, 0); + DiagnosticFilename filename(env, "CPU", "cpuprofile"); + path = cwd + std::string(kPathSeparator) + (*filename); + } else { + path = profile_path; + } + env->set_cpu_profile_path(std::move(path)); + env->set_cpu_profiler_connection( + std::make_unique<V8CpuProfilerConnection>(env)); + env->cpu_profiler_connection()->Start(); +} + static void SetCoverageDirectory(const FunctionCallbackInfo<Value>& args) { CHECK(args[0]->IsString()); Environment* env = Environment::GetCurrent(args); diff --git a/src/inspector_profiler.h b/src/inspector_profiler.h index 43a8d54163..7120819c13 100644 --- a/src/inspector_profiler.h +++ b/src/inspector_profiler.h @@ -68,6 +68,24 @@ class V8CoverageConnection : public V8ProfilerConnection { bool ending_ = false; }; +class V8CpuProfilerConnection : public V8ProfilerConnection { + public: + explicit V8CpuProfilerConnection(Environment* env) + : V8ProfilerConnection(env) {} + + void Start() override; + void End() override; + void OnMessage(const v8_inspector::StringView& message) override; + bool ending() const override { return ending_; } + + private: + void WriteCpuProfile(v8::Local<v8::String> message); + v8::MaybeLocal<v8::String> GetResult(v8::Local<v8::String> message); + + std::unique_ptr<inspector::InspectorSession> session_; + bool ending_ = false; +}; + } // namespace profiler } // namespace node diff --git a/src/node.cc b/src/node.cc index c3b0a50e38..9cdc4e5e2a 100644 --- a/src/node.cc +++ b/src/node.cc @@ -237,6 +237,12 @@ MaybeLocal<Value> RunBootstrapping(Environment* env) { #endif // HAVE_INSPECTOR } +#if HAVE_INSPECTOR + if (env->options()->cpu_prof) { + profiler::StartCpuProfiling(env, env->options()->cpu_prof_path); + } +#endif // HAVE_INSPECTOR + // Add a reference to the global object Local<Object> global = context->Global(); diff --git a/src/node_internals.h b/src/node_internals.h index 53f7d3cdba..5e7bd18dce 100644 --- a/src/node_internals.h +++ b/src/node_internals.h @@ -314,6 +314,7 @@ void MarkBootstrapComplete(const v8::FunctionCallbackInfo<v8::Value>& args); #if HAVE_INSPECTOR namespace profiler { void StartCoverageCollection(Environment* env); +void StartCpuProfiling(Environment* env, const std::string& profile_name); void EndStartedProfilers(Environment* env); } #endif // HAVE_INSPECTOR diff --git a/src/node_options.cc b/src/node_options.cc index d9c0d472fb..db92a0c2fd 100644 --- a/src/node_options.cc +++ b/src/node_options.cc @@ -332,6 +332,18 @@ EnvironmentOptionsParser::EnvironmentOptionsParser() { &EnvironmentOptions::prof_process); // Options after --prof-process are passed through to the prof processor. AddAlias("--prof-process", { "--prof-process", "--" }); +#if HAVE_INSPECTOR + AddOption("--cpu-prof", + "Start the V8 CPU profiler on start up, and write the CPU profile " + "to disk before exit. If --cpu-prof-path is not specified, write " + "the profile to the current working directory.", + &EnvironmentOptions::cpu_prof); + AddOption("--cpu-prof-path", + "Path the V8 CPU profile generated with --cpu-prof will be " + "written to.", + &EnvironmentOptions::cpu_prof_path); + Implies("--cpu-prof-path", "--cpu-prof"); +#endif // HAVE_INSPECTOR AddOption("--redirect-warnings", "write warnings to file instead of stderr", &EnvironmentOptions::redirect_warnings, diff --git a/src/node_options.h b/src/node_options.h index 0fb480b397..d0d35b162e 100644 --- a/src/node_options.h +++ b/src/node_options.h @@ -109,6 +109,10 @@ class EnvironmentOptions : public Options { bool preserve_symlinks = false; bool preserve_symlinks_main = false; bool prof_process = false; +#if HAVE_INSPECTOR + std::string cpu_prof_path; + bool cpu_prof = false; +#endif // HAVE_INSPECTOR std::string redirect_warnings; bool throw_deprecation = false; bool trace_deprecation = false; |