Skip to content

Commit

Permalink
lib: simplify nextTick() usage
Browse files Browse the repository at this point in the history
This commit removes unnecessary nextTick() closures and adds some
shared nextTick() callbacks for better re-use.

PR-URL: #1612
Reviewed-By: Yosuke Furukawa <[email protected]>
Reviewed-By: Brendan Ashworth <[email protected]>
  • Loading branch information
mscdex committed May 25, 2015
1 parent a74c2c9 commit 5abd4ac
Show file tree
Hide file tree
Showing 7 changed files with 42 additions and 57 deletions.
12 changes: 3 additions & 9 deletions lib/_stream_writable.js
Original file line number Diff line number Diff line change
Expand Up @@ -292,22 +292,16 @@ function doWrite(stream, state, writev, len, chunk, encoding, cb) {
}

function onwriteError(stream, state, sync, er, cb) {
--state.pendingcb;
if (sync)
process.nextTick(onwriteErrorNT, state, cb, er);
else {
state.pendingcb--;
process.nextTick(cb, er);
else
cb(er);
}

stream._writableState.errorEmitted = true;
stream.emit('error', er);
}

function onwriteErrorNT(state, cb, er) {
state.pendingcb--;
cb(er);
}

function onwriteStateUpdate(state) {
state.writing = false;
state.writecb = null;
Expand Down
6 changes: 3 additions & 3 deletions lib/_tls_legacy.js
Original file line number Diff line number Diff line change
Expand Up @@ -448,16 +448,16 @@ CryptoStream.prototype.destroy = function(err) {
}
this._opposite.destroy();

process.nextTick(destroyNT, this, err);
process.nextTick(destroyNT, this, err ? true : false);
};


function destroyNT(self, err) {
function destroyNT(self, hadErr) {
// Force EOF
self.push(null);

// Emit 'close' event
self.emit('close', err ? true : false);
self.emit('close', hadErr);
}


Expand Down
4 changes: 1 addition & 3 deletions lib/_tls_wrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -444,9 +444,7 @@ TLSSocket.prototype.renegotiate = function(options, callback) {
}
if (!this._handle.renegotiate()) {
if (callback) {
process.nextTick(function() {
callback(new Error('Failed to renegotiate'));
});
process.nextTick(callback, new Error('Failed to renegotiate'));
}
return false;
}
Expand Down
9 changes: 2 additions & 7 deletions lib/dgram.js
Original file line number Diff line number Diff line change
Expand Up @@ -320,19 +320,14 @@ Socket.prototype.send = function(buffer,
!!callback);
if (err && callback) {
// don't emit as error, dgram_legacy.js compatibility
process.nextTick(sendEmitErrorNT, err, address, port, callback);
var ex = exceptionWithHostPort(err, 'send', address, port);
process.nextTick(callback, ex);
}
}
});
};


function sendEmitErrorNT(err, address, port, callback) {
var ex = exceptionWithHostPort(err, 'send', address, port);
callback(ex);
}


function afterSend(err) {
if (err) {
err = exceptionWithHostPort(err, 'send', this.address, this.port);
Expand Down
11 changes: 5 additions & 6 deletions lib/dns.js
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,16 @@ function makeAsync(callback) {
// The API already returned, we can invoke the callback immediately.
callback.apply(null, arguments);
} else {
process.nextTick(callMakeAsyncCbNT, callback, arguments);
var args = new Array(arguments.length + 1);
args[0] = callback;
for (var i = 1, a = 0; a < arguments.length; ++i, ++a)
args[i] = arguments[a];

This comment has been minimized.

Copy link
@trevnorris

trevnorris May 25, 2015

Contributor

I don't see how this could be faster than just having done arguments.unshift(callback).

This comment has been minimized.

Copy link
@ChALkeR

ChALkeR May 27, 2015

Member

@trevnorris arguments is not an array. There is no arguments.unshift.

This comment has been minimized.

Copy link
@trevnorris

trevnorris May 27, 2015

Contributor

Missed that. Please ignore my ramblings.

process.nextTick.apply(null, args);
}
};
}


function callMakeAsyncCbNT(callback, args) {
callback.apply(null, args);
}


function onlookup(err, addresses) {
if (err) {
return this.callback(errnoException(err, 'getaddrinfo', this.hostname));
Expand Down
48 changes: 22 additions & 26 deletions lib/net.js
Original file line number Diff line number Diff line change
Expand Up @@ -268,14 +268,10 @@ function writeAfterFIN(chunk, encoding, cb) {
// TODO: defer error events consistently everywhere, not just the cb
self.emit('error', er);
if (typeof cb === 'function') {
process.nextTick(writeAfterFINNT, cb, er);
process.nextTick(cb, er);
}
}

function writeAfterFINNT(cb, er) {
cb(er);
}

exports.Socket = Socket;
exports.Stream = Socket; // Legacy naming.

Expand Down Expand Up @@ -442,9 +438,7 @@ Socket.prototype._destroy = function(exception, cb) {
function fireErrorCallbacks() {
if (cb) cb(exception);
if (exception && !self._writableState.errorEmitted) {
process.nextTick(function() {
self.emit('error', exception);
});
process.nextTick(emitErrorNT, self, exception);
self._writableState.errorEmitted = true;
}
}
Expand Down Expand Up @@ -962,7 +956,10 @@ function lookupAndConnect(self, options) {
// immediately calls net.Socket.connect() on it (that's us).
// There are no event listeners registered yet so defer the
// error event to the next tick.
process.nextTick(connectErrorNT, self, err, options);
err.host = options.host;
err.port = options.port;
err.message = err.message + ' ' + options.host + ':' + options.port;
process.nextTick(connectErrorNT, self, err);
} else {
self._unrefTimer();
connect(self,
Expand All @@ -976,10 +973,7 @@ function lookupAndConnect(self, options) {
}


function connectErrorNT(self, err, options) {
err.host = options.host;
err.port = options.port;
err.message = err.message + ' ' + options.host + ':' + options.port;
function connectErrorNT(self, err) {
self.emit('error', err);
self._destroy();
}
Expand Down Expand Up @@ -1205,9 +1199,7 @@ Server.prototype._listen2 = function(address, port, addressType, backlog, fd) {

if (typeof rval === 'number') {
var error = exceptionWithHostPort(rval, 'listen', address, port);
process.nextTick(function() {
self.emit('error', error);
});
process.nextTick(emitErrorNT, self, error);
return;
}
self._handle = rval;
Expand All @@ -1222,9 +1214,7 @@ Server.prototype._listen2 = function(address, port, addressType, backlog, fd) {
var ex = exceptionWithHostPort(err, 'listen', address, port);
self._handle.close();
self._handle = null;
process.nextTick(function() {
self.emit('error', ex);
});
process.nextTick(emitErrorNT, self, ex);
return;
}

Expand All @@ -1239,6 +1229,11 @@ Server.prototype._listen2 = function(address, port, addressType, backlog, fd) {
};


function emitErrorNT(self, err) {
self.emit('error', err);
}


function emitListeningNT(self) {
// ensure handle hasn't closed
if (self._handle)
Expand Down Expand Up @@ -1412,9 +1407,7 @@ function onconnection(err, clientHandle) {

Server.prototype.getConnections = function(cb) {
function end(err, connections) {
process.nextTick(function() {
cb(err, connections);
});
process.nextTick(cb, err, connections);
}

if (!this._usingSlaves) {
Expand Down Expand Up @@ -1493,13 +1486,16 @@ Server.prototype._emitCloseIfDrained = function() {
return;
}

process.nextTick(function() {
debug('SERVER: emit close');
self.emit('close');
});
process.nextTick(emitCloseNT, self);
};


function emitCloseNT(self) {
debug('SERVER: emit close');
self.emit('close');
}


Server.prototype.listenFD = util.deprecate(function(fd, type) {
return this.listen({ fd: fd });
}, 'listenFD is deprecated. Use listen({fd: <number>}).');
Expand Down
9 changes: 6 additions & 3 deletions lib/timers.js
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,7 @@ function listOnTimeout() {
// when the timeout threw its exception.
var oldDomain = process.domain;
process.domain = null;
process.nextTick(function() {
list[kOnTimeout]();
});
process.nextTick(listOnTimeoutNT, list);
process.domain = oldDomain;
}
}
Expand All @@ -113,6 +111,11 @@ function listOnTimeout() {
}


function listOnTimeoutNT(list) {
list[kOnTimeout]();
}


const unenroll = exports.unenroll = function(item) {
L.remove(item);

Expand Down

0 comments on commit 5abd4ac

Please sign in to comment.