feat: better killer for benchmarker (#63)

scripts/benchmark_generic.sh

@@ -21,6 +21,7 @@ for b in ${body[@]}; do
       srp=${srepo[i]}
       crp=${crepo[i]}
       addr="127.0.0.1:${ports[i]}"
+      kill_pid_listening_on_port ${ports[i]}
       # server start
       echo "Starting server [$srp], if failed please check [output/log/nohup.log] for detail"
       nohup $cmd_server $output_dir/bin/${srp}_reciever >> $output_dir/log/nohup.log 2>&1 &
@@ -32,11 +33,7 @@ for b in ${body[@]}; do
       $cmd_client $output_dir/bin/${crp}_bencher -addr="$addr" -b=$b -c=$c -n=$n --sleep=$sleep | $tee_cmd
 
       # stop server
-      pid=$(ps -ef | grep ${srp}_reciever | grep -v grep | awk '{print $2}')
-      disown $pid
-      kill -9 $pid
-      echo "Server [$srp] stopped, pid [$pid]."
-      sleep 1
+      kill_pid_listening_on_port ${ports[i]}
     done
   done
 done

scripts/benchmark_grpc.sh

@@ -20,6 +20,7 @@ for b in ${body[@]}; do
       srp=${srepo[i]}
       crp=${crepo[i]}
       addr="127.0.0.1:${ports[i]}"
+      kill_pid_listening_on_port ${ports[i]}
       # server start
       echo "Starting server [$srp], if failed please check [output/log/nohup.log] for detail."
       nohup $cmd_server $output_dir/bin/${srp}_reciever >> $output_dir/log/nohup.log 2>&1 &
@@ -31,13 +32,9 @@ for b in ${body[@]}; do
       $cmd_client $output_dir/bin/${crp}_bencher -addr="$addr" -b=$b -c=$c -n=$n --sleep=$sleep | $tee_cmd
 
       # stop server
-      pid=$(ps -ef | grep ${srp}_reciever | grep -v grep | awk '{print $2}')
-      disown $pid
-      kill -9 $pid
-      echo "Server [$srp] stopped, pid [$pid]."
-      sleep 1
+      kill_pid_listening_on_port ${ports[i]}
     done
   done
 done
 
-finish_cmd
+finish_cmd

scripts/benchmark_pb.sh

@@ -21,6 +21,7 @@ for b in ${body[@]}; do
       srp=${srepo[i]}
       crp=${crepo[i]}
       addr="127.0.0.1:${ports[i]}"
+      kill_pid_listening_on_port ${ports[i]}
       # server start
       echo "Starting server [$srp], if failed please check [output/log/nohup.log] for detail."
       nohup $cmd_server $output_dir/bin/${srp}_reciever >> $output_dir/log/nohup.log 2>&1 &
@@ -32,11 +33,7 @@ for b in ${body[@]}; do
       $cmd_client $output_dir/bin/${crp}_bencher -addr="$addr" -b=$b -c=$c -n=$n --sleep=$sleep | $tee_cmd
 
       # stop server
-      pid=$(ps -ef | grep ${srp}_reciever | grep -v grep | awk '{print $2}')
-      disown $pid
-      kill -9 $pid
-      echo "Server [$srp] stopped, pid [$pid]."
-      sleep 1
+      kill_pid_listening_on_port ${ports[i]}
     done
   done
 done

scripts/benchmark_streaming.sh

@@ -21,6 +21,7 @@ for b in ${body[@]}; do
       srp=${srepo[i]}
       crp=${crepo[i]}
       addr="127.0.0.1:${ports[i]}"
+      kill_pid_listening_on_port ${ports[i]}
       # server start
       echo "Starting server [$srp], if failed please check [output/log/nohup.log] for detail."
       nohup $cmd_server $output_dir/bin/${srp}_reciever >> $output_dir/log/nohup.log 2>&1 &
@@ -32,11 +33,7 @@ for b in ${body[@]}; do
       $cmd_client $output_dir/bin/${crp}_bencher -addr="$addr" -b=$b -c=$c -n=$n --sleep=$sleep | $tee_cmd
 
       # stop server
-      pid=$(ps -ef | grep ${srp}_reciever | grep -v grep | awk '{print $2}')
-      disown $pid
-      kill -9 $pid
-      echo "Server [$srp] stopped, pid [$pid]."
-      sleep 1
+      kill_pid_listening_on_port ${ports[i]}
     done
   done
 done

scripts/benchmark_thrift.sh

@@ -21,6 +21,7 @@ for b in ${body[@]}; do
       srp=${srepo[i]}
       crp=${crepo[i]}
       addr="127.0.0.1:${ports[i]}"
+      kill_pid_listening_on_port ${ports[i]}
       # server start
       echo "Starting server [$srp], if failed please check [output/log/nohup.log] for detail"
       nohup $cmd_server $output_dir/bin/${srp}_reciever >> $output_dir/log/nohup.log 2>&1 &
@@ -32,11 +33,7 @@ for b in ${body[@]}; do
       $cmd_client $output_dir/bin/${crp}_bencher -addr="$addr" -b=$b -c=$c -n=$n --sleep=$sleep | $tee_cmd
 
       # stop server
-      pid=$(ps -ef | grep ${srp}_reciever | grep -v grep | awk '{print $2}')
-      disown $pid
-      kill -9 $pid
-      echo "Server [$srp] stopped, pid [$pid]."
-      sleep 1
+      kill_pid_listening_on_port ${ports[i]}
     done
   done
 done

scripts/env.sh

@@ -62,3 +62,17 @@ thrift_dir=$CURDIR/../thrift
 grpc_dir=$CURDIR/../grpc
 streaming_dir=$CURDIR/../streaming
 generic_dir=$CURDIR/../generic
+
+function kill_pid_listening_on_port() {
+    port=$1
+    if [ -z "$port" ]; then
+        echo "invalid port"
+        exit 1
+    fi
+    pids=`lsof -i ":$port" | grep LISTEN | awk '{print $2}' | uniq`
+    for p in $pids; do
+        echo killing $p...
+        kill $p
+    done
+    sleep 1
+}