langspielplatte/measurement-scripts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Adds iperf timeout for bandwith measurements.

Browse Source
This commit is contained in:
Lukas Prause
2022-10-14 12:43:30 +02:00
parent f5ba72f317
commit 912a78c562
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
measurement_main.py
View File

@@ -369,7 +369,7 @@ class Server:
self.config["port"], self.config["port"],
) )
try: try:
subprocess.call(iperf_command, timeout=time + 1) subprocess.call(iperf_command, timeout=float(time) + 1)
except: except:
print_message("iPerf timed out. Going ahead with next measurement...") print_message("iPerf timed out. Going ahead with next measurement...")
processHandler.kill_all() processHandler.kill_all()
@@ -441,7 +441,7 @@ class Server:
"--one-off", "--one-off",
] ]
try: try:
subprocess.call(iperf_command, timeout=time + 1) subprocess.call(iperf_command, timeout=float(time) + 1.0)
except: except:
print_message("iPerf timed out. Going ahead with next measurement...") print_message("iPerf timed out. Going ahead with next measurement...")
sleep(2) sleep(2)
@@ -807,7 +807,7 @@ class Client:
tcp_algo[congestion_control_index], tcp_algo[congestion_control_index],
] ]
try: try:
subprocess.call(iperf_command, timeout=time + 2) subprocess.call(iperf_command, timeout=float(time) + 2)
except: except:
print_message("iPerf timed out. Going ahead with next measurement...") print_message("iPerf timed out. Going ahead with next measurement...")
sleep(4) sleep(4)
@@ -865,7 +865,7 @@ class Client:
) )
sleep(2) sleep(2)
try: try:
subprocess.call(iperf_command, timeout=time+2) subprocess.call(iperf_command, timeout=float(time)+2)
except: except:
print_message("iPerf timed out. Going ahead with next measurement...") print_message("iPerf timed out. Going ahead with next measurement...")
processHandler.kill_all() processHandler.kill_all()