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

timers: reschedule interval even if it threw by apapirovski · Pull Request #20002 · nodejs/node · GitHub

/ node Public

timers: reschedule interval even if it threw #20002

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

Closed
apapirovski wants to merge 1 commit into from
Conversation 16 Commits 1 Checks 0 Files changed
Closed

timers: reschedule interval even if it threw #20002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension .js  (3) All 1 file type selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
15 changes: 7 additions & 8 deletions lib/timers.js
Show comments
View file
Open in desktop
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
Original file line number Diff line number Diff line change
Expand Up @@ -285,15 +285,18 @@ function tryOnTimeout(timer, start) {
var threw = true;
if (timerAsyncId !== null)
emitBefore(timerAsyncId, timer[trigger_async_id_symbol]);
if (start === undefined && timer._repeat)
start = TimerWrap.now();
try {
ontimeout(timer, start);
ontimeout(timer);
threw = false;
} finally {
if (timerAsyncId !== null) {
if (!threw)
emitAfter(timerAsyncId);
if ((threw || !timer._repeat) && destroyHooksExist() &&
!timer._destroyed) {
if (timer._repeat) {
rearm(timer, start);
} else if (destroyHooksExist() && !timer._destroyed) {
emitDestroy(timerAsyncId);
timer._destroyed = true;
}
Expand Down Expand Up @@ -417,18 +420,14 @@ setTimeout[internalUtil.promisify.custom] = function(after, value) {
exports.setTimeout = setTimeout;


function ontimeout(timer, start) {
function ontimeout(timer) {
const args = timer._timerArgs;
if (typeof timer._onTimeout !== 'function')
return promiseResolve(timer._onTimeout, args[0]);
if (start === undefined && timer._repeat)
start = TimerWrap.now();
if (!args)
timer._onTimeout();
else
Reflect.apply(timer._onTimeout, timer, args);
if (timer._repeat)
rearm(timer, start);
}

function rearm(timer, start = TimerWrap.now()) {
Expand Down
17 changes: 13 additions & 4 deletions test/async-hooks/test-timers.setInterval.js
Show comments
View file
Open in desktop
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const TIMEOUT = common.platformTimeout(100);
const hooks = initHooks();
hooks.enable();

setInterval(common.mustCall(ontimeout), TIMEOUT);
const interval = setInterval(common.mustCall(ontimeout, 2), TIMEOUT);
const as = hooks.activitiesOfTypes('Timeout');
assert.strictEqual(as.length, 1);
const t1 = as[0];
Expand All @@ -18,9 +18,18 @@ assert.strictEqual(typeof t1.uid, 'number');
assert.strictEqual(typeof t1.triggerAsyncId, 'number');
checkInvocations(t1, { init: 1 }, 't1: when timer installed');

let iter = 0;
function ontimeout() {
checkInvocations(t1, { init: 1, before: 1 }, 't1: when first timer fired');

if (iter === 0) {
checkInvocations(t1, { init: 1, before: 1 }, 't1: when first timer fired');
} else {
checkInvocations(t1, { init: 1, before: 2, after: 1 },
't1: when first interval fired again');
clearInterval(interval);
return;
}

iter++;
throw new Error('setInterval Error');
}

Expand All @@ -32,6 +41,6 @@ process.on('exit', () => {
hooks.disable();
hooks.sanityCheck('Timeout');

checkInvocations(t1, { init: 1, before: 1, after: 1, destroy: 1 },
checkInvocations(t1, { init: 1, before: 2, after: 2, destroy: 1 },
't1: when process exits');
});
17 changes: 17 additions & 0 deletions test/parallel/test-timers-interval-throw.js
Show comments
View file
Open in desktop
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
'use strict';

const common = require('../common');
const assert = require('assert');

// To match browser behaviour, interval should continue
// being rescheduled even if it throws.

let count = 2;
const interval = setInterval(() => { throw new Error('IntervalError'); }, 1);

process.on('uncaughtException', common.mustCall((err) => {
assert.strictEqual(err.message, 'IntervalError');
if (--count === 0) {
clearInterval(interval);
}
}, 2));
Back | FazBrowse Home | New Git URL