Skip to content

Commit 2c94424

Browse files
committed
timers: remove domain enter and exit
With domains implemented over AsyncHooks, it's no longer necessary to explicitly enter and exit the domain. PR-URL: nodejs#17880 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de> Reviewed-By: Andreas Madsen <amwebdk@gmail.com>
1 parent cfca536 commit 2c94424

1 file changed

Lines changed: 0 additions & 17 deletions

File tree

lib/timers.js

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -256,15 +256,7 @@ function listOnTimeout() {
256256
continue;
257257
}
258258

259-
var domain = timer.domain;
260-
if (domain) {
261-
domain.enter();
262-
}
263-
264259
tryOnTimeout(timer, list);
265-
266-
if (domain)
267-
domain.exit();
268260
}
269261

270262
// If `L.peek(list)` returned nothing, the list was either empty or we have
@@ -641,31 +633,22 @@ var immediateQueue = new ImmediateList();
641633
function processImmediate() {
642634
var immediate = immediateQueue.head;
643635
var tail = immediateQueue.tail;
644-
var domain;
645636

646637
// Clear the linked list early in case new `setImmediate()` calls occur while
647638
// immediate callbacks are executed
648639
immediateQueue.head = immediateQueue.tail = null;
649640

650641
while (immediate !== null) {
651-
domain = immediate.domain;
652-
653642
if (!immediate._onImmediate) {
654643
immediate = immediate._idleNext;
655644
continue;
656645
}
657646

658-
if (domain)
659-
domain.enter();
660-
661647
// Save next in case `clearImmediate(immediate)` is called from callback
662648
var next = immediate._idleNext;
663649

664650
tryOnImmediate(immediate, tail);
665651

666-
if (domain)
667-
domain.exit();
668-
669652
// If `clearImmediate(immediate)` wasn't called from the callback, use the
670653
// `immediate`'s next item
671654
if (immediate._idleNext !== null)

0 commit comments

Comments
 (0)