lib: refactor some internal/* code #12644

jasnell · 2017-04-25T17:25:17Z

This one is a bit of a grab bag containing a number of small edits to a number of internal/* modules that I have been accumulating. They generally are around code cleanup or modernization

Checklist

make -j4 test (UNIX), or vcbuild test (Windows) passes
tests and/or benchmarks are included
commit message follows commit guidelines

Affected core subsystem(s)

internal: process, module, streams, lib, fs, freelist

mscdex · 2017-04-25T17:44:27Z

lib/internal/fs.js

@@ -4,16 +4,17 @@ const Buffer = require('buffer').Buffer;
 const Writable = require('stream').Writable;
 const fs = require('fs');
 const util = require('util');
-const constants = process.binding('constants').fs;
-
-const O_APPEND = constants.O_APPEND | 0;


Might want to check if the implicit coercion to a 32-bit value was intentional (e.g. performance related or the values were not originally numbers for some reason)?

I explored that a bit a couldn't find anything specific. I could be wrong, but I think the switch was more defensive just in case.

This also converts to an integer if it was a float, or some other type of number-ish.

mscdex · 2017-04-25T17:47:11Z

lib/internal/streams/BufferList.js

@@ -2,71 +2,71 @@

 const Buffer = require('buffer').Buffer;

-module.exports = BufferList;
+module.exports = class BufferList {


Did you benchmark this change?

Yes, negligible difference in master with 5.7. Notable improvement under TF-I ... tho I'd have to pull the numbers back up. It was a week or so ago when I ran it.

mscdex · 2017-04-25T17:48:45Z

lib/internal/process/next_tick.js

 function setupNextTick() {
  const promises = require('internal/process/promises');
  const errors = require('internal/errors');
-  const emitPendingUnhandledRejections = promises.setup(scheduleMicrotasks);
+  const emitPendingUnhandledRejections = promises(scheduleMicrotasks);


I know the other 'setup' instances had the benefit of not having to be assigned to a variable first, but perhaps we should at least change the variable name here to something more straight-forward, like setupPromises instead of just promises?

Works for me..

Fishrock123 · 2017-04-26T00:06:06Z

lib/internal/bootstrap_node.js

    _process.setupKillAndExit();
    _process.setupSignalHandlers();
    if (global.__coverage__)
-      NativeModule.require('internal/process/write-coverage').setup();
+      NativeModule.require('internal/process/write-coverage')();


Note: I used this naming convention for consistency with the other setup functions.

IMO, it would be better to preserve it for clarity.

these are already different from the other ones tho and we eliminate an extraneous property lookup. I'm not going to fight for it, but I don't see much value in keeping the separate setup() functions.

Fishrock123 · 2017-04-26T00:08:08Z

lib/internal/module.js

@@ -130,3 +121,12 @@ function addBuiltinLibsToObject(object) {
    });
  });
 }
+
+module.exports = exports = {


Remove exports?

That's my preference but in a separate issue @sam-github expressed a preference for these to retain the = exports

Why? There is no point. Since you are already exposing the variable name to grab it this way exports is defunct. (Edit: because You can just access the variable anyways)

If necessary, we can remove this in another PR entirely but idk why we'd add more here...

I also agree that re-assigning exports is unnecessary. *shrug*

I'm perfectly happy with removing it.

Fishrock123 · 2017-04-26T00:08:31Z

lib/internal/process.js

@@ -267,3 +257,14 @@ function setupRawDebug() {
    rawDebug(format.apply(null, arguments));
  };
 }
+
+module.exports = exports = {


jasnell · 2017-04-27T19:02:48Z

@Fishrock123 ... ok, I dropped the commit that altered the naming conventions on the process setup items. PTAL

Fishrock123 · 2017-04-27T19:07:33Z

Replied to the comment about module.exports = exports.

jasnell · 2017-04-27T19:21:22Z

Updated to remove the module.exports = exports =

jasnell · 2017-04-27T19:29:19Z

CI: https://ci.nodejs.org/job/node-test-pull-request/7713/

mscdex · 2017-04-27T19:47:28Z

lib/internal/module.js

@@ -130,3 +121,12 @@ function addBuiltinLibsToObject(object) {
    });
  });
 }
+
+module.exports = {


Actually, I just realized we do need exports re-assigned here in this file because exports.requireDepth is modified in this module and lib/module.js checks this value.

heh... doh!

that particular bit could likely be refactored but I'll just replace the = exports = here for now

jasnell · 2017-04-27T20:01:29Z

New CI: https://ci.nodejs.org/job/node-test-pull-request/7716/

jasnell · 2017-04-27T23:42:44Z

CI is green

mscdex · 2017-04-27T23:45:56Z

LGTM

jasnell · 2017-04-27T23:56:04Z

@Fishrock123 ... does this LGTY?

jasnell · 2017-04-28T21:19:21Z

Will land this by monday if there are no further objections

PR-URL: #12644 Reviewed-By: Brian White <[email protected]>

jasnell · 2017-05-01T18:43:34Z

Landed in 579ff2a, ed0716f, e2199e0, 08809f2 and ea9eed5

PR-URL: nodejs#12644 Reviewed-By: Brian White <[email protected]>

gibfahn · 2017-06-18T22:55:21Z

Should this be backported to v6.x-staging? If yes please follow the guide and raise a backport PR, if no let me know or add the dont-land-on label.

Updates to use current constructor for freelist, which was changed under pr #12644 Ref: #12644 PR-URL: #14627 Reviewed-By: Luigi Pinca <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Gibson Fahnestock <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Anna Henningsen <[email protected]>

mscdex reviewed Apr 25, 2017

View reviewed changes

jasnell force-pushed the refactor-some-internals branch from d2e492e to 4b4dc16 Compare April 25, 2017 18:29

Fishrock123 reviewed Apr 26, 2017

View reviewed changes

jasnell force-pushed the refactor-some-internals branch from 4b4dc16 to cbbfb03 Compare April 27, 2017 19:02

process: refactor internal/process.js export style

7008983

jasnell force-pushed the refactor-some-internals branch from cbbfb03 to d1a95a5 Compare April 27, 2017 19:21

mscdex reviewed Apr 27, 2017

View reviewed changes

jasnell added 4 commits April 27, 2017 13:00

module: refactor internal/module export style

dc289b3

streams: refactor BufferList into ES6 class

3d75f9f

fs: simplify constant decls

ae8de10

freelist: simplify export

0c9bd21

jasnell force-pushed the refactor-some-internals branch from d1a95a5 to 0c9bd21 Compare April 27, 2017 20:00

jasnell added a commit that referenced this pull request May 1, 2017

process: refactor internal/process.js export style

579ff2a

PR-URL: #12644 Reviewed-By: Brian White <[email protected]>

jasnell added a commit that referenced this pull request May 1, 2017

module: refactor internal/module export style

ed0716f

PR-URL: #12644 Reviewed-By: Brian White <[email protected]>

jasnell added a commit that referenced this pull request May 1, 2017

streams: refactor BufferList into ES6 class

e2199e0

PR-URL: #12644 Reviewed-By: Brian White <[email protected]>

jasnell added a commit that referenced this pull request May 1, 2017

fs: simplify constant decls

08809f2

PR-URL: #12644 Reviewed-By: Brian White <[email protected]>

jasnell added a commit that referenced this pull request May 1, 2017

freelist: simplify export

ea9eed5

PR-URL: #12644 Reviewed-By: Brian White <[email protected]>

jasnell closed this May 1, 2017

anchnk pushed a commit to anchnk/node that referenced this pull request May 6, 2017

process: refactor internal/process.js export style

a0c936d

PR-URL: nodejs#12644 Reviewed-By: Brian White <[email protected]>

anchnk pushed a commit to anchnk/node that referenced this pull request May 6, 2017

module: refactor internal/module export style

17fa03d

PR-URL: nodejs#12644 Reviewed-By: Brian White <[email protected]>

anchnk pushed a commit to anchnk/node that referenced this pull request May 6, 2017

streams: refactor BufferList into ES6 class

3a22e00

PR-URL: nodejs#12644 Reviewed-By: Brian White <[email protected]>

anchnk pushed a commit to anchnk/node that referenced this pull request May 6, 2017

fs: simplify constant decls

4823fb9

PR-URL: nodejs#12644 Reviewed-By: Brian White <[email protected]>

anchnk pushed a commit to anchnk/node that referenced this pull request May 6, 2017

freelist: simplify export

5eb179f

PR-URL: nodejs#12644 Reviewed-By: Brian White <[email protected]>

jasnell mentioned this pull request May 11, 2017

8.0.0 Release Proposal #12220

Closed

gibfahn mentioned this pull request Jun 15, 2017

Auditing for 6.11.1 nodejs/Release#230

Closed

3 tasks

gibfahn added the backport-requested-v6.x label Jun 18, 2017

gareth-ellis mentioned this pull request Aug 4, 2017

benchmark: Correct constructor for freelist #14627

Closed

2 tasks

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

lib: refactor some internal/* code #12644

lib: refactor some internal/* code #12644

jasnell commented Apr 25, 2017

mscdex Apr 25, 2017 •

edited

Loading

jasnell Apr 25, 2017

Fishrock123 Apr 26, 2017

mscdex Apr 25, 2017

jasnell Apr 25, 2017

mscdex Apr 25, 2017 •

edited

Loading

jasnell Apr 25, 2017

Fishrock123 Apr 26, 2017

jasnell Apr 26, 2017

Fishrock123 Apr 26, 2017

jasnell Apr 26, 2017

Fishrock123 Apr 27, 2017 •

edited

Loading

mscdex Apr 27, 2017

jasnell Apr 27, 2017

Fishrock123 Apr 26, 2017

jasnell commented Apr 27, 2017

Fishrock123 commented Apr 27, 2017

jasnell commented Apr 27, 2017

jasnell commented Apr 27, 2017

mscdex Apr 27, 2017 •

edited

Loading

jasnell Apr 27, 2017

jasnell Apr 27, 2017

jasnell commented Apr 27, 2017

jasnell commented Apr 27, 2017

mscdex commented Apr 27, 2017

jasnell commented Apr 27, 2017

jasnell commented Apr 28, 2017

jasnell commented May 1, 2017

gibfahn commented Jun 18, 2017

lib: refactor some internal/* code #12644

lib: refactor some internal/* code #12644

Conversation

jasnell commented Apr 25, 2017

Checklist

Affected core subsystem(s)

mscdex Apr 25, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

mscdex Apr 25, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Fishrock123 Apr 27, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jasnell commented Apr 27, 2017

Fishrock123 commented Apr 27, 2017

jasnell commented Apr 27, 2017

jasnell commented Apr 27, 2017

mscdex Apr 27, 2017 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jasnell commented Apr 27, 2017

jasnell commented Apr 27, 2017

mscdex commented Apr 27, 2017

jasnell commented Apr 27, 2017

jasnell commented Apr 28, 2017

jasnell commented May 1, 2017

gibfahn commented Jun 18, 2017

mscdex Apr 25, 2017 •

edited

Loading

mscdex Apr 25, 2017 •

edited

Loading

Fishrock123 Apr 27, 2017 •

edited

Loading

mscdex Apr 27, 2017 •

edited

Loading