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: use RAII for mutexes and condition variables #7334

Merged
merged 0 commits into from Jun 21, 2016
Merged

src: use RAII for mutexes and condition variables #7334

merged 0 commits into from Jun 21, 2016

Conversation

bnoordhuis
Copy link
Member

@bnoordhuis bnoordhuis commented Jun 18, 2016 •
edited

We will be introducing many more critical sections in the upcoming
multi-isolate changes, so let's make manual synchronization a thing
of the past.

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

@bnoordhuis bnoordhuis added c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory. labels Jun 18, 2016
bnoordhuis
bnoordhuis reviewed Jun 18, 2016
View reviewed changes
src/inspector_agent.cc
@@ -470,21 +462,19 @@ void AgentImpl::OnRemoteDataIO(uv_stream_t* stream,
}
DisconnectAndDisposeIO(socket);
}
uv_cond_broadcast(&agent->pause_cond_);
agent->pause_cond_.Broadcast(scoped_lock);
Copy link
Member Author

Choose a reason for hiding this comment

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

@pavelfeldman Can you comment on whether the changes to this function look correct to you? ISTM it should be holding the lock when signalling the condition variable.

@addaleax
Copy link
Member

@bnoordhuis The next time you rebase this against master, could you include addaleax/node@d16e607? Sorry it took me so long to get #6635 landed.

@bnoordhuis
Copy link
Member Author

Rebased, with workaround for compilers that don't understand constexpr function pointers: https://ci.nodejs.org/job/node-test-pull-request/3024/

@bnoordhuis
Copy link
Member Author

Green except for flaky test parallel/test-vm-timeout, tracked in #6727.

@jasnell
Copy link
Member

jasnell commented Jun 20, 2016

nice. LGTM

@cjihrig
Copy link
Contributor

cjihrig commented Jun 20, 2016

LGTM

trevnorris
trevnorris reviewed Jun 20, 2016
View reviewed changes
src/node_mutex.h
inline ~ConditionVariableBase();
inline void Broadcast(const ScopedLock&);
inline void Signal(const ScopedLock&);
inline void Wait(const ScopedLock& scoped_lock);
Copy link
Contributor

Choose a reason for hiding this comment

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

reason for adding the argument name scoped_lock in Wait() but not in Broadcast() or Signal()?

Copy link
Member Author

Choose a reason for hiding this comment

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

Wait() uses it, the other two just take it to prove ownership (i.e., you can't signal or broadcast if you don't hold the lock.)

@trevnorris
Copy link
Contributor

Thanks for answering the questions. Makes sense. LGTM.

@bnoordhuis bnoordhuis closed this Jun 21, 2016
bnoordhuis added a commit to bnoordhuis/io.js that referenced this pull request Jun 21, 2016
@bnoordhuis
tools: disable readability/function cpplint rule
bb33c28 
cpplint gets too easily confused by C++ constructs that look like
function declarations but aren't.  Furthermore, it's arguably a
bad rule that conflicts with gcc's -Wunused-parameter flag.

PR-URL: nodejs#7334
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
bnoordhuis added a commit to bnoordhuis/io.js that referenced this pull request Jun 21, 2016
@bnoordhuis
src: use RAII for mutexes and condition variables
d7087df 
We will be introducing many more critical sections in the upcoming
multi-isolate changes, so let's make manual synchronization a thing
of the past.

PR-URL: nodejs#7334
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
@bnoordhuis bnoordhuis deleted the raii-lock branch June 21, 2016 08:31
@bnoordhuis bnoordhuis merged commit 781713d into nodejs:master Jun 21, 2016
evanlucas pushed a commit that referenced this pull request Jun 27, 2016
@bnoordhuis @evanlucas
tools: disable readability/function cpplint rule
bd8c951 
cpplint gets too easily confused by C++ constructs that look like
function declarations but aren't.  Furthermore, it's arguably a
bad rule that conflicts with gcc's -Wunused-parameter flag.

PR-URL: #7334
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
@Fishrock123
Copy link
Member

This touches the inspector. Marking as dont-land-on-v6. (for now, idk until we resolve that)

@Fishrock123
Copy link
Member

@bnoordhuis 781713d applies poorly on v6 but as far as I can tell the other commit is required to not have more conflicts on the inspector...

If possible, separating out non-backportable work would be greatly appreciated by us releasers!

Fishrock123 pushed a commit that referenced this pull request Jul 5, 2016
@bnoordhuis @Fishrock123
src: use RAII for mutexes and condition variables
0593351 
We will be introducing many more critical sections in the upcoming
multi-isolate changes, so let's make manual synchronization a thing
of the past.

PR-URL: #7334
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
@Fishrock123 Fishrock123 mentioned this pull request Jul 5, 2016
Merged
@MylesBorins MylesBorins mentioned this pull request Jul 11, 2016
Closed
@MylesBorins
Copy link
Member

@bnoordhuis should this be backported?

@bnoordhuis
Copy link
Member Author

@thealphanerd It's not necessary per se but it would be good. You'll have to drop the changes to src/inspector_agent.cc.

@bnoordhuis
Copy link
Member Author

#7715 - v4.x back-port

@cjihrig cjihrig mentioned this pull request Aug 8, 2016
Closed
@cjihrig
Copy link
Contributor

cjihrig commented Aug 10, 2016

@bnoordhuis this doesn't seem to apply cleanly to v6.x either, and #7715 has 213 commits. Could you backport this?

bnoordhuis added a commit to bnoordhuis/io.js that referenced this pull request Sep 5, 2016
@bnoordhuis
src: use RAII for mutexes and condition variables
ab9e3aa 
We will be introducing many more critical sections in the upcoming
multi-isolate changes, so let's make manual synchronization a thing
of the past.

PR-URL: nodejs#7334
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
@bnoordhuis
Copy link
Member Author

For posterity, this landed in v6.x in commit 0593351.

MylesBorins pushed a commit that referenced this pull request Sep 7, 2016
@bnoordhuis
src: use RAII for mutexes and condition variables
efc77ec 
We will be introducing many more critical sections in the upcoming
multi-isolate changes, so let's make manual synchronization a thing
of the past.

PR-URL: #7334
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
MylesBorins pushed a commit that referenced this pull request Sep 28, 2016
@bnoordhuis
src: use RAII for mutexes and condition variables
401b4ff 
We will be introducing many more critical sections in the upcoming
multi-isolate changes, so let's make manual synchronization a thing
of the past.

PR-URL: #7334
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
rvagg pushed a commit that referenced this pull request Oct 18, 2016
@bnoordhuis @rvagg
src: use RAII for mutexes and condition variables
32dd2f5 
We will be introducing many more critical sections in the upcoming
multi-isolate changes, so let's make manual synchronization a thing
of the past.

PR-URL: #7334
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
MylesBorins pushed a commit that referenced this pull request Oct 26, 2016
@bnoordhuis @MylesBorins
src: use RAII for mutexes and condition variables
a5b6c2c 
We will be introducing many more critical sections in the upcoming
multi-isolate changes, so let's make manual synchronization a thing
of the past.

PR-URL: #7334
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Trevor Norris <trev.norris@gmail.com>
@MylesBorins MylesBorins mentioned this pull request Oct 26, 2016
Closed
@gibfahn gibfahn mentioned this pull request Jun 15, 2017
Closed
3 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
c++ Issues and PRs that require attention from people who are familiar with C++. lib / src Issues and PRs related to general changes in the lib or src directory.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
7 participants
@bnoordhuis @addaleax @jasnell @cjihrig @trevnorris @Fishrock123 @MylesBorins