async_hooks: update defaultTriggerAsyncIdScope for perf

The existing version of defaultTriggerAsyncIdScope creates an Array for the callback's arguments which is highly inefficient. Instead, use rest syntax and allow V8 to do that work for us. This yields roughly 2x performance for this particular function. Backport-PR-URL: #18179 PR-URL: #18004 Reviewed-By: Andreas Madsen <[email protected]> Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: Colin Ihrig <[email protected]>
nodejs · Jan 19, 2018 · 5dab90b · 5dab90b
1 parent 1d3d1dd
commit 5dab90b
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/lib/dgram.js b/lib/dgram.js
@@ -450,8 +450,8 @@ Socket.prototype.send = function(buffer,
   const afterDns = (ex, ip) => {
     defaultTriggerAsyncIdScope(
       this[async_id_symbol],
-      [ex, this, ip, list, address, port, callback],
-      doSend
+      doSend,
+      ex, this, ip, list, address, port, callback
     );
   };
 

diff --git a/lib/internal/async_hooks.js b/lib/internal/async_hooks.js
@@ -263,15 +263,15 @@ function getDefaultTriggerAsyncId() {
 }
 
 
-function defaultTriggerAsyncIdScope(triggerAsyncId, opaque, block) {
+function defaultTriggerAsyncIdScope(triggerAsyncId, block, ...args) {
   // CHECK(Number.isSafeInteger(triggerAsyncId))
   // CHECK(triggerAsyncId > 0)
   const oldDefaultTriggerAsyncId = async_id_fields[kDefaultTriggerAsyncId];
   async_id_fields[kDefaultTriggerAsyncId] = triggerAsyncId;
 
   var ret;
   try {
-    ret = Reflect.apply(block, null, opaque);
+    ret = Reflect.apply(block, null, args);
   } finally {
     async_id_fields[kDefaultTriggerAsyncId] = oldDefaultTriggerAsyncId;
   }

diff --git a/lib/net.js b/lib/net.js
@@ -300,7 +300,7 @@ function onSocketFinish() {
     return this.destroy();
 
   var err = defaultTriggerAsyncIdScope(
-    this[async_id_symbol], [this, afterShutdown], shutdownSocket
+    this[async_id_symbol], shutdownSocket, this, afterShutdown
   );
 
   if (err)
@@ -1031,7 +1031,7 @@ Socket.prototype.connect = function(...args) {
                                  path);
     }
     defaultTriggerAsyncIdScope(
-      this[async_id_symbol], [this, path], internalConnect
+      this[async_id_symbol], internalConnect, this, path
     );
   } else {
     lookupAndConnect(this, options);
@@ -1073,8 +1073,8 @@ function lookupAndConnect(self, options) {
       if (self.connecting)
         defaultTriggerAsyncIdScope(
           self[async_id_symbol],
-          [self, host, port, addressType, localAddress, localPort],
-          internalConnect
+          internalConnect,
+          self, host, port, addressType, localAddress, localPort
         );
     });
     return;
@@ -1096,7 +1096,7 @@ function lookupAndConnect(self, options) {
   debug('connect: dns options', dnsopts);
   self._host = host;
   var lookup = options.lookup || dns.lookup;
-  defaultTriggerAsyncIdScope(self[async_id_symbol], [], function() {
+  defaultTriggerAsyncIdScope(self[async_id_symbol], function() {
     lookup(host, dnsopts, function emitLookup(err, ip, addressType) {
       self.emit('lookup', err, ip, addressType, host);
 
@@ -1118,8 +1118,8 @@ function lookupAndConnect(self, options) {
         self._unrefTimer();
         defaultTriggerAsyncIdScope(
           self[async_id_symbol],
-          [self, ip, port, addressType, localAddress, localPort],
-          internalConnect
+          internalConnect,
+          self, ip, port, addressType, localAddress, localPort
         );
       }
     });