meta: merge node/master into node-chakracore/master

Merge 740c426 as of 2018-03-01
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: chakrabot <chakrabot@users.noreply.github.com>

.eslintrc.js

@@ -263,12 +263,6 @@ module.exports = {
     DTRACE_HTTP_SERVER_RESPONSE: false,
     DTRACE_NET_SERVER_CONNECTION: false,
     DTRACE_NET_STREAM_END: false,
-    LTTNG_HTTP_CLIENT_REQUEST: false,
-    LTTNG_HTTP_CLIENT_RESPONSE: false,
-    LTTNG_HTTP_SERVER_REQUEST: false,
-    LTTNG_HTTP_SERVER_RESPONSE: false,
-    LTTNG_NET_SERVER_CONNECTION: false,
-    LTTNG_NET_STREAM_END: false,
     internalBinding: false,
   },
 };

CHANGELOG.md

@@ -31,7 +31,8 @@ release.
 </tr>
 <tr>
     <td valign="top">
-<b><a href="doc/changelogs/CHANGELOG_V9.md#9.6.1">9.6.1</a></b><br/>
+<b><a href="doc/changelogs/CHANGELOG_V9.md#9.7.0">9.7.0</a></b><br/>
+<a href="doc/changelogs/CHANGELOG_V9.md#9.6.1">9.6.1</a><br/>
 <a href="doc/changelogs/CHANGELOG_V9.md#9.6.0">9.6.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V9.md#9.5.0">9.5.0</a><br/>
 <a href="doc/changelogs/CHANGELOG_V9.md#9.4.0">9.4.0</a><br/>

configure

@@ -383,11 +383,6 @@ parser.add_option('--with-dtrace',
     dest='with_dtrace',
     help='build with DTrace (default is true on sunos and darwin)')
 
-parser.add_option('--with-lttng',
-    action='store_true',
-    dest='with_lttng',
-    help='build with Lttng (Only supported on Linux)')
-
 parser.add_option('--with-etw',
     action='store_true',
     dest='with_etw',
@@ -938,15 +933,6 @@ def configure_node(o):
   else:
     o['variables']['node_use_dtrace'] = 'false'
 
-  # Enable Lttng if --with-lttng was defined. Use logic similar to
-  # ETW for windows. Lttng is only available on the Linux platform.
-  if flavor == 'linux':
-    o['variables']['node_use_lttng'] = b(options.with_lttng)
-  elif options.with_lttng:
-    raise Exception('lttng is only supported on Linux.')
-  else:
-    o['variables']['node_use_lttng'] = 'false'
-
   if options.no_ifaddrs:
     o['defines'] += ['SUNOS_NO_IFADDRS']
 

deps/node-inspect/.eslintrc

@@ -139,9 +139,3 @@ globals:
   DTRACE_HTTP_SERVER_RESPONSE: false
   DTRACE_NET_SERVER_CONNECTION: false
   DTRACE_NET_STREAM_END: false
-  LTTNG_HTTP_CLIENT_REQUEST: false
-  LTTNG_HTTP_CLIENT_RESPONSE: false
-  LTTNG_HTTP_SERVER_REQUEST: false
-  LTTNG_HTTP_SERVER_RESPONSE: false
-  LTTNG_NET_SERVER_CONNECTION: false
-  LTTNG_NET_STREAM_END: false

doc/api/deprecations.md

@@ -915,6 +915,14 @@ Type: Runtime
 
 This was never a documented feature.
 
+
+<a id="DEP0101"></a>
+### DEP0101: --with-lttng
+
+Type: End-of-Life
+
+The `--with-lttng` compile time option is removed.
+
 [`--pending-deprecation`]: cli.html#cli_pending_deprecation
 [`Buffer.allocUnsafeSlow(size)`]: buffer.html#buffer_class_method_buffer_allocunsafeslow_size
 [`Buffer.from(array)`]: buffer.html#buffer_class_method_buffer_from_array

doc/api/timers.md

@@ -25,7 +25,7 @@ functions that can be used to control this default behavior.
 
 ### immediate.ref()
 <!-- YAML
-added: REPLACEME
+added: v9.7.0
 -->
 
 When called, requests that the Node.js event loop *not* exit so long as the
@@ -39,7 +39,7 @@ Returns a reference to the `Immediate`.
 
 ### immediate.unref()
 <!-- YAML
-added: REPLACEME
+added: v9.7.0
 -->
 
 When called, the active `Immediate` object will not require the Node.js event

doc/api/util.md

@@ -256,7 +256,7 @@ with care and never in a hot code path.
 
 ## util.getSystemErrorName(err)
 <!-- YAML
-added: REPLACEME
+added: v9.7.0
 -->
 
 * `err` {number}

doc/guides/contributing/pull-requests.md

@@ -146,7 +146,7 @@ A good commit message should describe what changed and why.
 
    Examples:
    - `net: add localAddress and localPort to Socket`
-   - `src: fix typos in node_lttng_provider.h`
+   - `src: fix typos in async_wrap.h`
 
 
 2. Keep the second line blank.

lib/_http_client.js

@@ -254,7 +254,6 @@ util.inherits(ClientRequest, OutgoingMessage);
 
 ClientRequest.prototype._finish = function _finish() {
   DTRACE_HTTP_CLIENT_REQUEST(this, this.connection);
-  LTTNG_HTTP_CLIENT_REQUEST(this, this.connection);
   COUNTER_HTTP_CLIENT_REQUEST();
   OutgoingMessage.prototype._finish.call(this);
 };
@@ -321,7 +320,7 @@ function socketCloseListener() {
   var parser = socket.parser;
   if (req.res && req.res.readable) {
     // Socket closed before we emitted 'end' below.
-    req.res.emit('aborted');
+    if (!req.res.complete) req.res.emit('aborted');
     var res = req.res;
     res.on('end', function() {
       res.emit('close');
@@ -511,7 +510,6 @@ function parserOnIncomingClient(res, shouldKeepAlive) {
   }
 
   DTRACE_HTTP_CLIENT_RESPONSE(socket, req);
-  LTTNG_HTTP_CLIENT_RESPONSE(socket, req);
   COUNTER_HTTP_CLIENT_RESPONSE();
   req.res = res;
   res.req = req;

lib/_http_server.js

@@ -135,7 +135,6 @@ util.inherits(ServerResponse, OutgoingMessage);
 
 ServerResponse.prototype._finish = function _finish() {
   DTRACE_HTTP_SERVER_RESPONSE(this.connection);
-  LTTNG_HTTP_SERVER_RESPONSE(this.connection);
   COUNTER_HTTP_SERVER_RESPONSE();
   OutgoingMessage.prototype._finish.call(this);
 };
@@ -611,7 +610,6 @@ function parserOnIncoming(server, socket, state, req, keepAlive) {
 
   res.shouldKeepAlive = keepAlive;
   DTRACE_HTTP_SERVER_REQUEST(req, socket);
-  LTTNG_HTTP_SERVER_REQUEST(req, socket);
   COUNTER_HTTP_SERVER_REQUEST();
 
   if (socket._httpMessage) {

lib/internal/loader/ModuleJob.js

@@ -15,6 +15,7 @@ class ModuleJob {
     this.loader = loader;
     this.error = null;
     this.hadError = false;
+    this.inspectBrk = inspectBrk;
 
     // This is a Promise<{ module, reflect }>, whose fields will be copied
     // onto `this` by `link()` below once it has been resolved.
@@ -26,10 +27,6 @@ class ModuleJob {
     const link = async () => {
       ({ module: this.module,
          reflect: this.reflect } = await this.modulePromise);
-      if (inspectBrk) {
-        const initWrapper = process.binding('inspector').callAndPauseOnStart;
-        initWrapper(this.module.instantiate, this.module);
-      }
       assert(this.module instanceof ModuleWrap);
 
       const dependencyJobs = [];
@@ -83,7 +80,12 @@ class ModuleJob {
       throw e;
     }
     try {
-      this.module.instantiate();
+      if (this.inspectBrk) {
+        const initWrapper = process.binding('inspector').callAndPauseOnStart;
+        initWrapper(this.module.instantiate, this.module);
+      } else {
+        this.module.instantiate();
+      }
     } catch (e) {
       decorateErrorStack(e);
       throw e;

lib/net.js

@@ -506,7 +506,6 @@ Socket.prototype._read = function(n) {
 Socket.prototype.end = function(data, encoding, callback) {
   stream.Duplex.prototype.end.call(this, data, encoding, callback);
   DTRACE_NET_STREAM_END(this);
-  LTTNG_NET_STREAM_END(this);
   return this;
 };
 
@@ -1579,7 +1578,6 @@ function onconnection(err, clientHandle) {
   socket._server = self;
 
   DTRACE_NET_SERVER_CONNECTION(socket);
-  LTTNG_NET_SERVER_CONNECTION(socket);
   COUNTER_NET_SERVER_CONNECTION(socket);
   self.emit('connection', socket);
 }

node.gyp

@@ -3,7 +3,6 @@
     'v8_use_snapshot%': 'false',
     'v8_trace_maps%': 0,
     'node_use_dtrace%': 'false',
-    'node_use_lttng%': 'false',
     'node_use_etw%': 'false',
     'node_use_perfctr%': 'false',
     'node_no_browser_globals%': 'false',
@@ -567,19 +566,6 @@
             }],
           ],
         }],
-        [ 'node_use_lttng=="true"', {
-          'defines': [ 'HAVE_LTTNG=1' ],
-          'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)' ],
-          'libraries': [ '-llttng-ust' ],
-          'include_dirs': [
-            'src',
-            'tools/msvs/genfiles',
-            '<(SHARED_INTERMEDIATE_DIR)' # for node_natives.h
-          ],
-          'sources': [
-            'src/node_lttng.cc'
-          ],
-        }],
         [ 'node_use_dtrace=="true"', {
           'defines': [ 'HAVE_DTRACE=1' ],
           'dependencies': [
@@ -781,9 +767,6 @@
             [ 'node_use_dtrace=="false" and node_use_etw=="false"', {
               'inputs': [ 'src/notrace_macros.py' ]
             }],
-            [ 'node_use_lttng=="false"', {
-              'inputs': [ 'src/nolttng_macros.py' ]
-            }],
             [ 'node_use_perfctr=="false"', {
               'inputs': [ 'src/noperfctr_macros.py' ]
             }]