Skip to content

src: run native immediates during Environment cleanup #30666

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.

Sign up for GitHub

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

Closed
addaleax wants to merge 4 commits into from
Closed

src: run native immediates during Environment cleanup #30666

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
8b632df
src: keep object alive in stream_pipe code
addaleax Nov 26, 2019
9d455b9
src: add more `can_call_into_js()` guards
addaleax Nov 26, 2019
2286fc0
src: no SetImmediate from destructor in stream_pipe code
addaleax Nov 26, 2019
64ed123
src: run native immediates during Environment cleanup
addaleax Nov 26, 2019
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
Prev Previous commit
Next Next commit
src: add more can_call_into_js() guards 
This is in preparation for running native `SetImmediate()`
callbacks during shutdown.
  • Loading branch information
@addaleax
addaleax committed Nov 26, 2019
commit 9d455b9a71562b5db528adb20fa0aa44b303832f
5 changes: 4 additions & 1 deletion src/env.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -527,6 +527,9 @@ void Environment::RegisterHandleCleanups() {
}

void Environment::CleanupHandles() {
Isolate::DisallowJavascriptExecutionScope disallow_js(isolate(),
Isolate::DisallowJavascriptExecutionScope::THROW_ON_FAILURE);

for (ReqWrapBase* request : req_wrap_queue_)
request->Cancel();

Expand Down Expand Up @@ -661,7 +664,7 @@ void Environment::RunAndClearNativeImmediates() {

head->Call(this);
if (UNLIKELY(try_catch.HasCaught())) {
if (!try_catch.HasTerminated())
if (!try_catch.HasTerminated() && can_call_into_js())
errors::TriggerUncaughtException(isolate(), try_catch);

// We are done with the current callback. Move one iteration along,
Expand Down
5 changes: 4 additions & 1 deletion src/node_errors.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,6 +278,9 @@ static void ReportFatalException(Environment* env,
Local<Value> error,
Local<Message> message,
EnhanceFatalException enhance_stack) {
if (!env->can_call_into_js())
enhance_stack = EnhanceFatalException::kDontEnhance;

Isolate* isolate = env->isolate();
CHECK(!error.IsEmpty());
CHECK(!message.IsEmpty());
Expand Down Expand Up @@ -956,7 +959,7 @@ void TriggerUncaughtException(Isolate* isolate,
}

MaybeLocal<Value> handled;
{
if (env->can_call_into_js()) {
// We do not expect the global uncaught exception itself to throw any more
// exceptions. If it does, exit the current Node.js instance.
errors::TryCatchScope try_catch(env,
Expand Down
2 changes: 2 additions & 0 deletions src/node_process_events.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,8 @@ Maybe<bool> ProcessEmitWarningGeneric(Environment* env,
const char* warning,
const char* type,
const char* code) {
if (!env->can_call_into_js()) return Just(false);

HandleScope handle_scope(env->isolate());
Context::Scope context_scope(env->context());

Expand Down