src: fix Worker termination when --inspect-brk is passed
#53724
Merged
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
|
Review requested:
|
nodejs-github-bot
added
c++
daeyeon
added
inspector
|
/cc @nodejs/cpp-reviewers @nodejs/inspector @nodejs/workers |
Signed-off-by: Daeyeon Jeong <daeyeon.dev@gmail.com>
daeyeon
force-pushed
the
main.inspector-240704.Thu.d70e
branch
from
ba88cf2
to
264d531
Compare
jasnell
approved these changes
Jul 4, 2024
github-actions
bot
removed
the
request-ci
This comment was marked as outdated.
This comment was marked as outdated.
cola119
reviewed
Jul 5, 2024
cola119
reviewed
Jul 5, 2024
src/node.cc
Outdated
Comment on lines
215
to
221
| void Environment::WaitForInspectorFrontend() { | ||
| if (!inspector_agent_->WaitForConnectByOptions()) { | ||
| return; | ||
| } | ||
|
|
||
| if (inspector_agent_->options().break_node_first_line) { | ||
| inspector_agent_->PauseOnNextJavascriptStatement("Break at bootstrap"); |
There was a problem hiding this comment.
When I first looked at the function name, I expected it to only wait for the frontend connection. But, it also sets a breakpoint at the first line if specified in the options. Does it make sense for this function to handle setting the breakpoint as well?
There was a problem hiding this comment.
The function name omitted words like 'based on options set at creation', which I initially thought was okay. I renamed it to make it clearer. PTAL.
This comment was marked as outdated.
This comment was marked as outdated.
H4ad
added
the
commit-queue
Signed-off-by: Daeyeon Jeong <daeyeon.dev@gmail.com>
daeyeon
added
request-ci
github-actions
bot
removed
the
request-ci
This comment was marked as outdated.
This comment was marked as outdated.
cola119
approved these changes
Jul 6, 2024
github-actions
bot
removed
the
request-ci
cola119
added
author ready
mcollina
added
the
commit-queue
nodejs-github-bot
removed
the
commit-queue
|
Landed in e1b80a5 |
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.
Fixes: #53648
When calling
node::CreateEnvironmentwith debug options like--inspect-brk, Environment creation is blocked until an Inspector frontend connects. While creating a Worker thread's Environment, its InspectorAgent, which is owned by the Environment instance and controls exit, is not usable until creation is complete.This patch allows separate handling of Environment creation and Inspector frontend connection waiting, resolving the issue by creating the Environment instance first in worker threads.
Signed-off-by: Daeyeon Jeong daeyeon.dev@gmail.com