From 6af9ed0bf78a1fe6cbfe5e91d44d34da5b152f1b Mon Sep 17 00:00:00 2001 From: Craig Tiller Date: Mon, 2 Mar 2015 22:42:10 -0800 Subject: Rework QPS client/server Now setup as a driver and N anonymous workers that may become clients or servers. Will convert async soon. --- test/cpp/qps/single_run_localhost.sh | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) (limited to 'test/cpp/qps/single_run_localhost.sh') diff --git a/test/cpp/qps/single_run_localhost.sh b/test/cpp/qps/single_run_localhost.sh index 310a0824bb..2f60b4e49d 100755 --- a/test/cpp/qps/single_run_localhost.sh +++ b/test/cpp/qps/single_run_localhost.sh @@ -6,25 +6,23 @@ set -ex cd $(dirname $0)/../../.. -killall qps_server qps_client || true +killall qps_worker || true config=opt NUMCPUS=`python2.7 -c 'import multiprocessing; print multiprocessing.cpu_count()'` -make CONFIG=$config qps_client qps_server qps_driver -j$NUMCPUS +make CONFIG=$config qps_worker qps_driver -j$NUMCPUS -bins/$config/qps_server -driver_port 10000 -port 10002 & -SERVER_PID=$! -bins/$config/qps_client -driver_port 10001 & -CLIENT_PID=$! +bins/$config/qps_worker -driver_port 10000 -server_port 10001 & +PID1=$! +bins/$config/qps_worker -driver_port 10010 -server_port 10011 & +PID2=$! -export QPS_SERVERS=localhost:10000 -export QPS_CLIENTS=localhost:10001 +export QPS_WORKERS="localhost:10000,localhost:10010" bins/$config/qps_driver $* -kill -2 $CLIENT_PID -kill -2 $SERVER_PID +kill -2 $PID1 $PID2 wait -- cgit v1.2.3