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

Merge f2d9379 as of 2018-03-04
This commit was automatically generated. For any problems, please contact jackhorton

Reviewed-By: Jack Horton <jahorto@microsoft.com>

Author: chakrabot

benchmark/streams/pipe.js

@@ -8,7 +8,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n }) {
-  const b = new Buffer(1024);
+  const b = Buffer.alloc(1024);
   const r = new Readable();
   const w = new Writable();
 

benchmark/streams/readable-bigread.js

@@ -8,7 +8,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n }) {
-  const b = new Buffer(32);
+  const b = Buffer.alloc(32);
   const s = new Readable();
   function noop() {}
   s._read = noop;

benchmark/streams/readable-bigunevenread.js

@@ -8,7 +8,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n }) {
-  const b = new Buffer(32);
+  const b = Buffer.alloc(32);
   const s = new Readable();
   function noop() {}
   s._read = noop;

benchmark/streams/readable-readall.js

@@ -8,7 +8,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n }) {
-  const b = new Buffer(32);
+  const b = Buffer.alloc(32);
   const s = new Readable();
   function noop() {}
   s._read = noop;

benchmark/streams/readable-unevenread.js

@@ -8,7 +8,7 @@ const bench = common.createBenchmark(main, {
 });
 
 function main({ n }) {
-  const b = new Buffer(32);
+  const b = Buffer.alloc(32);
   const s = new Readable();
   function noop() {}
   s._read = noop;

deps/openssl/openssl.gyp

@@ -157,6 +157,9 @@
       }, {
         'defines': ['<@(openssl_default_defines_not_win)'],
         'cflags': ['-Wno-missing-field-initializers'],
+        'xcode_settings': {
+          'WARNING_CFLAGS': ['-Wno-missing-field-initializers'],
+        },
         'conditions': [
           ['OS=="mac"', {
             'defines': ['<@(openssl_default_defines_mac)'],

doc/api/cli.md

@@ -235,6 +235,14 @@ added: v7.7.0
 A comma separated list of categories that should be traced when trace event
 tracing is enabled using `--trace-events-enabled`.
 
+### `--trace-event-file-pattern`
+<!-- YAML
+added: REPLACEME
+-->
+
+Template string specifying the filepath for the trace event data, it
+supports `${rotation}` and `${pid}`.
+
 ### `--zero-fill-buffers`
 <!-- YAML
 added: v6.0.0
@@ -464,6 +472,7 @@ Node options that are allowed are:
 - `--trace-deprecation`
 - `--trace-events-categories`
 - `--trace-events-enabled`
+- `--trace-event-file-pattern`
 - `--trace-sync-io`
 - `--trace-warnings`
 - `--track-heap-objects`

doc/api/n-api.md

@@ -3269,9 +3269,11 @@ napi_status napi_create_async_work(napi_env env,
 - `[in] async_resource_name`: Identifier for the kind of resource that is
 being provided for diagnostic information exposed by the `async_hooks` API.
 - `[in] execute`: The native function which should be called to excute
-the logic asynchronously.
+the logic asynchronously. The given function is called from a worker pool
+thread and can execute in parallel with the main event loop thread.
 - `[in] complete`: The native function which will be called when the
-asynchronous logic is comple or is cancelled.
+asynchronous logic is completed or is cancelled. The given function is called
+from the main event loop thread.
 - `[in] data`: User-provided data context. This will be passed back into the
 execute and complete functions.
 - `[out] result`: `napi_async_work*` which is the handle to the newly created
@@ -3346,9 +3348,9 @@ callback invocation, even if it has been successfully cancelled.
 
 ## Custom Asynchronous Operations
 The simple asynchronous work APIs above may not be appropriate for every
-scenario, because with those the async execution still happens on the main
-event loop. When using any other async mechanism, the following APIs are
-necessary to ensure an async operation is properly tracked by the runtime.
+scenario. When using any other asynchronous mechanism, the following APIs
+are necessary to ensure an asynchronous operation is properly tracked by
+the runtime.
 
 ### napi_async_init
 <!-- YAML

doc/api/tracing.md

@@ -33,6 +33,15 @@ Running Node.js with tracing enabled will produce log files that can be opened
 in the [`chrome://tracing`](https://www.chromium.org/developers/how-tos/trace-event-profiling-tool)
 tab of Chrome.
 
+The logging file is by default called `node_trace.${rotation}.log`, where
+`${rotation}` is an incrementing log-rotation id. The filepath pattern can
+be specified with `--trace-event-file-pattern` that accepts a template
+string that supports `${rotation}` and `${pid}`. For example:
+
+```txt
+node --trace-events-enabled --trace-event-file-pattern '${pid}-${rotation}.log' server.js
+```
+
 Starting with Node 10.0.0, the tracing system uses the same time source as the
 one used by `process.hrtime()` however the trace-event timestamps are expressed
 in microseconds, unlike `process.hrtime()` which returns nanoseconds.

doc/api/url.md

@@ -948,6 +948,20 @@ changes:
 The `url.format()` method returns a formatted URL string derived from
 `urlObject`.
 
+```js
+url.format({
+  protocol: 'https',
+  hostname: 'example.com',
+  pathname: '/some/path',
+  query: {
+    page: 1,
+    format: 'json'
+  }
+});
+
+// => 'https://example.com/some/path?page=1&format=json'
+```
+
 If `urlObject` is not an object or a string, `url.format()` will throw a
 [`TypeError`][].