FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix timers cancel in interval v4.x by Fishrock123 · Pull Request #10365 · nodejs/node · GitHub

/ node Public

Fix timers cancel in interval v4.x - #10365

Closed
Fishrock123 wants to merge 2 commits into
nodejs:v4.x-stagingfrom
Fishrock123:fix-timers-cancel-in-interval-v4.x
ConversationCommits (2)ChecksFiles changed
Closed

Fix timers cancel in interval v4.x#10365
Fishrock123 wants to merge 2 commits into
nodejs:v4.x-stagingfrom
Fishrock123:fix-timers-cancel-in-interval-v4.x

Conversation

Fishrock123 commented Dec 21, 2016 •
edited
Loading

Copy link
Copy Markdown
Contributor
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • commit message follows commit guidelines
Affected core subsystem(s)

timers

Description of change

Backport of #9685 to v4.x

I added another check and testcase because there is another related bug prior to c8c2544

cc @thealphanerd

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

timers: use consistent checks for canceled timers
9c9277b 
Previously not all codepaths set `timer._idleTimeout = -1` for canceled
or closed timers, and not all codepaths checked it either.

Unenroll uses this to say that a timer is indeed closed and it is the
closest thing there is to an authoritative source for this.

Refs: nodejs#9606
Fixes: nodejs#9561
PR-URL: nodejs#9685
Reviewed-By: Rich Trott <rtrott@gmail.com>

 Conflicts:
	lib/timers.js
Fishrock123 added timers Issues and PRs related to the timers subsystem / setImmediate, setInterval, setTimeout. v4.x labels Dec 21, 2016
nodejs-github-bot added timers Issues and PRs related to the timers subsystem / setImmediate, setInterval, setTimeout. v4.x labels Dec 21, 2016
Fishrock123 mentioned this pull request Dec 21, 2016
Merged
3 tasks
Fishrock123 force-pushed the fix-timers-cancel-in-interval-v4.x branch from ec26d82 to f37b38c Compare December 21, 2016 00:13

MylesBorins commented Dec 21, 2016

Copy link
Copy Markdown
Contributor

landed in ae2eff2...c444119

MylesBorins commented Dec 21, 2016

Copy link
Copy Markdown
Contributor

LGTM

MylesBorins pushed a commit that referenced this pull request Dec 21, 2016
timers: bail from intervals if _repeat is bad
759e8fd 
PR-URL: #10365
Ref: #9685

Reviewed-By: Myles Borins <myles.borins@gmail.com>
MylesBorins pushed a commit that referenced this pull request Dec 21, 2016
timers: bail from intervals if _repeat is bad
0be437a 
PR-URL: #10365
Ref: #9685

Reviewed-By: Myles Borins <myles.borins@gmail.com>
MylesBorins mentioned this pull request Dec 21, 2016
Merged
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
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

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.

3 participants

Back | FazBrowse Home | New Git URL