Skip to content
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

Jump to bottom

src: destroy inspector agent before context #16472

Merged
merged 1 commit into from
Oct 25, 2017
Merged

src: destroy inspector agent before context #16472

merged 1 commit into from
Oct 25, 2017

Conversation

ofrobots
Copy link
Contributor

@ofrobots ofrobots commented Oct 25, 2017 •
edited
Loading

The inspector_agent depends on the context still being accessible
during the destructor execution.

Fixes: #15558

Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • commit message follows commit guidelines
Affected core subsystem(s)

inspector

CI: https://ci.nodejs.org/job/node-test-pull-request/10954/
https://ci.nodejs.org/job/node-test-pull-request/10969/

@nodejs-github-bot nodejs-github-bot added the c++ Issues and PRs that require attention from people who are familiar with C++. label Oct 25, 2017
This was referenced Oct 25, 2017
Closed
Merged
@mscdex mscdex added the inspector Issues and PRs related to the V8 inspector protocol label Oct 25, 2017
bnoordhuis
bnoordhuis approved these changes Oct 25, 2017
View reviewed changes
Copy link
Member

@bnoordhuis bnoordhuis left a comment

Choose a reason for hiding this comment

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

LGTM with suggestions.

src/env.h Outdated
@@ -668,7 +668,7 @@ class Environment {

#if HAVE_INSPECTOR
inline inspector::Agent* inspector_agent() {
Copy link
Member

Choose a reason for hiding this comment

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

This method can be const now.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thanks. Done.

src/env.h Outdated
@@ -713,7 +713,7 @@ class Environment {
std::map<std::string, uint64_t> performance_marks_;

#if HAVE_INSPECTOR
inspector::Agent inspector_agent_;
inspector::Agent* inspector_agent_ = nullptr;
Copy link
Member

Choose a reason for hiding this comment

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

I'd make this inspector::Agent* const inspector_agent_;, that way the compiler will complain if someone forgets to assign it in the constructor.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

src/env-inl.h Outdated
@@ -347,6 +347,11 @@ inline Environment::Environment(IsolateData* isolate_data,
inline Environment::~Environment() {
v8::HandleScope handle_scope(isolate());

#if HAVE_INSPECTOR
// Destory inspector agent before erasing the context.
Copy link
Member

Choose a reason for hiding this comment

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

Typo: Destroy

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done.

eugeneo
eugeneo approved these changes Oct 25, 2017
View reviewed changes
Copy link
Contributor

@eugeneo eugeneo left a comment

Choose a reason for hiding this comment

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

Thank you for looking into this.

I did some manual testing and do not anticipate any regressions.

@ofrobots
Copy link
Contributor Author

ofrobots commented Oct 25, 2017 •
edited
Loading

The CI looks green. I am planning to land this later today, i.e. less than 48 hrs after opening the PR, as this is a minor bug fix and that it fixes flakiness issues with inspector tests in the CI.

@ofrobots
src: destroy inspector agent before context
e3503ac 
The inspector_agent depends on the context still being accessible
during the destructor execution.

PR-URL: nodejs#16472
Fixes: nodejs#15558
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Eugene Ostroukhov <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
@ofrobots ofrobots merged commit e3503ac into nodejs:master Oct 25, 2017
@ofrobots
Copy link
Contributor Author

Thanks. Landed as e3503ac.

@ofrobots ofrobots deleted the fix-15558 branch October 25, 2017 23:57
addaleax pushed a commit to ayojs/ayo that referenced this pull request Oct 26, 2017
@ofrobots @addaleax
src: destroy inspector agent before context
63efd04 
The inspector_agent depends on the context still being accessible
during the destructor execution.

PR-URL: nodejs/node#16472
Fixes: nodejs/node#15558
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Eugene Ostroukhov <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
@jasnell jasnell mentioned this pull request Oct 30, 2017
Merged
gibfahn pushed a commit that referenced this pull request Oct 30, 2017
@ofrobots @gibfahn
src: destroy inspector agent before context
d41493b 
The inspector_agent depends on the context still being accessible
during the destructor execution.

PR-URL: #16472
Fixes: #15558
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Eugene Ostroukhov <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
gibfahn pushed a commit that referenced this pull request Oct 30, 2017
@ofrobots @gibfahn
src: destroy inspector agent before context
21fbd50 
The inspector_agent depends on the context still being accessible
during the destructor execution.

PR-URL: #16472
Fixes: #15558
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Eugene Ostroukhov <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
gibfahn pushed a commit that referenced this pull request Oct 31, 2017
@ofrobots @gibfahn
src: destroy inspector agent before context
465540c 
The inspector_agent depends on the context still being accessible
during the destructor execution.

PR-URL: #16472
Fixes: #15558
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Eugene Ostroukhov <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
@gibfahn gibfahn mentioned this pull request Oct 31, 2017
Merged
addaleax pushed a commit to ayojs/ayo that referenced this pull request Dec 7, 2017
@ofrobots @addaleax
src: destroy inspector agent before context
8edfd0a 
The inspector_agent depends on the context still being accessible
during the destructor execution.

PR-URL: nodejs/node#16472
Fixes: nodejs/node#15558
Reviewed-By: Ben Noordhuis <[email protected]>
Reviewed-By: Franziska Hinkelmann <[email protected]>
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Eugene Ostroukhov <[email protected]>
Reviewed-By: James M Snell <[email protected]>
Reviewed-By: Anna Henningsen <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cjihrig cjihrig cjihrig approved these changes

@addaleax addaleax addaleax approved these changes

@jasnell jasnell jasnell approved these changes

@eugeneo eugeneo eugeneo approved these changes

@bnoordhuis bnoordhuis bnoordhuis approved these changes

@fhinkel fhinkel fhinkel approved these changes

Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. inspector Issues and PRs related to the V8 inspector protocol
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Windows - inspector - intermittent ? - inspector/test-bindings
10 participants
@ofrobots @fhinkel @bnoordhuis @eugeneo @jasnell @addaleax @cjihrig @mscdex @MylesBorins @nodejs-github-bot