Skip to content

src: use RAII for mutexes and condition variables - #7334

Merged
bnoordhuis merged 0 commit into
nodejs:masterfrom
bnoordhuis:raii-lock
Jun 21, 2016
Merged

src: use RAII for mutexes and condition variables#7334
bnoordhuis merged 0 commit into
nodejs:masterfrom
bnoordhuis:raii-lock

Conversation

@bnoordhuis

@bnoordhuisbnoordhuis commented Jun 18, 2016•
edited
Loading

Copy link
Copy Markdown
Member

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/

@bnoordhuisbnoordhuis 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
Comment threadsrc/inspector_agent.cc Outdated

@bnoordhuisbnoordhuisJun 18, 2016

Copy link
Copy Markdown
MemberAuthor

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

addaleax commented Jun 18, 2016

Copy link
Copy Markdown
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

bnoordhuis commented Jun 18, 2016

Copy link
Copy Markdown
MemberAuthor

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

@bnoordhuis

bnoordhuis commented Jun 19, 2016

Copy link
Copy Markdown
MemberAuthor

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

@jasnell

jasnell commented Jun 20, 2016

Copy link
Copy Markdown
Member

nice. LGTM

@cjihrig

cjihrig commented Jun 20, 2016

Copy link
Copy Markdown
Contributor

LGTM

trevnorris
trevnorris reviewed Jun 20, 2016
View reviewed changes
Comment threadsrc/node_mutex.h Outdated

@trevnorristrevnorrisJun 20, 2016

Copy link
Copy Markdown
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()?

@bnoordhuisbnoordhuisJun 20, 2016

Copy link
Copy Markdown
MemberAuthor

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

trevnorris commented Jun 20, 2016

Copy link
Copy Markdown
Contributor

Thanks for answering the questions. Makes sense. LGTM.

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:masterJun 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

Fishrock123 commented Jun 27, 2016

Copy link
Copy Markdown
Contributor

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

@Fishrock123

Fishrock123 commented Jul 5, 2016

Copy link
Copy Markdown
Contributor

@bnoordhuis781713d 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>
@Fishrock123Fishrock123 mentioned this pull request Jul 5, 2016
Merged
@MylesBorinsMylesBorins mentioned this pull request Jul 11, 2016
Closed
@MylesBorins

MylesBorins commented Jul 11, 2016

Copy link
Copy Markdown
Contributor

@bnoordhuis should this be backported?

@bnoordhuis

bnoordhuis commented Jul 12, 2016

Copy link
Copy Markdown
MemberAuthor

@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

bnoordhuis commented Jul 13, 2016

Copy link
Copy Markdown
MemberAuthor

#7715 - v4.x back-port

@cjihrigcjihrig mentioned this pull request Aug 8, 2016
Closed
@cjihrig

cjihrig commented Aug 10, 2016

Copy link
Copy Markdown
Contributor

@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

bnoordhuis commented Sep 5, 2016

Copy link
Copy Markdown
MemberAuthor

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

MylesBorins pushed a commit that referenced this pull request Sep 7, 2016
@bnoordhuisMyles Borins
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
@bnoordhuisMyles Borins
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>
@MylesBorinsMylesBorins mentioned this pull request Oct 26, 2016
Closed
@gibfahngibfahn mentioned this pull request Jun 15, 2017
Closed
3 tasks
Sign up for freeto 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 / srcIssues 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.

7 participants

@bnoordhuis@addaleax@jasnell@cjihrig@trevnorris@Fishrock123@MylesBorins