Skip to content

net: micro cleanups #12342

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bnoordhuis merged 6 commits into from
Apr 18, 2017
Merged

net: micro cleanups #12342

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7b48303
net: don't create unnecessary closure
bnoordhuis Apr 11, 2017
117b83c
net: don't create unnecessary closure
bnoordhuis Apr 11, 2017
571882c
net: remove unnecessary process.nextTick()
bnoordhuis Apr 11, 2017
9433434
net: don't concatenate strings in debug logging
bnoordhuis Apr 11, 2017
bb06add
net: don't normalize twice in Socket#connect()
bnoordhuis Apr 11, 2017
5d06e5c
net: require 'dns' only once
bnoordhuis Apr 11, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
net: don't create unnecessary closure 
Pass arguments to fireErrorCallbacks() explicitly.  Saves allocation
an unnecessary closure context.

PR-URL: #12342
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Evan Lucas <evanlucas@me.com>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Luigi Pinca <luigipinca@gmail.com>
  • Loading branch information
@bnoordhuis
bnoordhuis committed Apr 18, 2017
commit 7b4830378311fd31f3b79d66d77fe4ebc95ed317
6 changes: 3 additions & 3 deletions lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -498,7 +498,7 @@ Socket.prototype.destroySoon = function() {
Socket.prototype._destroy = function(exception, cb) {
debug('destroy');

function fireErrorCallbacks(self) {
function fireErrorCallbacks(self, exception, cb) {
Copy link
Copy Markdown
Contributor

@mscdex mscdex Apr 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm guessing this is done for performance, but does shadowing negate that?

Copy link
Copy Markdown
Member Author

@bnoordhuis bnoordhuis Apr 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You mean shadowing of variable/argument names? No, should not be a factor here.

if (cb) cb(exception);
if (exception && !self._writableState.errorEmitted) {
process.nextTick(emitErrorNT, self, exception);
Expand All @@ -508,7 +508,7 @@ Socket.prototype._destroy = function(exception, cb) {

if (this.destroyed) {
debug('already destroyed, fire error callbacks');
fireErrorCallbacks(this);
fireErrorCallbacks(this, exception, cb);
return;
}

Expand Down Expand Up @@ -540,7 +540,7 @@ Socket.prototype._destroy = function(exception, cb) {
// to make it re-entrance safe in case Socket.prototype.destroy()
// is called within callbacks
this.destroyed = true;
fireErrorCallbacks(this);
fireErrorCallbacks(this, exception, cb);

if (this._server) {
COUNTER_NET_SERVER_CONNECTION_CLOSE(this);
Expand Down