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

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

Closed
wants to merge 1 commit into from
Closed

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

wants to merge 1 commit into from

Conversation

addaleax
Copy link
Member

@addaleax addaleax commented Jun 6, 2018

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-bot nodejs-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
@addaleax addaleax closed this Jun 6, 2018
@addaleax addaleax reopened this Jun 6, 2018
@addaleax
Copy link
Member Author

addaleax commented Jun 6, 2018

Oops.

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

@targos
Copy link
Member

targos commented Jun 6, 2018

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

landed in afc811c

@MylesBorins MylesBorins closed this Jun 6, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@targos targos targos approved these changes

Assignees
No one assigned
Labels
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.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@addaleax @targos @MylesBorins @nodejs-github-bot