From a081c7c5222de844ed0a61d470b8334676249d66 Mon Sep 17 00:00:00 2001
From: Brian White <mscdex@mscdex.net>
Date: Wed, 25 Mar 2015 02:26:21 -0400
Subject: [PATCH] benchmark: fix chunky client benchmark execution

This commit fixes a few things for this benchmark:

1. Ensures the temporary directory for the unix socket exists.
2. Prevents the client code from being run directly because the
server script is the one that calls out the client code.
3. Ensures the server is closed once the client benchmarks have
finished.
4. Since this is an http benchmark, it should be moved to the http
benchmarks subdirectory.

PR-URL: https://github.com/iojs/io.js/pull/1257
Reviewed-By: Roman Reiss <me@silverwind.io>
---
 .../_chunky_http_client.js}                         |  0
 .../{net => http}/http_server_for_chunky_client.js  | 13 ++++++++++---
 2 files changed, 10 insertions(+), 3 deletions(-)
 rename benchmark/{net/chunky_http_client.js => http/_chunky_http_client.js} (100%)
 rename benchmark/{net => http}/http_server_for_chunky_client.js (76%)

diff --git a/benchmark/net/chunky_http_client.js b/benchmark/http/_chunky_http_client.js
similarity index 100%
rename from benchmark/net/chunky_http_client.js
rename to benchmark/http/_chunky_http_client.js
diff --git a/benchmark/net/http_server_for_chunky_client.js b/benchmark/http/http_server_for_chunky_client.js
similarity index 76%
rename from benchmark/net/http_server_for_chunky_client.js
rename to benchmark/http/http_server_for_chunky_client.js
index 5439e7226eef39..dede7daa7cdc75 100644
--- a/benchmark/net/http_server_for_chunky_client.js
+++ b/benchmark/http/http_server_for_chunky_client.js
@@ -6,9 +6,15 @@ var fs = require('fs');
 var spawn = require('child_process').spawn;
 var common = require('../common.js')
 var test = require('../../test/common.js')
-var pep = path.dirname(process.argv[1]) + '/chunky_http_client.js';
+var pep = path.dirname(process.argv[1]) + '/_chunky_http_client.js';
 var PIPE = test.PIPE;
 
+try {
+  fs.accessSync(test.tmpDir, fs.F_OK);
+} catch (e) {
+  fs.mkdirSync(test.tmpDir);
+}
+
 var server;
 try {
   fs.unlinkSync(PIPE);
@@ -36,9 +42,10 @@ try {
   });
 
   child.stdout.pipe(process.stdout);
+  child.stderr.pipe(process.stderr);
 
-  child.on('exit', function (exitCode) {
-    console.error('Child exited with code: ' + exitCode);
+  child.on('close', function (exitCode) {
+    server.close();
   });
 
 } catch(e) {