Skip to content

src: fix Worker termination in inspector.waitForDebugger #52527

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

Merged
nodejs-github-bot merged 9 commits into from
May 13, 2024
Merged

src: fix Worker termination in inspector.waitForDebugger #52527

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
de5f1b7
src: fix Worker termination in `inspector.waitForDebugger`
daeyeon Apr 14, 2024
6a0142e
fixup! src: fix Worker termination in `inspector.waitForDebugger`
daeyeon Apr 14, 2024
5035b9c
fixup! fixup! src: fix Worker termination in `inspector.waitForDebugger`
daeyeon Apr 15, 2024
9c210e9
separate tc for clarify on patch expectations
daeyeon Apr 15, 2024
fcbd1b3
fixup! separate tc for clarify on patch expectations
daeyeon Apr 16, 2024
e500544
fixup! fixup! separate tc for clarify on patch expectations
daeyeon Apr 16, 2024
35002b6
fixup! fixup! fixup! separate tc for clarify on patch expectations
daeyeon Apr 17, 2024
ee7472d
fixup! fixup! fixup! fixup! separate tc for clarify on patch expectat…
daeyeon Apr 17, 2024
d7a556c
fixup! fixup! fixup! fixup! fixup! separate tc for clarify on patch e…
daeyeon Apr 17, 2024
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
fixup! src: fix Worker termination in inspector.waitForDebugger 
Signed-off-by: Daeyeon Jeong <daeyeon.dev@gmail.com>
  • Loading branch information
@daeyeon
daeyeon committed Apr 14, 2024
commit 6a0142e53b209c730e0df68eccaa67010d0e4178
2 changes: 1 addition & 1 deletion src/env.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1094,7 +1094,7 @@ void Environment::ExitEnv(StopFlags::Flags flags) {
set_stopping(true);

#if HAVE_INSPECTOR
if (inspector_agent_->IsWaitingForConnect()) {
if (inspector_agent_ && inspector_agent_->IsWaitingForConnect()) {
Comment thread
daeyeon marked this conversation as resolved.
Outdated
inspector_agent_->StopWaitingForConnect();
}
#endif
Expand Down
3 changes: 3 additions & 0 deletions src/inspector/main_thread_interface.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,9 @@ class MainThreadInterface :
// when we reenter the DispatchMessages function.
MessageQueue dispatching_message_queue_;
bool dispatching_messages_ = false;
// This flag indicates an internal request to exit the loop in
// WaitForFrontendEvent() It's set to true by calling
// StopWaitingForFrontendEvent().
bool stop_waiting_for_frontend_event_requested_ = false;
Comment thread
daeyeon marked this conversation as resolved.
ConditionVariable incoming_message_cond_;
// Used from any thread
Expand Down
3 changes: 3 additions & 0 deletions src/inspector_agent.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -480,6 +480,9 @@ class NodeInspectorClient : public V8InspectorClient {
inline bool waiting_for_frontend() { return waiting_for_frontend_; }

void StopWaitingForFrontend() {
if (!waiting_for_frontend_) {
return;
}
waiting_for_frontend_ = false;
Comment thread
daeyeon marked this conversation as resolved.
for (const auto& id_channel : channels_) {
id_channel.second->unsetWaitingForDebugger();
Expand Down