Minor changes to run scripts, added node.sh

rmoorman · Mar 14, 2011 · 36f8676 · 36f8676
1 parent b231760
commit 36f8676
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/pong/nginx.sh b/pong/nginx.sh
@@ -2,8 +2,8 @@
 
 d=$(readlink -f $(dirname $0))
 
-/usr/local/nginx/sbin/nginx -c $d/nginx.conf &
+sudo /usr/local/nginx/sbin/nginx -c $d/nginx.conf &
 nx=$!
 
-httperf --hog --server=localhost --port=3000 --uri=/ --rate=1000 --num-conns=200 --num-calls=100 --burst-length=20
-kill $nx
+httperf --hog --server=localhost --port=3000 --uri=/ --rate=1000 --num-conns=200 --num-calls=100 --burst-length=20 > results/nginx
+sudo kill $nx
diff --git a/pong/node.sh b/pong/node.sh
@@ -0,0 +1,7 @@
+#!/bin/bash -x
+
+node node.js &
+nx=$!
+
+httperf --hog --server=localhost --port=3000 --uri=/ --rate=1000 --num-conns=200 --num-calls=100 --burst-length=20 > results/node
+kill $nx
diff --git a/pong/php.sh b/pong/php.sh
@@ -4,10 +4,10 @@ d=$(readlink -f $(dirname $0))
 
 php-fpm -n
 
-/usr/local/nginx/sbin/nginx -c $d/php.nginx.conf &
+sudo /usr/local/nginx/sbin/nginx -c $d/php.nginx.conf &
 nx=$!
 
 httperf --hog --server=localhost --port=3000 --uri=/ --rate=1000 --num-conns=200 --num-calls=100 --burst-length=20 > results/php
-kill $nx
+sudo kill $nx
 
 killall -KILL php-fpm
diff --git a/pong/python.sh b/pong/python.sh
@@ -7,9 +7,9 @@ py=$!
 
 sleep 1
 
-/usr/local/nginx/sbin/nginx -c $d/python.nginx.conf &
+sudo /usr/local/nginx/sbin/nginx -c $d/python.nginx.conf &
 nx=$!
 
 httperf --hog --server=localhost --port=3000 --uri=/ --rate=1000 --num-conns=200 --num-calls=100 --burst-length=20 > results/python
-kill $nx
+sudo kill $nx
 kill $py
diff --git a/pong/runall.sh b/pong/runall.sh
@@ -3,7 +3,9 @@ mkdir -p results
 cabal configure
 cabal build
 
-./snap.sh
-./warp.sh
+./snap.sh $*
+./warp.sh $*
 ./php.sh
 ./python.sh
+./node.sh
+./nginx.sh
diff --git a/pong/snap.sh b/pong/snap.sh
@@ -1,8 +1,7 @@
 #!/bin/bash -x
 
-./dist/build/snap/snap &
+./dist/build/snap/snap $* &
 nx=$!
 
 httperf --hog --server=localhost --port=3000 --uri=/ --rate=1000 --num-conns=200 --num-calls=100 --burst-length=20 > results/snap
 kill $nx
-
diff --git a/pong/warp.sh b/pong/warp.sh
@@ -1,8 +1,7 @@
 #!/bin/bash -x
 
-./dist/build/warp/warp &
+./dist/build/warp/warp $* &
 nx=$!
 
 httperf --hog --server=localhost --port=3000 --uri=/ --rate=1000 --num-conns=200 --num-calls=100 --burst-length=20 > results/warp
 kill $nx
-