async_wrap: correctly pass parent to init callback #3216
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
trevnorris
added
the
c++
| // Cannot assert in init callback or will abort. | ||
| process.nextTick(() => { | ||
| assert.equal(parent, server._handle, 'server doesn\'t match parent'); | ||
| assert.equal(this, client._handle, 'client doesn\t match context'); |
There was a problem hiding this comment.
ah whoop. thanks.
trevnorris
force-pushed
the
propagate-parent
branch
from
ca27d2a to
a467235
Compare
| const assert = require('assert'); | ||
| const net = require('net'); | ||
| const async_wrap = process.binding('async_wrap'); | ||
| const providers = Object.keys(async_wrap.Providers); |
|
lgtm, /cc @thlorenz |
Previous logic didn't allow parent to propagate to the init callback properly. The fix now allows the init callback to be called and passed the parent if: - async wrap callbacks are enabled and parent exists - the init callback has been called on the parent and an init callback exists then it will be called regardless of whether async wrap callbacks are disabled. Change the init/pre/post callback checks to see if it has been properly set. This allows removal of the Environment "using_asyncwrap" variable. Pass Isolate to TryCatch instance.
trevnorris
force-pushed
the
propagate-parent
branch
from
a467235 to
71568ea
Compare
This was referenced Oct 7, 2015
trevnorris
added a commit
that referenced
this pull request
Oct 7, 2015
Previous logic didn't allow parent to propagate to the init callback properly. The fix now allows the init callback to be called and receive the parent if: - async wrap callbacks are enabled and parent exists - the init callback has been called on the parent and an init callback exists then it will be called regardless of whether async wrap callbacks are disabled. Change the init/pre/post callback checks to see if it has been properly set. This allows removal of the Environment "using_asyncwrap" variable. Pass Isolate to a TryCatch instance. Fixes: #2986 PR-URL: #3216 Reviewed-By: Rod Vagg <rod@vagg.org>
|
CI is green. Landed in aeee956. |
trevnorris
added a commit
that referenced
this pull request
Oct 8, 2015
Previous logic didn't allow parent to propagate to the init callback properly. The fix now allows the init callback to be called and receive the parent if: - async wrap callbacks are enabled and parent exists - the init callback has been called on the parent and an init callback exists then it will be called regardless of whether async wrap callbacks are disabled. Change the init/pre/post callback checks to see if it has been properly set. This allows removal of the Environment "using_asyncwrap" variable. Pass Isolate to a TryCatch instance. Fixes: #2986 PR-URL: #3216 Reviewed-By: Rod Vagg <rod@vagg.org>
|
landed in v4.x-staging in 3eaa593 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Previous logic didn't allow parent to propagate to the init callback
properly. The fix now allows the init callback to be called and passed
the parent if:
exists then it will be called regardless of whether async wrap
callbacks are disabled.
Change the init/pre/post callback checks to see if it has been properly
set. This allows removal of the Environment "using_asyncwrap" variable.
Pass Isolate to TryCatch instance.
R=@bnoordhuis
CI: https://ci.nodejs.org/job/node-test-pull-request/428/