Propose v6.3.0

.github/ISSUE_TEMPLATE.md

@@ -1,9 +1,9 @@
 <!--
-Thank you for reporting an issue. Please fill in the template below. If unsure
-about something, just do as best as you're able.
+Thank you for reporting an issue.
+Please fill in as much of the template below as you're able.
 
-Version: usually output of `node -v`
-Platform: either `uname -a` output, or if Windows, version and 32 or 64-bit
+Version: output of `node -v`
+Platform: output of `uname -a` (UNIX), or version and 32 or 64-bit (Windows)
 Subsystem: if known, please specify affected core module name
 
 If possible, please provide code that demonstrates the problem, keeping it as

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,23 +1,22 @@
 <!--
 Thank you for your pull request. Please review below requirements.
 
-Bug fixes and new features should include tests and possibly a benchmark.
+Bug fixes and new features should include tests and possibly benchmarks.
 
 Contributors guide: https://github.com/nodejs/node/blob/master/CONTRIBUTING.md
 -->
 
 ##### Checklist
 <!-- Remove items that do not apply. For completed items, change [ ] to [x]. -->
 
-- [ ] `make -j4 test` (UNIX) or `vcbuild test nosign` (Windows) passes
-- [ ] a test and/or benchmark is included
+- [ ] `make -j4 test` (UNIX), or `vcbuild test nosign` (Windows) passes
+- [ ] tests and/or benchmarks are included
 - [ ] documentation is changed or added
-- [ ] the commit message follows commit guidelines
-
+- [ ] commit message follows commit guidelines
 
 ##### Affected core subsystem(s)
-<!-- provide affected core subsystem(s) (like doc, cluster, crypto, etc) -->
+<!-- Provide affected core subsystem(s) (like doc, cluster, crypto, etc). -->
 
 
 ##### Description of change
-<!-- provide a description of the change below this comment -->
+<!-- Provide a description of the change below this comment. -->

BUILDING.md

@@ -99,8 +99,10 @@ $ node -e "console.log('Hello from Node.js ' + process.version)"
 Prerequisites:
 
 * [Python 2.6 or 2.7](https://www.python.org/downloads/)
-* Visual Studio 2013 / 2015, all editions including the Community edition, or
-* Visual Studio Express 2013 / 2015 for Desktop
+* One of:
+  * [Visual C++ Build Tools](http://landinghub.visualstudio.com/visual-cpp-build-tools)
+  * [Visual Studio](https://www.visualstudio.com/) 2013 / 2015, all editions including the Community edition
+  * [Visual Studio](https://www.visualstudio.com/) Express 2013 / 2015 for Desktop
 * Basic Unix tools required for some tests,
   [Git for Windows](http://git-scm.com/download/win) includes Git Bash
   and tools which can be included in the global `PATH`.
@@ -117,8 +119,8 @@ To run the tests:
 
 To test if Node.js was built correctly:
 
-```
-$ node -e "console.log('Hello from Node.js ' + process.version)"
+```text
+> Release\node -e "console.log('Hello from Node.js', process.version)"
 ```
 
 ### Android / Android-based devices (e.g., Firefox OS)

Makefile

@@ -19,9 +19,9 @@ ifdef QUICKCHECK
 endif
 
 ifdef ENABLE_V8_TAP
-  TAP_V8 := --junitout v8-tap.xml
-  TAP_V8_INTL := --junitout v8-intl-tap.xml
-  TAP_V8_BENCHMARKS := --junitout v8-benchmarks-tap.xml
+  TAP_V8 := --junitout $(PWD)/v8-tap.xml
+  TAP_V8_INTL := --junitout $(PWD)/v8-intl-tap.xml
+  TAP_V8_BENCHMARKS := --junitout $(PWD)/v8-benchmarks-tap.xml
 endif
 
 V8_TEST_OPTIONS = $(V8_EXTRA_TEST_OPTIONS)
@@ -184,11 +184,25 @@ test-all: test-build test/gc/node_modules/weak/build/Release/weakref.node
 test-all-valgrind: test-build
 	$(PYTHON) tools/test.py --mode=debug,release --valgrind
 
+CI_NATIVE_SUITES := addons
+CI_JS_SUITES := doctool known_issues message parallel pseudo-tty sequential
+
+# Build and test addons without building anything else
+test-ci-native: | test/addons/.buildstamp
+	$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
+		--mode=release --flaky-tests=$(FLAKY_TESTS) \
+		$(TEST_CI_ARGS) $(CI_NATIVE_SUITES)
+
+# This target should not use a native compiler at all
+test-ci-js:
+	$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
+		--mode=release --flaky-tests=$(FLAKY_TESTS) \
+		$(TEST_CI_ARGS) $(CI_JS_SUITES)
+
 test-ci: | build-addons
 	$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
 		--mode=release --flaky-tests=$(FLAKY_TESTS) \
-		$(TEST_CI_ARGS) addons doctool known_issues message pseudo-tty parallel \
-		sequential
+		$(TEST_CI_ARGS) $(CI_NATIVE_SUITES) $(CI_JS_SUITES)
 
 test-release: test-build
 	$(PYTHON) tools/test.py --mode=release
@@ -299,9 +313,11 @@ docopen: out/doc/api/all.html
 docclean:
 	-rm -rf out/doc
 
-run-ci:
+build-ci:
 	$(PYTHON) ./configure $(CONFIG_FLAGS)
 	$(MAKE)
+
+run-ci: build-ci
 	$(MAKE) test-ci
 
 RAWVER=$(shell $(PYTHON) tools/getnodeversion.py)
@@ -671,18 +687,12 @@ jslint-ci:
 		tools/eslint-rules tools/jslint.js
 
 CPPLINT_EXCLUDE ?=
-CPPLINT_EXCLUDE += src/node_lttng.cc
 CPPLINT_EXCLUDE += src/node_root_certs.h
-CPPLINT_EXCLUDE += src/node_lttng_tp.h
-CPPLINT_EXCLUDE += src/node_win32_perfctr_provider.cc
 CPPLINT_EXCLUDE += src/queue.h
 CPPLINT_EXCLUDE += src/tree.h
-CPPLINT_EXCLUDE += src/v8abbr.h
 CPPLINT_EXCLUDE += $(wildcard test/addons/??_*/*.cc test/addons/??_*/*.h)
 
 CPPLINT_FILES = $(filter-out $(CPPLINT_EXCLUDE), $(wildcard \
-	deps/debugger-agent/include/* \
-	deps/debugger-agent/src/* \
 	src/*.c \
 	src/*.cc \
 	src/*.h \
@@ -715,4 +725,4 @@ endif
 	bench-all bench bench-misc bench-array bench-buffer bench-net \
 	bench-http bench-fs bench-tls cctest run-ci test-v8 test-v8-intl \
 	test-v8-benchmarks test-v8-all v8 lint-ci bench-ci jslint-ci doc-only \
-	$(TARBALL)-headers
+	$(TARBALL)-headers test-ci test-ci-native test-ci-js build-ci

README.md

@@ -186,6 +186,7 @@ information about the governance of the Node.js project, see
 * [joaocgreis](https://github.com/joaocgreis) - **João Reis** <reis@janeasystems.com>
 * [julianduque](https://github.com/julianduque) - **Julian Duque** <julianduquej@gmail.com>
 * [JungMinu](https://github.com/JungMinu) - **Minwoo Jung** <jmwsoft@gmail.com>
+* [lance](https://github.com/lance) - **Lance Ball** <lball@redhat.com>
 * [lxe](https://github.com/lxe) - **Aleksey Smolenchuk** <lxe@lxe.co>
 * [matthewloring](https://github.com/matthewloring) - **Matthew Loring** <mattloring@google.com>
 * [mcollina](https://github.com/mcollina) - **Matteo Collina** <matteo.collina@gmail.com>
@@ -203,6 +204,7 @@ information about the governance of the Node.js project, see
 * [robertkowalski](https://github.com/robertkowalski) - **Robert Kowalski** <rok@kowalski.gd>
 * [romankl](https://github.com/romankl) - **Roman Klauke** <romaaan.git@gmail.com>
 * [ronkorving](https://github.com/ronkorving) - **Ron Korving** <ron@ronkorving.nl>
+* [RReverser](https://github.com/RReverser) - **Ingvar Stepanyan** <me@rreverser.com>
 * [saghul](https://github.com/saghul) - **Saúl Ibarra Corretgé** <saghul@gmail.com>
 * [sam-github](https://github.com/sam-github) - **Sam Roberts** <vieuxtech@gmail.com>
 * [santigimeno](https://github.com/santigimeno) - **Santiago Gimeno** <santiago.gimeno@gmail.com>

benchmark/crypto/get-ciphers.js

@@ -0,0 +1,20 @@
+'use strict';
+
+const common = require('../common.js');
+
+const bench = common.createBenchmark(main, {
+  n: [1, 5000],
+  v: ['crypto', 'tls']
+});
+
+function main(conf) {
+  const n = +conf.n;
+  const v = conf.v;
+  const method = require(v).getCiphers;
+  var i = 0;
+
+  common.v8ForceOptimization(method);
+  bench.start();
+  for (; i < n; i++) method();
+  bench.end(n);
+}

benchmark/misc/util-extend-vs-object-assign.js

@@ -0,0 +1,40 @@
+'use strict';
+
+const common = require('../common.js');
+const util = require('util');
+const v8 = require('v8');
+
+const bench = common.createBenchmark(main, {
+  type: ['extend', 'assign'],
+  n: [10e4]
+});
+
+function main(conf) {
+  let fn;
+  const n = conf.n | 0;
+  let v8command;
+
+  if (conf.type === 'extend') {
+    fn = util._extend;
+    v8command = '%OptimizeFunctionOnNextCall(util._extend)';
+  } else if (conf.type === 'assign') {
+    fn = Object.assign;
+    // Object.assign is built-in, cannot be optimized
+    v8command = '';
+  }
+
+  // Force-optimize the method to test so that the benchmark doesn't
+  // get disrupted by the optimizer kicking in halfway through.
+  for (var i = 0; i < conf.type.length * 10; i += 1)
+    fn({}, process.env);
+
+  v8.setFlagsFromString('--allow_natives_syntax');
+  eval(v8command);
+
+  var obj = new Proxy({}, { set: function(a, b, c) { return true; } });
+
+  bench.start();
+  for (var j = 0; j < n; j += 1)
+    fn(obj, process.env);
+  bench.end(n);
+}

benchmark/net/punycode.js

@@ -0,0 +1,75 @@
+'use strict';
+
+const common = require('../common.js');
+const icu = process.binding('icu');
+const punycode = require('punycode');
+
+const bench = common.createBenchmark(main, {
+  method: ['punycode', 'icu'],
+  n: [1024],
+  val: [
+    'افغانستا.icom.museum',
+    'الجزائر.icom.museum',
+    'österreich.icom.museum',
+    'বাংলাদেশ.icom.museum',
+    'беларусь.icom.museum',
+    'belgië.icom.museum',
+    'българия.icom.museum',
+    'تشادر.icom.museum',
+    '中国.icom.museum',
+    'القمر.icom.museum',
+    'κυπρος.icom.museum',
+    'českárepublika.icom.museum',
+    'مصر.icom.museum',
+    'ελλάδα.icom.museum',
+    'magyarország.icom.museum',
+    'ísland.icom.museum',
+    'भारत.icom.museum',
+    'ايران.icom.museum',
+    'éire.icom.museum',
+    'איקו״ם.ישראל.museum',
+    '日本.icom.museum',
+    'الأردن.icom.museum'
+  ]
+});
+
+function usingPunycode(val) {
+  punycode.toUnicode(punycode.toASCII(val));
+}
+
+function usingICU(val) {
+  icu.toUnicode(icu.toASCII(val));
+}
+
+function runPunycode(n, val) {
+  common.v8ForceOptimization(usingPunycode, val);
+  var i = 0;
+  bench.start();
+  for (; i < n; i++)
+    usingPunycode(val);
+  bench.end(n);
+}
+
+function runICU(n, val) {
+  common.v8ForceOptimization(usingICU, val);
+  var i = 0;
+  bench.start();
+  for (; i < n; i++)
+    usingICU(val);
+  bench.end(n);
+}
+
+function main(conf) {
+  const n = +conf.n;
+  const val = conf.val;
+  switch (conf.method) {
+    case 'punycode':
+      runPunycode(n, val);
+      break;
+    case 'icu':
+      runICU(n, val);
+      break;
+    default:
+      throw new Error('Unexpected method');
+  }
+}

benchmark/streams/readable-bigread.js

@@ -0,0 +1,32 @@
+'use strict';
+
+const common = require('../common');
+const v8 = require('v8');
+const Readable = require('stream').Readable;
+
+const bench = common.createBenchmark(main, {
+  n: [100e1]
+});
+
+function main(conf) {
+  const n = +conf.n;
+  const b = new Buffer(32);
+  const s = new Readable();
+  function noop() {}
+  s._read = noop;
+
+  // Force optimization before starting the benchmark
+  s.push(b);
+  v8.setFlagsFromString('--allow_natives_syntax');
+  eval('%OptimizeFunctionOnNextCall(s.read)');
+  s.push(b);
+  while (s.read(128));
+
+  bench.start();
+  for (var k = 0; k < n; ++k) {
+    for (var i = 0; i < 1e4; ++i)
+      s.push(b);
+    while (s.read(128));
+  }
+  bench.end(n);
+}

benchmark/streams/readable-bigunevenread.js

@@ -0,0 +1,32 @@
+'use strict';
+
+const common = require('../common');
+const v8 = require('v8');
+const Readable = require('stream').Readable;
+
+const bench = common.createBenchmark(main, {
+  n: [100e1]
+});
+
+function main(conf) {
+  const n = +conf.n;
+  const b = new Buffer(32);
+  const s = new Readable();
+  function noop() {}
+  s._read = noop;
+
+  // Force optimization before starting the benchmark
+  s.push(b);
+  v8.setFlagsFromString('--allow_natives_syntax');
+  eval('%OptimizeFunctionOnNextCall(s.read)');
+  s.push(b);
+  while (s.read(106));
+
+  bench.start();
+  for (var k = 0; k < n; ++k) {
+    for (var i = 0; i < 1e4; ++i)
+      s.push(b);
+    while (s.read(106));
+  }
+  bench.end(n);
+}