Skip to content

Commit

Permalink
lib: remove redundant code, add tests in timers.js
Browse files Browse the repository at this point in the history
insert() is only called from one place where there is already a check
that msecs is greater than or equal to zero, so do not repeat the check
inside insert().

timers.active() is not documented and should not be exposed, but since
it is exposed for now, let's test it.

PR-URL: #3143
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
Reviewed-By: Sakthipriyan Vairamani <thechargingvolcano@gmail.com>
  • Loading branch information
Trott authored and jasnell committed Oct 8, 2015
1 parent 8dfdee3 commit 63644dd
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 14 deletions.
22 changes: 8 additions & 14 deletions lib/timers.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,17 @@ const TIMEOUT_MAX = 2147483647; // 2^31-1
// value = list
var lists = {};


// call this whenever the item is active (not idle)
// it will reset its timeout.
// the main function - creates lists on demand and the watchers associated
// with them.
function insert(item, msecs) {
item._idleStart = Timer.now();
item._idleTimeout = msecs;

exports.active = function(item) {
const msecs = item._idleTimeout;
if (msecs < 0) return;

item._idleStart = Timer.now();

var list;

if (lists[msecs]) {
Expand All @@ -48,7 +51,7 @@ function insert(item, msecs) {

L.append(list, item);
assert(!L.isEmpty(list)); // list is not empty
}
};

function listOnTimeout() {
var msecs = this.msecs;
Expand Down Expand Up @@ -156,15 +159,6 @@ exports.enroll = function(item, msecs) {
};


// call this whenever the item is active (not idle)
// it will reset its timeout.
exports.active = function(item) {
var msecs = item._idleTimeout;
if (msecs >= 0)
insert(item, msecs);
};


/*
* DOM-style timers
*/
Expand Down
33 changes: 33 additions & 0 deletions test/parallel/test-timers-active.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
'use strict';
const common = require('../common');
const assert = require('assert');
const active = require('timers').active;

// active() should create timers for these
var legitTimers = [
{ _idleTimeout: 0 },
{ _idleTimeout: 1 }
];

legitTimers.forEach(function(legit) {
const savedTimeout = legit._idleTimeout;
active(legit);
// active() should mutate these objects
assert(legit._idleTimeout === savedTimeout);
assert(Number.isInteger(legit._idleStart));
assert(legit._idleNext);
assert(legit._idlePrev);
});


// active() should not create a timer for these
var bogusTimers = [
{ _idleTimeout: -1 }
];

bogusTimers.forEach(function(bogus) {
const savedTimeout = bogus._idleTimeout;
active(bogus);
// active() should not mutate these objects
assert.deepStrictEqual(bogus, {_idleTimeout: savedTimeout});
});

0 comments on commit 63644dd

Please sign in to comment.