Add s390/s390x Linux support to Node v6.x

.eslintrc

@@ -13,7 +13,7 @@ rules:
   no-duplicate-case: 2
   no-empty-character-class: 2
   no-ex-assign: 2
-  no-extra-boolean-cast : 2
+  no-extra-boolean-cast: 2
   no-extra-parens: [2, "functions"]
   no-extra-semi: 2
   no-func-assign: 2
@@ -86,7 +86,7 @@ rules:
 
   # Custom rules in tools/eslint-rules
   new-with-error: [2, "Error", "RangeError", "TypeError", "SyntaxError", "ReferenceError"]
-
+  align-multiline-assignment: 2
 
 # Global scoped method and vars
 globals:

.gitignore

@@ -41,6 +41,8 @@ _UpgradeReport_Files/
 ipch/
 *.sdf
 *.opensdf
+*.VC.opendb
+.vs/
 
 /config.mk
 /config.gypi

CONTRIBUTING.md

@@ -173,6 +173,7 @@ to address, apply your changes in a separate commit and push that to your
 feature branch. Post a comment in the pull request afterwards; GitHub does
 not send out notifications when you add commits.
 
+<a id="developers-certificate-of-origin"></a>
 ## Developer's Certificate of Origin 1.1
 
 By making a contribution to this project, I certify that:

Makefile

@@ -8,9 +8,12 @@ PREFIX ?= /usr/local
 FLAKY_TESTS ?= run
 TEST_CI_ARGS ?=
 STAGINGSERVER ?= node-www
-
 OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]')
 
+ifdef JOBS
+  PARALLEL_ARGS = -j $(JOBS)
+endif
+
 ifdef QUICKCHECK
   QUICKCHECK_ARG := --quickcheck
 endif
@@ -168,7 +171,8 @@ test-all-valgrind: test-build
 	$(PYTHON) tools/test.py --mode=debug,release --valgrind
 
 test-ci: | build-addons
-	$(PYTHON) tools/test.py -p tap --logfile test.tap --mode=release --flaky-tests=$(FLAKY_TESTS) \
+	$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
+		--mode=release --flaky-tests=$(FLAKY_TESTS) \
 		$(TEST_CI_ARGS) addons message parallel sequential
 
 test-release: test-build
@@ -603,8 +607,13 @@ bench-idle:
 	$(NODE) benchmark/idle_clients.js &
 
 jslint:
-	$(NODE) tools/eslint/bin/eslint.js benchmark lib src test tools/doc \
-		tools/eslint-rules --rulesdir tools/eslint-rules
+	$(NODE) tools/jslint.js -J benchmark lib src test tools/doc \
+	  tools/eslint-rules tools/jslint.js
+
+jslint-ci:
+	$(NODE) tools/jslint.js $(PARALLEL_ARGS) -f tap -o test-eslint.tap \
+		benchmark lib src test tools/doc \
+		tools/eslint-rules tools/jslint.js
 
 CPPLINT_EXCLUDE ?=
 CPPLINT_EXCLUDE += src/node_lttng.cc
@@ -633,19 +642,20 @@ cpplint:
 
 ifneq ("","$(wildcard tools/eslint/bin/eslint.js)")
 lint: jslint cpplint
+lint-ci: jslint-ci cpplint
 else
 lint:
 	@echo "Linting is not available through the source tarball."
 	@echo "Use the git repo instead:" \
 		"$ git clone https://github.com/nodejs/node.git"
-endif
 
 lint-ci: lint
+endif
 
 .PHONY: lint cpplint jslint bench clean docopen docclean doc dist distclean \
 	check uninstall install install-includes install-bin all staticlib \
 	dynamiclib test test-all test-addons build-addons website-upload pkg \
 	blog blogclean tar binary release-only bench-http-simple bench-idle \
 	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
+	test-v8-benchmarks test-v8-all v8 lint-ci bench-ci jslint-ci

README.md

@@ -167,6 +167,7 @@ information about the governance of the Node.js project, see
 
 ### Collaborators
 
+* [addaleax](https://github.com/addaleax) - **Anna Henningsen** <[email protected]>
 * [AndreasMadsen](https://github.com/AndreasMadsen) - **Andreas Madsen** <[email protected]>
 * [benjamingr](https://github.com/benjamingr) - **Benjamin Gruenbaum** <[email protected]>
 * [brendanashworth](https://github.com/brendanashworth) - **Brendan Ashworth** <[email protected]>
@@ -176,6 +177,7 @@ information about the governance of the Node.js project, see
 * [geek](https://github.com/geek) - **Wyatt Preul** <[email protected]>
 * [iarna](https://github.com/iarna) - **Rebecca Turner** <[email protected]>
 * [isaacs](https://github.com/isaacs) - **Isaac Z. Schlueter** <[email protected]>
+* [iWuzHere](https://github.com/iWuzHere) - **Imran Iqbal** <[email protected]>
 * [jbergstroem](https://github.com/jbergstroem) - **Johan Bergström** <[email protected]>
 * [joaocgreis](https://github.com/joaocgreis) - **João Reis** <[email protected]>
 * [julianduque](https://github.com/julianduque) - **Julian Duque** <[email protected]>
@@ -196,9 +198,11 @@ information about the governance of the Node.js project, see
 * [romankl](https://github.com/romankl) - **Roman Klauke** <[email protected]>
 * [saghul](https://github.com/saghul) - **Saúl Ibarra Corretgé** <[email protected]>
 * [sam-github](https://github.com/sam-github) - **Sam Roberts** <[email protected]>
+* [santigimeno](https://github.com/santigimeno) - **Santiago Gimeno** <[email protected]>
 * [seishun](https://github.com/seishun) - **Nikolai Vavilov** <[email protected]>
 * [silverwind](https://github.com/silverwind) - **Roman Reiss** <[email protected]>
 * [srl295](https://github.com/srl295) - **Steven R Loomis** <[email protected]>
+* [stefanmb](https://github.com/stefanmb) - **Stefan Budeanu** <[email protected]>
 * [targos](https://github.com/targos) - **Michaël Zasso** <[email protected]>
 * [tellnes](https://github.com/tellnes) - **Christian Tellnes** <[email protected]>
 * [thealphanerd](https://github.com/thealphanerd) - **Myles Borins** <[email protected]>

benchmark/buffers/buffer-creation.js

@@ -8,6 +8,7 @@ const bench = common.createBenchmark(main, {
     'fast-alloc',
     'fast-alloc-fill',
     'fast-allocUnsafe',
+    'slow-allocUnsafe',
     'slow',
     'buffer()'],
   len: [10, 1024, 2048, 4096, 8192],
@@ -39,6 +40,13 @@ function main(conf) {
       }
       bench.end(n);
       break;
+    case 'slow-allocUnsafe':
+      bench.start();
+      for (let i = 0; i < n * 1024; i++) {
+        Buffer.allocUnsafeSlow(len);
+      }
+      bench.end(n);
+      break;
     case 'slow':
       bench.start();
       for (let i = 0; i < n * 1024; i++) {

common.gypi

@@ -36,10 +36,16 @@
       ['GENERATOR == "ninja" or OS== "mac"', {
         'OBJ_DIR': '<(PRODUCT_DIR)/obj',
         'V8_BASE': '<(PRODUCT_DIR)/libv8_base.a',
-      }, {
+        }],
+        ['GENERATOR != "ninja" and OS!= "mac" and target_arch not in "s390 s390x"', {
+
         'OBJ_DIR': '<(PRODUCT_DIR)/obj.target',
         'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.a',
       }],
+      ['GENERATOR != "ninja" and OS!= "mac" and target_arch in "s390 s390x"', {
+        'OBJ_DIR': '<(PRODUCT_DIR)/obj.target',
+        'V8_BASE': '<(PRODUCT_DIR)/obj.target/deps/v8z/tools/gyp/libv8_base.a',
+      }],
       ['openssl_fips != ""', {
         'OPENSSL_PRODUCT': 'libcrypto.a',
       }, {

configure

@@ -733,6 +733,11 @@ def configure_node(o):
   else:
     o['variables']['node_enable_v8_vtunejit'] = 'false'
 
+  if target_arch in ('s390', 's390x'):
+    o['variables']['v8_parent_path'] = 'deps/v8z'
+  else:
+    o['variables']['v8_parent_path'] = 'deps/v8'
+
   if flavor in ('solaris', 'mac', 'linux', 'freebsd'):
     use_dtrace = not options.without_dtrace
     # Don't enable by default on linux and freebsd

deps/http_parser/Makefile

@@ -22,14 +22,14 @@ PLATFORM ?= $(shell sh -c 'uname -s | tr "[A-Z]" "[a-z]"')
 HELPER ?=
 BINEXT ?=
 ifeq (darwin,$(PLATFORM))
-SONAME ?= libhttp_parser.2.6.2.dylib
+SONAME ?= libhttp_parser.2.7.0.dylib
 SOEXT ?= dylib
 else ifeq (wine,$(PLATFORM))
 CC = winegcc
 BINEXT = .exe.so
 HELPER = wine
 else
-SONAME ?= libhttp_parser.so.2.6.2
+SONAME ?= libhttp_parser.so.2.7.0
 SOEXT ?= so
 endif
 

deps/http_parser/http_parser.c

@@ -1812,6 +1812,9 @@ size_t http_parser_execute (http_parser *parser,
             case 0:
               break;
 
+            case 2:
+              parser->upgrade = 1;
+
             case 1:
               parser->flags |= F_SKIPBODY;
               break;

deps/http_parser/http_parser.h

@@ -26,8 +26,8 @@ extern "C" {
 
 /* Also update SONAME in the Makefile whenever you change these. */
 #define HTTP_PARSER_VERSION_MAJOR 2
-#define HTTP_PARSER_VERSION_MINOR 6
-#define HTTP_PARSER_VERSION_PATCH 2
+#define HTTP_PARSER_VERSION_MINOR 7
+#define HTTP_PARSER_VERSION_PATCH 0
 
 #include <sys/types.h>
 #if defined(_WIN32) && !defined(__MINGW32__) && \
@@ -77,6 +77,11 @@ typedef struct http_parser_settings http_parser_settings;
  * HEAD request which may contain 'Content-Length' or 'Transfer-Encoding:
  * chunked' headers that indicate the presence of a body.
  *
+ * Returning `2` from on_headers_complete will tell parser that it should not
+ * expect neither a body nor any futher responses on this connection. This is
+ * useful for handling responses to a CONNECT request which may not contain
+ * `Upgrade` or `Connection: upgrade` headers.
+ *
  * http_data_cb does not return data chunks. It will be called arbitrarily
  * many times for each string. E.G. you might get 10 callbacks for "on_url"
  * each providing just a few characters more data.