1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

timers: Move list.ontimeout to separate function

Browse Source
This commit is contained in:
isaacs 2012-12-27 11:40:42 -08:00
parent aec2f733f9
commit ba94f9d6f8
2 changed files with 56 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/timers.js
View File

@ -66,12 +66,22 @@ function insert(item, msecs) {
L.init(list); L.init(list);
lists[msecs] = list; lists[msecs] = list;
list.msecs = msecs;
list.ontimeout = listOnTimeout;
}
L.append(list, item);
assert(!L.isEmpty(list)); // list is not empty
}
function listOnTimeout() {
var msecs = this.msecs;
var list = this;
list.ontimeout = function() {
debug('timeout callback ' + msecs); debug('timeout callback ' + msecs);
var now = Date.now(); var now = Date.now();
debug('now: ' + (new Date(now))); debug('now: ' + now);
var first; var first;
while (first = L.peek(list)) { while (first = L.peek(list)) {
@ -115,11 +125,6 @@ function insert(item, msecs) {
assert(L.isEmpty(list)); assert(L.isEmpty(list));
list.close(); list.close();
delete lists[msecs]; delete lists[msecs];
};
}
L.append(list, item);
assert(!L.isEmpty(list)); // list is not empty
} }

2
test/message/timeout_throw.out
View File

@ -3,5 +3,5 @@
^ ^
ReferenceError: undefined_reference_error_maker is not defined ReferenceError: undefined_reference_error_maker is not defined
at null._onTimeout (*test*message*timeout_throw.js:*:*) at null._onTimeout (*test*message*timeout_throw.js:*:*)
at Timer.list.ontimeout (timers.js:*:*) at Timer.listOnTimeout [as ontimeout] (timers.js:*:*)
at process._makeCallback (node.js:*:*) at process._makeCallback (node.js:*:*)