Skip to content

[v10.x] src: break out of timers loop if !can_call_into_js() - #21168

Closed
addaleax wants to merge 1 commit into
nodejs:v10.x-stagingfrom
addaleax:backport-v10.x-20884
Closed

[v10.x] src: break out of timers loop if !can_call_into_js()#21168
addaleax wants to merge 1 commit into
nodejs:v10.x-stagingfrom
addaleax:backport-v10.x-20884

Conversation

@addaleax

@addaleaxaddaleax commented Jun 6, 2018

Copy link
Copy Markdown
Member

Simple backport of #20884

@addaleax
src: break out of timers loop if !can_call_into_js()
2c58658
Otherwise, this turns into an infinite loop when the flag
is set, because it makes `MakeCallback()` return immediately.
PR-URL: nodejs#20884
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@nodejs-github-botnodejs-github-bot added c++ Issues and PRs that require attention from people who are familiar with C++. timers Issues and PRs related to the timers subsystem / setImmediate, setInterval, setTimeout. v10.x labels Jun 6, 2018
@addaleaxaddaleax closed this Jun 6, 2018
@addaleaxaddaleax reopened this Jun 6, 2018
@addaleax

addaleax commented Jun 6, 2018

Copy link
Copy Markdown
MemberAuthor

Oops.

CI: https://ci.nodejs.org/job/node-test-commit/19019/

@targos

targos commented Jun 6, 2018

Copy link
Copy Markdown
Member

For the record, there is a conflict because of #20555 (semver-major)

MylesBorins pushed a commit that referenced this pull request Jun 6, 2018
@addaleax@MylesBorins
src: break out of timers loop if !can_call_into_js()
afc811c
Otherwise, this turns into an infinite loop when the flag
is set, because it makes `MakeCallback()` return immediately.
Backport-PR-URL: #21168
PR-URL: #20884
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Anatoli Papirovski <apapirovski@mac.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
@MylesBorins

MylesBorins commented Jun 6, 2018

Copy link
Copy Markdown
Contributor

landed in afc811c

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@targostargostargos approved these changes

Assignees

No one assigned

Labels

c++Issues and PRs that require attention from people who are familiar with C++.timersIssues and PRs related to the timers subsystem / setImmediate, setInterval, setTimeout.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@addaleax@targos@MylesBorins@nodejs-github-bot