Skip to content

Commit c7782c0

Browse files
mscdexmscdex
committed
node: improve nextTick performance
This commit uses separate functions to isolate deopts caused by try-catches and avoids fn.apply() for callbacks with small numbers of arguments. These changes improve performance by ~1-40% in the various nextTick benchmarks. PR-URL: #1571 Reviewed-By: Trevor Norris <[email protected]> Reviewed-By: Chris Dickinson <[email protected]>
1 parent ea5195c commit c7782c0

File tree

5 files changed

+189
-25
lines changed

5 files changed

+189
-25
lines changed

‎benchmark/misc/next-tick-breadth-args.js

+37
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
'use strict';
2+
3+
var common = require('../common.js');
4+
var bench = common.createBenchmark(main, {
5+
millions: [2]
6+
});
7+
8+
function main(conf) {
9+
var N = +conf.millions * 1e6;
10+
var n = 0;
11+
12+
function cb1(arg1) {
13+
n++;
14+
if (n === N)
15+
bench.end(n / 1e6);
16+
}
17+
function cb2(arg1, arg2) {
18+
n++;
19+
if (n === N)
20+
bench.end(n / 1e6);
21+
}
22+
function cb3(arg1, arg2, arg3) {
23+
n++;
24+
if (n === N)
25+
bench.end(n / 1e6);
26+
}
27+
28+
bench.start();
29+
for (var i = 0; i < N; i++) {
30+
if (i % 3 === 0)
31+
process.nextTick(cb3, 512, true, null);
32+
else if (i % 2 === 0)
33+
process.nextTick(cb2, false, 5.1);
34+
else
35+
process.nextTick(cb1, 0);
36+
}
37+
}

‎benchmark/misc/next-tick-depth-args.js

+48
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
'use strict';
2+
3+
var common = require('../common.js');
4+
var bench = common.createBenchmark(main, {
5+
millions: [2]
6+
});
7+
8+
process.maxTickDepth = Infinity;
9+
10+
function main(conf) {
11+
var n = +conf.millions * 1e6;
12+
13+
function cb3(arg1, arg2, arg3) {
14+
if (--n) {
15+
if (n % 3 === 0)
16+
process.nextTick(cb3, 512, true, null);
17+
else if (n % 2 === 0)
18+
process.nextTick(cb2, false, 5.1);
19+
else
20+
process.nextTick(cb1, 0);
21+
} else
22+
bench.end(+conf.millions);
23+
}
24+
function cb2(arg1, arg2) {
25+
if (--n) {
26+
if (n % 3 === 0)
27+
process.nextTick(cb3, 512, true, null);
28+
else if (n % 2 === 0)
29+
process.nextTick(cb2, false, 5.1);
30+
else
31+
process.nextTick(cb1, 0);
32+
} else
33+
bench.end(+conf.millions);
34+
}
35+
function cb1(arg1) {
36+
if (--n) {
37+
if (n % 3 === 0)
38+
process.nextTick(cb3, 512, true, null);
39+
else if (n % 2 === 0)
40+
process.nextTick(cb2, false, 5.1);
41+
else
42+
process.nextTick(cb1, 0);
43+
} else
44+
bench.end(+conf.millions);
45+
}
46+
bench.start();
47+
process.nextTick(cb1, true);
48+
}

‎src/node.js

+99-22
Original file line numberDiff line numberDiff line change
@@ -328,22 +328,33 @@
328328
// Run callbacks that have no domain.
329329
// Using domains will cause this to be overridden.
330330
function _tickCallback() {
331-
var callback, threw, tock;
331+
var callback, args, tock;
332332

333333
do {
334334
while (tickInfo[kIndex] < tickInfo[kLength]) {
335335
tock = nextTickQueue[tickInfo[kIndex]++];
336336
callback = tock.callback;
337-
threw = true;
338-
try {
339-
if (tock.args === undefined)
340-
callback();
341-
else
342-
callback.apply(null, tock.args);
343-
threw = false;
344-
} finally {
345-
if (threw)
346-
tickDone();
337+
args = tock.args;
338+
// Using separate callback execution functions helps to limit the
339+
// scope of DEOPTs caused by using try blocks and allows direct
340+
// callback invocation with small numbers of arguments to avoid the
341+
// performance hit associated with using `fn.apply()`
342+
if (args === undefined) {
343+
doNTCallback0(callback);
344+
} else {
345+
switch (args.length) {
346+
case 1:
347+
doNTCallback1(callback, args[0]);
348+
break;
349+
case 2:
350+
doNTCallback2(callback, args[0], args[1]);
351+
break;
352+
case 3:
353+
doNTCallback3(callback, args[0], args[1], args[2]);
354+
break;
355+
default:
356+
doNTCallbackMany(callback, args);
357+
}
347358
}
348359
if (1e4 < tickInfo[kIndex])
349360
tickDone();
@@ -355,25 +366,36 @@
355366
}
356367

357368
function _tickDomainCallback() {
358-
var callback, domain, threw, tock;
369+
var callback, domain, args, tock;
359370

360371
do {
361372
while (tickInfo[kIndex] < tickInfo[kLength]) {
362373
tock = nextTickQueue[tickInfo[kIndex]++];
363374
callback = tock.callback;
364375
domain = tock.domain;
376+
args = tock.args;
365377
if (domain)
366378
domain.enter();
367-
threw = true;
368-
try {
369-
if (tock.args === undefined)
370-
callback();
371-
else
372-
callback.apply(null, tock.args);
373-
threw = false;
374-
} finally {
375-
if (threw)
376-
tickDone();
379+
// Using separate callback execution functions helps to limit the
380+
// scope of DEOPTs caused by using try blocks and allows direct
381+
// callback invocation with small numbers of arguments to avoid the
382+
// performance hit associated with using `fn.apply()`
383+
if (args === undefined) {
384+
doNTCallback0(callback);
385+
} else {
386+
switch (args.length) {
387+
case 1:
388+
doNTCallback1(callback, args[0]);
389+
break;
390+
case 2:
391+
doNTCallback2(callback, args[0], args[1]);
392+
break;
393+
case 3:
394+
doNTCallback3(callback, args[0], args[1], args[2]);
395+
break;
396+
default:
397+
doNTCallbackMany(callback, args);
398+
}
377399
}
378400
if (1e4 < tickInfo[kIndex])
379401
tickDone();
@@ -386,6 +408,61 @@
386408
} while (tickInfo[kLength] !== 0);
387409
}
388410

411+
function doNTCallback0(callback) {
412+
var threw = true;
413+
try {
414+
callback();
415+
threw = false;
416+
} finally {
417+
if (threw)
418+
tickDone();
419+
}
420+
}
421+
422+
function doNTCallback1(callback, arg1) {
423+
var threw = true;
424+
try {
425+
callback(arg1);
426+
threw = false;
427+
} finally {
428+
if (threw)
429+
tickDone();
430+
}
431+
}
432+
433+
function doNTCallback2(callback, arg1, arg2) {
434+
var threw = true;
435+
try {
436+
callback(arg1, arg2);
437+
threw = false;
438+
} finally {
439+
if (threw)
440+
tickDone();
441+
}
442+
}
443+
444+
function doNTCallback3(callback, arg1, arg2, arg3) {
445+
var threw = true;
446+
try {
447+
callback(arg1, arg2, arg3);
448+
threw = false;
449+
} finally {
450+
if (threw)
451+
tickDone();
452+
}
453+
}
454+
455+
function doNTCallbackMany(callback, args) {
456+
var threw = true;
457+
try {
458+
callback.apply(null, args);
459+
threw = false;
460+
} finally {
461+
if (threw)
462+
tickDone();
463+
}
464+
}
465+
389466
function TickObject(c, args) {
390467
this.callback = c;
391468
this.domain = process.domain || null;

‎test/message/nexttick_throw.out

+1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
^
55
ReferenceError: undefined_reference_error_maker is not defined
66
at *test*message*nexttick_throw.js:*:*
7+
at doNTCallback0 (node.js:*:*)
78
at process._tickCallback (node.js:*:*)
89
at Function.Module.runMain (module.js:*:*)
910
at startup (node.js:*:*)

‎test/message/stdin_messages.out

+4-3
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ SyntaxError: Strict mode code may not include a with statement
1212
at emitNone (events.js:*:*)
1313
at Socket.emit (events.js:*:*)
1414
at endReadableNT (_stream_readable.js:*:*)
15+
at doNTCallback2 (node.js:*:*)
1516
at process._tickCallback (node.js:*:*)
1617
42
1718
42
@@ -29,7 +30,7 @@ Error: hello
2930
at emitNone (events.js:*:*)
3031
at Socket.emit (events.js:*:*)
3132
at endReadableNT (_stream_readable.js:*:*)
32-
at process._tickCallback (node.js:*:*)
33+
at doNTCallback2 (node.js:*:*)
3334

3435
[stdin]:1
3536
throw new Error("hello")
@@ -44,7 +45,7 @@ Error: hello
4445
at emitNone (events.js:*:*)
4546
at Socket.emit (events.js:*:*)
4647
at endReadableNT (_stream_readable.js:*:*)
47-
at process._tickCallback (node.js:*:*)
48+
at doNTCallback2 (node.js:*:*)
4849
100
4950

5051
[stdin]:1
@@ -60,7 +61,7 @@ ReferenceError: y is not defined
6061
at emitNone (events.js:*:*)
6162
at Socket.emit (events.js:*:*)
6263
at endReadableNT (_stream_readable.js:*:*)
63-
at process._tickCallback (node.js:*:*)
64+
at doNTCallback2 (node.js:*:*)
6465

6566
[stdin]:1
6667
var ______________________________________________; throw 10

0 commit comments

Comments
 (0)