From bd6783efd2ea1323528c7149f04368fad3478e32 Mon Sep 17 00:00:00 2001
From: Kevin Krakauer <krakauer@google.com>
Date: Wed, 10 May 2023 10:57:25 -0700
Subject: [PATCH] tcp_benchmark: make it easy to switch to iperf3

PiperOrigin-RevId: 530952739
---
 test/benchmarks/tcp/tcp_benchmark.sh | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/test/benchmarks/tcp/tcp_benchmark.sh b/test/benchmarks/tcp/tcp_benchmark.sh
index 8d0ab72f8..719c9135a 100755
--- a/test/benchmarks/tcp/tcp_benchmark.sh
+++ b/test/benchmarks/tcp/tcp_benchmark.sh
@@ -27,6 +27,7 @@ server_proxy_addr=10.0.0.3
 server_addr=10.0.0.4
 full_server_addr=${server_addr}:${iperf_port}
 full_server_proxy_addr=${server_proxy_addr}:${proxy_port}
+iperf_binary_name=iperf
 iperf_version_arg=
 
 # Defaults; this provides a reasonable approximation of a decent internet link.
@@ -181,6 +182,11 @@ while [[ $# -gt 0 ]]; do
       [[ "$#" -le 0 ]] && echo "no helper dir provided" && exit 1
       helper_dir=$1
       ;;
+    --iperf-binary)
+      shift
+      [[ "$#" -le 0 ]] && echo "no iperf name provided" && exit 1
+      iperf_binary_name=$1
+      ;;
     *)
       echo "unknown option: $1"
       echo ""
@@ -382,7 +388,7 @@ ${nsjoin_binary} /tmp/server.netns ${server_args} &
 server_pid=\$!
 
 # Start the iperf server.
-${nsjoin_binary} /tmp/server.netns iperf ${iperf_version_arg} -p ${iperf_port} -s >&2 &
+${nsjoin_binary} /tmp/server.netns ${iperf_binary_name} ${iperf_version_arg} -p ${iperf_port} -s >&2 &
 iperf_pid=\$!
 
 # Give services time to start.
@@ -411,7 +417,7 @@ set +e
 trap cleanup EXIT
 
 # Run the benchmark, recording the results file.
-while ${nsjoin_binary} /tmp/client.netns iperf \\
+while ${nsjoin_binary} /tmp/client.netns ${iperf_binary_name} \\
     ${iperf_version_arg} -p ${proxy_port} -c ${client_addr} -t ${duration} -f m -P ${num_client_threads} 2>&1 \\
     | tee \$results_file \\
     | grep -E "connect failed|unable to connect" >/dev/null; do