Skip to content

Commit

Permalink
timer_wrap: Timer.now always update loop time
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
tjfontaine committed Aug 28, 2013
1 parent 9635861 commit 93b0624
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 0 deletions.
1 change: 1 addition & 0 deletions src/timer_wrap.cc
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,7 @@ class TimerWrap : public HandleWrap {

static void Now(const FunctionCallbackInfo<Value>& args) {
HandleScope scope(node_isolate);
uv_update_time(uv_default_loop());
double now = static_cast<double>(uv_now(uv_default_loop()));
args.GetReturnValue().Set(now);
}
Expand Down
33 changes: 33 additions & 0 deletions test/simple/test-timers-first-fire.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
// Copyright Joyent, Inc. and other Node contributors.
//
// Permission is hereby granted, free of charge, to any person obtaining a
// copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to permit
// persons to whom the Software is furnished to do so, subject to the
// following conditions:
//
// The above copyright notice and this permission notice shall be included
// in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
// USE OR OTHER DEALINGS IN THE SOFTWARE.

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

var TIMEOUT = 50;
var last = process.hrtime();
setTimeout(function() {
var hr = process.hrtime(last);
var ms = (hr[0] * 1e3) + (hr[1] / 1e6);
var delta = ms - TIMEOUT;
console.log('timer fired in', delta);
assert.ok(delta > 0, 'Timer fired early');
}, TIMEOUT);

0 comments on commit 93b0624

Please sign in to comment.