X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=perf%2Fbash%2Fpar.sh;h=7072a3f5e38baef6ffd7186e5e6e0a510c073cbd;hb=69171b282699fa3f8fa2a03ffd3c5b79abeb619b;hp=3df80a3de5609e93f29e3343bc6566a58c628c41;hpb=c44be5cbd65ece442d632e0cc5cae71620ba543d;p=pazpar2-moved-to-github.git

diff --git a/perf/bash/par.sh b/perf/bash/par.sh
index 3df80a3..7072a3f 100755
--- a/perf/bash/par.sh
+++ b/perf/bash/par.sh
@@ -1,27 +1,35 @@
 #!/bin/bash
 DELAY=0.001
 WAIT=5
-NUMBER=10
+NUMBER=5
 ROUNDS=5
 PORT=9004
 SERVICE=perf_t
 SHUTDOWN=1
+HOST=127.0.0.1
 if test -n "$1"; then
 	. $1
 fi
 let r=0
+if [ "$SETTINGS" != "" ] ; then 
+    SETTINGS_OPT="--settings=\"$SETTINGS\" " 
+    echo $SETTINGS_OPT
+else
+    unset SETTINGS_OPT
+fi
+
 while test $r -lt $ROUNDS; do
 	echo "$r"
 	let i=0
 	while test $i -lt $NUMBER; do
-		./client.sh $r.$i $PORT $SERVICE >$r.$i.log 2>&1 &
-		sleep $DELAY
-		let i=$i+1
+	    ./pp2client.sh --outfile=$r.$i --prefix=http://$HOST:${PORT}/search.pz2 --service=$SERVICE $SETTINGS_OPT >$r.$i.log 2>&1 &
+	    sleep $DELAY
+	    let i=$i+1
 	done
 	sleep $WAIT
 	let r=$r+1
 done
 wait
 if [ "$SHUTDOWN" == "1" ] ; then 
-    wget -O x "http://localhost:${PORT}/?command=exit"
+    wget -O x "http://localhost:${PORT}/search.pz2?command=exit"
 fi