(v6.x backport) events: do not keep arrays with a single listener

.eslintrc.yaml

@@ -109,8 +109,14 @@ rules:
  message: "setTimeout() must be invoked with at least two arguments."
  }, {
  selector: "CallExpression[callee.name='setInterval'][arguments.length<2]",
- message: "setInterval() must be invoked with at least 2 arguments"
- }]
+ message: "setInterval() must be invoked with at least 2 arguments."
+ }, {
+ selector: "ThrowStatement > CallExpression[callee.name=/Error$/]",
+ message: "Use new keyword when throwing an Error."
+ }, {
+ selector: "CallExpression[callee.object.name='assert'][callee.property.name='fail'][arguments.length=1]",
+ message: "assert.fail() message should be third argument"
+ }]
  no-tabs: 2
  no-trailing-spaces: 2
  operator-linebreak: [2, after, {overrides: {'?': ignore, ':': ignore}}]
@@ -140,9 +146,7 @@ rules:
 
  # Custom rules in tools/eslint-rules
  align-multiline-assignment: 2
- assert-fail-single-argument: 2
  assert-throws-arguments: [2, { requireTwo: false }]
- new-with-error: [2, Error, RangeError, TypeError, SyntaxError, ReferenceError]
  no-useless-regex-char-class-escape: [2, { override: ['[', ']'] }]
 
 # Global scoped method and vars

.gitignore

@@ -34,6 +34,7 @@ node_g
 .benchmark_reports
 icu_config.gypi
 .eslintcache
+node_trace.*.log
 
 /out
 

BUILDING.md

@@ -26,11 +26,10 @@ Support is divided into three tiers:
  the broader community.
 * **Tier 2**: Full test coverage but more limited maintenance,
  often provided by the vendor of the platform.
-* **Experimental**: Known to compile but not necessarily reliably or with
- a full passing test suite. These are often working to be promoted to Tier
- 2 but are not quite ready. There is at least one individual actively
- providing maintenance and the team is striving to broaden quality and
- reliability of support.
+* **Experimental**: May not compile reliably or test suite may not pass.
+ These are often working to be promoted to Tier 2 but are not quite ready.
+ There is at least one individual actively providing maintenance and the team
+ is striving to broaden quality and reliability of support.
 
 ### Supported platforms
 
@@ -96,7 +95,7 @@ to avoid popups asking to accept incoming network connections when running tests
 $ sudo ./tools/macosx-firewall.sh
 ```
 Running this script will add rules for the executable `node` in the out
-directory and the symbolic `node` link in the projects root directory.
+directory and the symbolic `node` link in the project's root directory.
 
 On FreeBSD and OpenBSD, you may also need:
 * libexecinfo
@@ -121,7 +120,7 @@ and not a newer version.
 
 To run the tests:
 
-```console
+```
 $ make test
 ```
 
@@ -206,9 +205,9 @@ in the current continuous integration environment. The participation of people
 dedicated and determined to improve Android building, testing, and support is
 encouraged.
 
-Be sure you have downloaded and extracted [Android NDK]
-(https://developer.android.com/tools/sdk/ndk/index.html)
-before in a folder. Then run:
+Be sure you have downloaded and extracted
+[Android NDK](https://developer.android.com/tools/sdk/ndk/index.html) before in
+a folder. Then run:
 
 ```console
 $ ./android-configure /path/to/your/android-ndk
@@ -350,6 +349,6 @@ and [user guide](https://openssl.org/docs/fips/UserGuide-2.0.pdf).
 6. Get into Node.js checkout folder
 7. `./configure --openssl-fips=/path/to/openssl-fips/installdir`
  For example on ubuntu 12 the installation directory was
- /usr/local/ssl/fips-2.0
+ `/usr/local/ssl/fips-2.0`
 8. Build Node.js with `make -j`
-9. Verify with `node -p "process.versions.openssl"` (`1.0.2a-fips`)
+9. Verify with `node -p "process.versions.openssl"` (for example `1.0.2a-fips`)

Makefile

@@ -122,7 +122,7 @@ test: all
  $(MAKE) build-addons
  $(MAKE) cctest
  $(PYTHON) tools/test.py --mode=release -J \
- addons doctool inspector known_issues message pseudo-tty parallel sequential
+ doctool inspector known_issues message pseudo-tty parallel sequential addons
  $(MAKE) lint
 
 test-parallel: all
@@ -186,6 +186,14 @@ test/addons/.buildstamp: config.gypi \
 # TODO(bnoordhuis) Force rebuild after gyp update.
 build-addons: $(NODE_EXE) test/addons/.buildstamp
 
+clear-stalled:
+ # Clean up any leftover processes but don't error if found.
+ ps awwx | grep Release/node | grep -v grep | cat
+ @PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
+ if [ "$${PS_OUT}" ]; then \
+ echo $${PS_OUT} | xargs kill; \
+ fi
+
 test-gc: all test/gc/node_modules/weak/build/Release/weakref.node
  $(PYTHON) tools/test.py --mode=release gc
 
@@ -208,26 +216,28 @@ test-ci-native: | test/addons/.buildstamp
  $(TEST_CI_ARGS) $(CI_NATIVE_SUITES)
 
 # This target should not use a native compiler at all
-test-ci-js:
+test-ci-js: | clear-stalled
  $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
  --mode=release --flaky-tests=$(FLAKY_TESTS) \
  $(TEST_CI_ARGS) $(CI_JS_SUITES)
- # Clean up any leftover processes
- PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
+ # Clean up any leftover processes, error if found.
+ ps awwx | grep Release/node | grep -v grep | cat
+ @PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
  if [ "$${PS_OUT}" ]; then \
  echo $${PS_OUT} | $(XARGS) kill; exit 1; \
  fi
 
 test-ci: LOGLEVEL := info
-test-ci: | build-addons
+test-ci: | clear-stalled build-addons
  out/Release/cctest --gtest_output=tap:cctest.tap
  $(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
  --mode=release --flaky-tests=$(FLAKY_TESTS) \
- $(TEST_CI_ARGS) $(CI_NATIVE_SUITES) $(CI_JS_SUITES)
- # Clean up any leftover processes
- PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
+ $(TEST_CI_ARGS) $(CI_JS_SUITES) $(CI_NATIVE_SUITES)
+ # Clean up any leftover processes, error if found.
+ ps awwx | grep Release/node | grep -v grep | cat
+ @PS_OUT=`ps awwx | grep Release/node | grep -v grep | awk '{print $$1}'`; \
  if [ "$${PS_OUT}" ]; then \
- echo $${PS_OUT} | $(XARGS) kill; exit 1; \
+ echo $${PS_OUT} | xargs kill; exit 1; \
  fi
 
 test-release: test-build
@@ -800,5 +810,4 @@ endif
  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 test-ci test-ci-native \
- test-ci-js build-ci
-
+ test-ci-js build-ci clear-stalled

benchmark/module/module-loader.js

@@ -34,6 +34,8 @@ function main(conf) {
  measureFull(n);
  else
  measureDir(n);
+
+ rmrf(tmpDirectory);
 }
 
 function measureFull(n) {

benchmark/net/tcp-raw-pipe.js

@@ -97,8 +97,6 @@ function client() {
  if (err)
  fail(err, 'connect');
 
- clientHandle.readStart();
-
  clientHandle.onread = function(nread, buffer) {
  if (nread < 0)
  fail(nread, 'read');
@@ -112,6 +110,8 @@ function client() {
 
  bench.start();
 
+ clientHandle.readStart();
+
  setTimeout(function() {
  // multiply by 2 since we're sending it first one way
  // then then back again.

deps/openssl/asm/arm-void-gas/aes/bsaes-armv7.S

@@ -1298,7 +1298,7 @@ bsaes_cbc_encrypt:
  vmov q4,q15 @ just in case ensure that IV
  vmov q5,q0 @ and input are preserved
  bl AES_decrypt
- vld1.8 {q0}, [r9,:64] @ load result
+ vld1.8 {q0}, [r9] @ load result
  veor q0, q0, q4 @ ^= IV
  vmov q15, q5 @ q5 holds input
  vst1.8 {q0}, [r10] @ write output

deps/openssl/asm/x64-elf-gas/aes/aesni-sha1-x86_64.s

@@ -2692,6 +2692,7 @@ aesni_cbc_sha1_enc_shaext:
  movl 240(%rcx),%r11d
  subq %rdi,%rsi
  movups (%rcx),%xmm15
+ movups (%r8),%xmm2
  movups 16(%rcx),%xmm0
  leaq 112(%rcx),%rcx
 

deps/openssl/asm/x64-elf-gas/aes/aesni-sha256-x86_64.s

@@ -4012,6 +4012,7 @@ aesni_cbc_sha256_enc_shaext:
  movl 240(%rcx),%r11d
  subq %rdi,%rsi
  movups (%rcx),%xmm15
+ movups (%r8),%xmm6
  movups 16(%rcx),%xmm4
  leaq 112(%rcx),%rcx
 

deps/openssl/asm/x64-elf-gas/x86_64cpuid.s

@@ -107,14 +107,6 @@ OPENSSL_ia32_cpuid:
  shrl $14,%r10d
  andl $0xfff,%r10d
 
- cmpl $7,%r11d
- jb .Lnocacheinfo
-
- movl $7,%eax
- xorl %ecx,%ecx
- cpuid
- movl %ebx,8(%rdi)
-
 .Lnocacheinfo:
  movl $1,%eax
  cpuid
@@ -144,6 +136,15 @@ OPENSSL_ia32_cpuid:
  orl %ecx,%r9d
 
  movl %edx,%r10d
+
+ cmpl $7,%r11d
+ jb .Lno_extended_info
+ movl $7,%eax
+ xorl %ecx,%ecx
+ cpuid
+ movl %ebx,8(%rdi)
+.Lno_extended_info:
+
  btl $27,%r9d
  jnc .Lclear_avx
  xorl %ecx,%ecx

deps/openssl/asm/x64-macosx-gas/aes/aesni-sha1-x86_64.s

@@ -2692,6 +2692,7 @@ aesni_cbc_sha1_enc_shaext:
  movl 240(%rcx),%r11d
  subq %rdi,%rsi
  movups (%rcx),%xmm15
+ movups (%r8),%xmm2
  movups 16(%rcx),%xmm0
  leaq 112(%rcx),%rcx
 

deps/openssl/asm/x64-macosx-gas/aes/aesni-sha256-x86_64.s

@@ -4012,6 +4012,7 @@ aesni_cbc_sha256_enc_shaext:
  movl 240(%rcx),%r11d
  subq %rdi,%rsi
  movups (%rcx),%xmm15
+ movups (%r8),%xmm6
  movups 16(%rcx),%xmm4
  leaq 112(%rcx),%rcx
 

deps/openssl/asm/x64-macosx-gas/x86_64cpuid.s

@@ -108,14 +108,6 @@ L$intel:
  shrl $14,%r10d
  andl $0xfff,%r10d
 
- cmpl $7,%r11d
- jb L$nocacheinfo
-
- movl $7,%eax
- xorl %ecx,%ecx
- cpuid
- movl %ebx,8(%rdi)
-
 L$nocacheinfo:
  movl $1,%eax
  cpuid
@@ -145,6 +137,15 @@ L$generic:
  orl %ecx,%r9d
 
  movl %edx,%r10d
+
+ cmpl $7,%r11d
+ jb L$no_extended_info
+ movl $7,%eax
+ xorl %ecx,%ecx
+ cpuid
+ movl %ebx,8(%rdi)
+L$no_extended_info:
+
  btl $27,%r9d
  jnc L$clear_avx
  xorl %ecx,%ecx

deps/openssl/asm/x64-win32-masm/aes/aesni-sha1-x86_64.asm

@@ -2793,6 +2793,7 @@ $L$prologue_shaext::
  mov r11d,DWORD PTR[240+rcx]
  sub rsi,rdi
  movups xmm15,XMMWORD PTR[rcx]
+ movups xmm2,XMMWORD PTR[r8]
  movups xmm0,XMMWORD PTR[16+rcx]
  lea rcx,QWORD PTR[112+rcx]
 

deps/openssl/asm/x64-win32-masm/aes/aesni-sha256-x86_64.asm

@@ -4146,6 +4146,7 @@ $L$prologue_shaext::
  mov r11d,DWORD PTR[240+rcx]
  sub rsi,rdi
  movups xmm15,XMMWORD PTR[rcx]
+ movups xmm6,XMMWORD PTR[r8]
  movups xmm4,XMMWORD PTR[16+rcx]
  lea rcx,QWORD PTR[112+rcx]
 

deps/openssl/asm/x64-win32-masm/x86_64cpuid.asm

@@ -118,14 +118,6 @@ $L$intel::
  shr r10d,14
  and r10d,0fffh
 
- cmp r11d,7
- jb $L$nocacheinfo
-
- mov eax,7
- xor ecx,ecx
- cpuid
- mov DWORD PTR[8+rdi],ebx
-
 $L$nocacheinfo::
  mov eax,1
  cpuid
@@ -155,6 +147,15 @@ $L$generic::
  or r9d,ecx
 
  mov r10d,edx
+
+ cmp r11d,7
+ jb $L$no_extended_info
+ mov eax,7
+ xor ecx,ecx
+ cpuid
+ mov DWORD PTR[8+rdi],ebx
+$L$no_extended_info::
+
  bt r9d,27
  jnc $L$clear_avx
  xor ecx,ecx