Skip to content

WIP src: don't check closing handles on beforeExit #1317

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
trevnorris wants to merge 1 commit into from
Closed

WIP src: don't check closing handles on beforeExit #1317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 6 additions & 6 deletions src/node.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3824,21 +3824,21 @@ static void StartNodeInstance(void* arg) {

bool more;
do {
more = uv_run(env->event_loop(), UV_RUN_ONCE);
more = uv_run(env->event_loop(), UV_RUN_DEFAULT);
if (more == false) {
EmitBeforeExit(env);

// Emit `beforeExit` if the loop became alive either after emitting
// event, or after running some callbacks.
more = uv_loop_alive(env->event_loop());
if (uv_run(env->event_loop(), UV_RUN_NOWAIT) != 0)
more = true;
more = env->event_loop()->active_handles ||
(env->event_loop()->active_reqs[0] !=
env->event_loop()->active_reqs[1]);
Copy link
Member

@bnoordhuis bnoordhuis Apr 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You're probably well aware of this but active_handles and active_reqs are implementation details.

Copy link
Contributor Author

@trevnorris trevnorris Apr 1, 2015

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah. That was done just to bring up the issue I'm working around, and the fact I can't figure out how to get around it.

}
} while (more == true);

int exit_code = EmitExit(env);
if (instance_data->is_main())
instance_data->set_exit_code(exit_code);
// TODO(trevnorris): This will fail for certain beforeExit cases.
//assert(!uv_loop_alive(env->event_loop()));
RunAtExit(env);

env->Dispose();
Expand Down
8 changes: 8 additions & 0 deletions test/parallel/test-beforeexit-event-hang.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
var assert = require('assert');
var common = require('../common');
var i = 0;

process.on('beforeExit', function() {
assert.ok(++i <= 1);
setTimeout(function() { }, 100).unref();
});
2 changes: 1 addition & 1 deletion test/parallel/test-beforeexit-event.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@ function tryListen() {
}

process.on('exit', function() {
assert.equal(4, deaths);
assert.equal(3, deaths);
assert.equal(3, revivals);
});