From 912a78c5620a8e6c20b31082736b863dc7cc6b0a Mon Sep 17 00:00:00 2001 From: Lukas Prause Date: Fri, 14 Oct 2022 12:43:30 +0200 Subject: [PATCH] Adds iperf timeout for bandwith measurements. --- measurement_main.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/measurement_main.py b/measurement_main.py index fad1730..fc95f25 100755 --- a/measurement_main.py +++ b/measurement_main.py @@ -369,7 +369,7 @@ class Server: self.config["port"], ) try: - subprocess.call(iperf_command, timeout=time + 1) + subprocess.call(iperf_command, timeout=float(time) + 1) except: print_message("iPerf timed out. Going ahead with next measurement...") processHandler.kill_all() @@ -441,7 +441,7 @@ class Server: "--one-off", ] try: - subprocess.call(iperf_command, timeout=time + 1) + subprocess.call(iperf_command, timeout=float(time) + 1.0) except: print_message("iPerf timed out. Going ahead with next measurement...") sleep(2) @@ -807,7 +807,7 @@ class Client: tcp_algo[congestion_control_index], ] try: - subprocess.call(iperf_command, timeout=time + 2) + subprocess.call(iperf_command, timeout=float(time) + 2) except: print_message("iPerf timed out. Going ahead with next measurement...") sleep(4) @@ -865,7 +865,7 @@ class Client: ) sleep(2) try: - subprocess.call(iperf_command, timeout=time+2) + subprocess.call(iperf_command, timeout=float(time)+2) except: print_message("iPerf timed out. Going ahead with next measurement...") processHandler.kill_all()