Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nodejs/node.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnna Henningsen <anna@addaleax.net>2019-11-02 21:06:47 +0300
committerAnna Henningsen <anna@addaleax.net>2019-11-07 01:26:03 +0300
commit5bf43729a403b992cc90b5cdbbaaf505769d1107 (patch)
treee0f7eea86af950fdfc8cecaca63a6334d2072159 /src/inspector_profiler.cc
parent55f98df303939774639bb597c6392c1c85bae6dd (diff)
src: make EndStartedProfilers an exit hook
Run `EndStartedProfilers` on Environment teardown. This is part of a series of changes to make embedding easier, by requiring fewer internal methods to build a fully functioning Node.js instance. PR-URL: https://github.com/nodejs/node/pull/30229 Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: Gireesh Punathil <gpunathi@in.ibm.com> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com> Reviewed-By: Shelley Vohr <codebytere@gmail.com>
Diffstat (limited to 'src/inspector_profiler.cc')
-rw-r--r--src/inspector_profiler.cc27
1 files changed, 21 insertions, 6 deletions
diff --git a/src/inspector_profiler.cc b/src/inspector_profiler.cc
index b5f63b2b413..e0d02d6952a 100644
--- a/src/inspector_profiler.cc
+++ b/src/inspector_profiler.cc
@@ -4,6 +4,7 @@
#include "diagnosticfilename-inl.h"
#include "memory_tracker-inl.h"
#include "node_file.h"
+#include "node_errors.h"
#include "node_internals.h"
#include "util-inl.h"
#include "v8-inspector.h"
@@ -13,6 +14,7 @@
namespace node {
namespace profiler {
+using errors::TryCatchScope;
using v8::Context;
using v8::Function;
using v8::FunctionCallbackInfo;
@@ -219,12 +221,21 @@ void V8CoverageConnection::WriteProfile(Local<String> message) {
}
// append source-map cache information to coverage object:
- Local<Function> source_map_cache_getter = env_->source_map_cache_getter();
Local<Value> source_map_cache_v;
- if (!source_map_cache_getter->Call(env()->context(),
- Undefined(isolate), 0, nullptr)
- .ToLocal(&source_map_cache_v)) {
- return;
+ {
+ TryCatchScope try_catch(env());
+ {
+ Isolate::AllowJavascriptExecutionScope allow_js_here(isolate);
+ Local<Function> source_map_cache_getter = env_->source_map_cache_getter();
+ if (!source_map_cache_getter->Call(
+ context, Undefined(isolate), 0, nullptr)
+ .ToLocal(&source_map_cache_v)) {
+ return;
+ }
+ }
+ if (try_catch.HasCaught() && !try_catch.HasTerminated()) {
+ PrintCaughtException(isolate, context, try_catch);
+ }
}
// Avoid writing to disk if no source-map data:
if (!source_map_cache_v->IsUndefined()) {
@@ -351,7 +362,7 @@ void V8HeapProfilerConnection::End() {
// For now, we only support coverage profiling, but we may add more
// in the future.
-void EndStartedProfilers(Environment* env) {
+static void EndStartedProfilers(Environment* env) {
Debug(env, DebugCategory::INSPECTOR_PROFILER, "EndStartedProfilers\n");
V8ProfilerConnection* connection = env->cpu_profiler_connection();
if (connection != nullptr && !connection->ending()) {
@@ -390,6 +401,10 @@ std::string GetCwd(Environment* env) {
}
void StartProfilers(Environment* env) {
+ AtExit(env, [](void* env) {
+ EndStartedProfilers(static_cast<Environment*>(env));
+ }, env);
+
Isolate* isolate = env->isolate();
Local<String> coverage_str = env->env_vars()->Get(
isolate, FIXED_ONE_BYTE_STRING(isolate, "NODE_V8_COVERAGE"))