Skip to content
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

net: refactor Server.prototype.listen #4039

Closed
wants to merge 15 commits into from
Closed

net: refactor Server.prototype.listen #4039

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
d5452a6
Move listenAfterLookup out of listen
jscissr Aug 12, 2016
88c44c1
Use normalizeConnectArgs in listen
jscissr Aug 13, 2016
df8d8c8
Replace h with options
jscissr Aug 13, 2016
959582c
Only deal with options object
jscissr Aug 13, 2016
d1c6f7b
Fix linter errors
jscissr Aug 13, 2016
708e1b4
Test the new behavior
jscissr Aug 13, 2016
150723d
Use argument.length directly
jscissr Aug 15, 2016
5ab4028
Rename normalizeConnectArgs to normalizeArgs
jscissr Aug 16, 2016
0bffc03
Use string interpolation
jscissr Aug 16, 2016
db798ea
Style: Use brackets around if
jscissr Aug 16, 2016
e772fa3
Test: Just use '0' for the port
jscissr Aug 16, 2016
3fb1435
Optimize argument handling
jscissr Aug 16, 2016
4a65449
Update normalizeArgs comment
jscissr Aug 16, 2016
3848eae
Or expression instead of `if`
jscissr Aug 18, 2016
4bb5770
length checking before array access
jscissr Sep 9, 2016
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
15 changes: 8 additions & 7 deletions lib/net.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,9 @@ function normalizeArgs(args) {
}

var cb = args[args.length - 1];
return typeof cb === 'function' ? [options, cb] : [options];
if (typeof cb !== 'function')
cb = null;
return [options, cb];
Copy link
Contributor

Choose a reason for hiding this comment

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

The comment for normalizeArgs() needs to be updated now too.

}
exports._normalizeArgs = normalizeArgs;

Expand Down Expand Up @@ -1330,21 +1332,20 @@ Server.prototype.listen = function() {
var args = new Array(arguments.length);
for (var i = 0; i < arguments.length; i++)
args[i] = arguments[i];
args = normalizeArgs(args);
var [options, cb] = normalizeArgs(args);

if (args[1]) {
this.once('listening', args[1]);
if (typeof cb === 'function') {
this.once('listening', cb);
}

var options = args[0];
if (arguments.length === 0 || typeof arguments[0] === 'function') {
if (args.length === 0 || typeof args[0] === 'function') {
// Bind to a random port.
options.port = 0;
}

// The third optional argument is the backlog size.
// When the ip is omitted it can be the second argument.
var backlog = toNumber(arguments[1]) || toNumber(arguments[2]);
var backlog = toNumber(args[1]) || toNumber(args[2]);
Copy link
Contributor

Choose a reason for hiding this comment

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

May want to do args.length checking before accessing [1] or [2].

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean like this?

var backlog = toNumber(args.length > 1 && args[1]) || toNumber(args.length > 2 && args[2]);

But is it really necessary / worth it to optimize this function? I don't think it's one of the hot functions in an usual node application, you call listen once during startup and not hundreds of times a second. What is your opinion?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

ping @mscdex

Copy link
Contributor

Choose a reason for hiding this comment

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

I'd still prefer it for consistency.


options = options._handle || options.handle || options;

Expand Down