Skip to content

Commit 9fae4dc

Browse files
AlexeyKupershtokhisaacs
authored andcommitted
timer: fix off-by-one ms error
Fix #5103
1 parent 1526909 commit 9fae4dc

File tree

2 files changed

+49
-1
lines changed

2 files changed

+49
-1
lines changed

lib/timers.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ function listOnTimeout() {
8686
var first;
8787
while (first = L.peek(list)) {
8888
var diff = now - first._idleStart;
89-
if (diff + 1 < msecs) {
89+
if (diff < msecs) {
9090
list.start(msecs - diff, 0);
9191
debug(msecs + ' list wait because diff is ' + diff);
9292
return;

test/simple/test-timers-ordering.js

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
// Copyright Joyent, Inc. and other Node contributors.
2+
//
3+
// Permission is hereby granted, free of charge, to any person obtaining a
4+
// copy of this software and associated documentation files (the
5+
// "Software"), to deal in the Software without restriction, including
6+
// without limitation the rights to use, copy, modify, merge, publish,
7+
// distribute, sublicense, and/or sell copies of the Software, and to permit
8+
// persons to whom the Software is furnished to do so, subject to the
9+
// following conditions:
10+
//
11+
// The above copyright notice and this permission notice shall be included
12+
// in all copies or substantial portions of the Software.
13+
//
14+
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
15+
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
16+
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
17+
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
18+
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
19+
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
20+
// USE OR OTHER DEALINGS IN THE SOFTWARE.
21+
22+
var common = require('../common');
23+
var assert = require('assert');
24+
var i;
25+
26+
var N = 30;
27+
28+
var last_i = 0;
29+
var last_ts = 0;
30+
var start = Date.now();
31+
32+
var f = function(i) {
33+
if (i <= N) {
34+
// check order
35+
assert.equal(i, last_i + 1, 'order is broken: ' + i + ' != ' + last_i + ' + 1');
36+
last_i = i;
37+
38+
// check that this iteration is fired at least 1ms later than the previous
39+
var now = Date.now();
40+
console.log(i, now);
41+
assert(now >= last_ts + 1, 'current ts ' + now + ' < prev ts ' + last_ts + ' + 1');
42+
last_ts = now;
43+
44+
// schedule next iteration
45+
setTimeout(f, 1, i + 1);
46+
}
47+
};
48+
f(1);

0 commit comments

Comments
 (0)