Merge remote-tracking branch 'ry/v0.8'

nodejs · Jul 17, 2012 · 8973c3d · 8973c3d
2 parents ff14007 + d6b78d0
commit 8973c3d
Show file tree

Hide file tree

Showing 4 changed files with 135 additions and 1 deletion.
diff --git a/benchmark/tls-connect.js b/benchmark/tls-connect.js
@@ -0,0 +1,86 @@
+
+var assert = require('assert'),
+    fs = require('fs'),
+    path = require('path'),
+    tls = require('tls');
+
+
+var target_connections = 10000,
+    concurrency = 10;
+
+for (var i = 2; i < process.argv.length; i++) {
+  switch (process.argv[i]) {
+    case '-c':
+      concurrency = ~~process.argv[++i];
+      break;
+
+    case '-n':
+      target_connections = ~~process.argv[++i];
+      break;
+
+    default:
+      throw new Error('Invalid flag: ' + process.argv[i]);
+  }
+}
+
+
+var cert_dir = path.resolve(__dirname, '../test/fixtures'),
+    options = { key: fs.readFileSync(cert_dir + '/test_key.pem'),
+                cert: fs.readFileSync(cert_dir + '/test_cert.pem'),
+                ca: [ fs.readFileSync(cert_dir + '/test_ca.pem') ] };
+
+var server = tls.createServer(options, onConnection);
+server.listen(8000);
+
+
+var initiated_connections = 0,
+    server_connections = 0,
+    client_connections = 0,
+    start = Date.now();
+
+for (var i = 0; i < concurrency; i++)
+  makeConnection();
+
+
+process.on('exit', onExit);
+
+
+function makeConnection() {
+  if (initiated_connections >= target_connections)
+    return;
+
+  initiated_connections++;
+
+  var conn = tls.connect(8000, function() {
+    client_connections++;
+
+    if (client_connections % 100 === 0)
+      console.log(client_connections + ' of ' + target_connections +
+                  ' connections made');
+
+    conn.end();
+    makeConnection();
+  });
+}
+
+
+function onConnection(conn) {
+  server_connections++;
+
+  if (server_connections === target_connections)
+    server.close();
+}
+
+
+function onExit() {
+  var end = Date.now(),
+      s = (end - start) / 1000,
+      persec = Math.round(target_connections / s);
+
+  assert.equal(initiated_connections, target_connections);
+  assert.equal(client_connections, target_connections);
+  assert.equal(server_connections, target_connections);
+
+  console.log('%d connections in %d s', target_connections, s);
+  console.log('%d connections per second', persec);
+}
diff --git a/doc/api/child_process.markdown b/doc/api/child_process.markdown
@@ -306,7 +306,7 @@ Example: A very elaborate way to run 'ps ax | grep ssh'
     });
 
     grep.stdout.on('data', function (data) {
-      console.log(data);
+      console.log('' + data);
     });
 
     grep.stderr.on('data', function (data) {

diff --git a/lib/domain.js b/lib/domain.js
@@ -41,6 +41,7 @@ exports.create = exports.createDomain = function(cb) {
 // it's possible to enter one domain while already inside
 // another one.  the stack is each entered domain.
 var stack = [];
+exports._stack = stack;
 // the active domain is always the one that we're currently in.
 exports.active = null;
 
@@ -58,6 +59,7 @@ function uncaughtHandler(er) {
       domain_thrown: true
     });
     exports.active.emit('error', er);
+    exports.active.exit();
   } else if (process.listeners('uncaughtException').length === 1) {
     // if there are other handlers, then they'll take care of it.
     // but if not, then we need to crash now.

diff --git a/test/simple/test-domain-stack.js b/test/simple/test-domain-stack.js
@@ -0,0 +1,46 @@
+// Copyright Joyent, Inc. and other Node contributors.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a
+// copy of this software and associated documentation files (the
+// "Software"), to deal in the Software without restriction, including
+// without limitation the rights to use, copy, modify, merge, publish,
+// distribute, sublicense, and/or sell copies of the Software, and to permit
+// persons to whom the Software is furnished to do so, subject to the
+// following conditions:
+//
+// The above copyright notice and this permission notice shall be included
+// in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+// OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN
+// NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
+// DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE
+// USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+// Make sure that the domain stack doesn't get out of hand.
+
+var common = require('../common');
+var assert = require('assert');
+var domain = require('domain');
+var events = require('events');
+
+var a = domain.create();
+a.name = 'a';
+
+a.on('error', function() {
+  if (domain._stack.length > 5) {
+    console.error('leaking!', domain._stack);
+    process.exit(1);
+  }
+});
+
+var foo = a.bind(function() {
+  throw new Error('error from foo');
+});
+
+for (var i = 0; i < 1000; i++) {
+  process.nextTick(foo);
+}