Skip to content

Commit 93b0624

Browse files
committed
timer_wrap: Timer.now always update loop time
In `Timer.now` always update the loop time by calling uv_update_time. Previously we were trying to cache the loop time to prevent extra syscalls. While a noble goal, it can cause timers to fire early in certain circumstances. Especially seen in cpu bound work loads or work loads with synchronous file operations.
1 parent 9635861 commit 93b0624

File tree

2 files changed

+34
-0
lines changed

2 files changed

+34
-0
lines changed

src/timer_wrap.cc

+1
Original file line numberDiff line numberDiff line change
@@ -144,6 +144,7 @@ class TimerWrap : public HandleWrap {
144144

145145
static void Now(const FunctionCallbackInfo<Value>& args) {
146146
HandleScope scope(node_isolate);
147+
uv_update_time(uv_default_loop());
147148
double now = static_cast<double>(uv_now(uv_default_loop()));
148149
args.GetReturnValue().Set(now);
149150
}

test/simple/test-timers-first-fire.js

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
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+
25+
var TIMEOUT = 50;
26+
var last = process.hrtime();
27+
setTimeout(function() {
28+
var hr = process.hrtime(last);
29+
var ms = (hr[0] * 1e3) + (hr[1] / 1e6);
30+
var delta = ms - TIMEOUT;
31+
console.log('timer fired in', delta);
32+
assert.ok(delta > 0, 'Timer fired early');
33+
}, TIMEOUT);

0 commit comments

Comments
 (0)