backport: src,tools: speed up startup by 2.5%

lib/_tls_wrap.js

@@ -305,14 +305,31 @@ proxiedMethods.forEach(function(name) {
 });
 
 tls_wrap.TLSWrap.prototype.close = function close(cb) {
-  if (this.owner)
+  let ssl;
+  if (this.owner) {
+    ssl = this.owner.ssl;
     this.owner.ssl = null;
+  }
+
+  // Invoke `destroySSL` on close to clean up possibly pending write requests
+  // that may self-reference TLSWrap, leading to leak
+  const done = () => {
+    if (ssl) {
+      ssl.destroySSL();
+      if (ssl._secureContext.singleUse) {
+        ssl._secureContext.context.close();
+        ssl._secureContext.context = null;
+      }
+    }
+    if (cb)
+      cb();
+  };
 
   if (this._parentWrap && this._parentWrap._handle === this._parent) {
-    this._parentWrap.once('close', cb);
+    this._parentWrap.once('close', done);
     return this._parentWrap.destroy();
   }
-  return this._parent.close(cb);
+  return this._parent.close(done);
 };
 
 TLSSocket.prototype._wrapHandle = function(wrap) {

src/inspector_agent.cc

@@ -170,13 +170,6 @@ std::string GenerateID() {
            buffer[7]);
   return uuid;
 }
-
-// std::to_string is not available on Smart OS and ARM flavours
-const std::string to_string(uint64_t number) {
-  std::ostringstream result;
-  result << number;
-  return result.str();
-}
 }  // namespace
 
 

src/node_javascript.cc

@@ -6,33 +6,46 @@
 
 namespace node {
 
-using v8::HandleScope;
 using v8::Local;
 using v8::NewStringType;
 using v8::Object;
 using v8::String;
 
+// id##_data is defined in node_natives.h.
+#define V(id)                                                                 \
+  static struct : public String::ExternalOneByteStringResource {              \
+    const char* data() const override {                                       \
+      return reinterpret_cast<const char*>(id##_data);                        \
+    }                                                                         \
+    size_t length() const override { return sizeof(id##_data); }              \
+    void Dispose() override { /* Default calls `delete this`. */ }            \
+  } id##_external_data;
+NODE_NATIVES_MAP(V)
+#undef V
+
 Local<String> MainSource(Environment* env) {
-  return String::NewFromUtf8(
-      env->isolate(),
-      reinterpret_cast<const char*>(internal_bootstrap_node_native),
-      NewStringType::kNormal,
-      sizeof(internal_bootstrap_node_native)).ToLocalChecked();
+  auto maybe_string =
+      String::NewExternalOneByte(
+          env->isolate(),
+          &internal_bootstrap_node_external_data);
+  return maybe_string.ToLocalChecked();
 }
 
 void DefineJavaScript(Environment* env, Local<Object> target) {
-  HandleScope scope(env->isolate());
-
-  for (auto native : natives) {
-    if (native.source != internal_bootstrap_node_native) {
-      Local<String> name = String::NewFromUtf8(env->isolate(), native.name);
-      Local<String> source =
-          String::NewFromUtf8(
-              env->isolate(), reinterpret_cast<const char*>(native.source),
-              NewStringType::kNormal, native.source_len).ToLocalChecked();
-      target->Set(name, source);
-    }
-  }
+  auto context = env->context();
+#define V(id)                                                                 \
+  do {                                                                        \
+    auto key =                                                                \
+        String::NewFromOneByte(                                               \
+            env->isolate(), id##_name, NewStringType::kNormal,                \
+            sizeof(id##_name)).ToLocalChecked();                              \
+    auto value =                                                              \
+        String::NewExternalOneByte(                                           \
+            env->isolate(), &id##_external_data).ToLocalChecked();            \
+    CHECK(target->Set(context, key, value).FromJust());                       \
+  } while (0);
+  NODE_NATIVES_MAP(V)
+#undef V
 }
 
 }  // namespace node

test/parallel/test-child-process-exec-cwd.js

@@ -1,7 +1,7 @@
 'use strict';
 const common = require('../common');
-var assert = require('assert');
-var exec = require('child_process').exec;
+const assert = require('assert');
+const exec = require('child_process').exec;
 
 var pwdcommand, dir;
 
@@ -15,5 +15,5 @@ if (common.isWindows) {
 
 exec(pwdcommand, {cwd: dir}, common.mustCall(function(err, stdout, stderr) {
   assert.ifError(err);
-  assert.ok(stdout.indexOf(dir) == 0);
+  assert.strictEqual(stdout.indexOf(dir), 0);
 }));

test/parallel/test-child-process-exec-timeout.js

@@ -0,0 +1,45 @@
+'use strict';
+const common = require('../common');
+const assert = require('assert');
+const cp = require('child_process');
+
+if (process.argv[2] === 'child') {
+  setTimeout(() => {
+    // The following console statements are part of the test.
+    console.log('child stdout');
+    console.error('child stderr');
+  }, common.platformTimeout(1000));
+  return;
+}
+
+const cmd = `${process.execPath} ${__filename} child`;
+
+// Test the case where a timeout is set, and it expires.
+cp.exec(cmd, { timeout: 1 }, common.mustCall((err, stdout, stderr) => {
+  assert.strictEqual(err.killed, true);
+  assert.strictEqual(err.code, null);
+  assert.strictEqual(err.signal, 'SIGTERM');
+  assert.strictEqual(err.cmd, cmd);
+  assert.strictEqual(stdout.trim(), '');
+  assert.strictEqual(stderr.trim(), '');
+}));
+
+// Test with a different kill signal.
+cp.exec(cmd, {
+  timeout: 1,
+  killSignal: 'SIGKILL'
+}, common.mustCall((err, stdout, stderr) => {
+  assert.strictEqual(err.killed, true);
+  assert.strictEqual(err.code, null);
+  assert.strictEqual(err.signal, 'SIGKILL');
+  assert.strictEqual(err.cmd, cmd);
+  assert.strictEqual(stdout.trim(), '');
+  assert.strictEqual(stderr.trim(), '');
+}));
+
+// Test the case where a timeout is set, but not expired.
+cp.exec(cmd, { timeout: Math.pow(2, 30) }, common.mustCall((err, stdout, stderr) => {
+  assert.ifError(err);
+  assert.strictEqual(stdout.trim(), 'child stdout');
+  assert.strictEqual(stderr.trim(), 'child stderr');
+}));

test/parallel/test-tls-writewrap-leak.js

@@ -0,0 +1,26 @@
+'use strict';
+const common = require('../common');
+
+if (!common.hasCrypto) {
+  common.skip('missing crypto');
+  return;
+}
+
+const assert = require('assert');
+const net = require('net');
+const tls = require('tls');
+
+const server = net.createServer(common.mustCall((c) => {
+  c.destroy();
+})).listen(0, common.mustCall(() => {
+  const c = tls.connect({ port: server.address().port });
+  c.on('error', () => {
+    // Otherwise `.write()` callback won't be invoked.
+    c.destroyed = false;
+  });
+
+  c.write('hello', common.mustCall((err) => {
+    assert.equal(err.code, 'ECANCELED');
+    server.close();
+  }));
+}));