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 13:35:47 +02:00
parent da1e39c790
commit f56e6788d5
1 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
measurement_main.py
View File

@@ -371,10 +371,11 @@ class Server:
self.config["port"], self.config["port"],
) )
is_measurement_done = False is_measurement_done = False
while not is_measurement_done: return_code = 0
while not is_measurement_done or return_code != 0:
try: try:
try: try:
subprocess.call(iperf_command, timeout=float(time) + 1.0 + TIMEOUT_OFFSET) return_code = subprocess.call(iperf_command, timeout=float(time) + 1.0 + TIMEOUT_OFFSET)
is_measurement_done = True is_measurement_done = True
except: except:
print_message("iPerf timed out. Retry...") print_message("iPerf timed out. Retry...")
@@ -449,10 +450,11 @@ class Server:
"--one-off", "--one-off",
] ]
is_measurement_done = False is_measurement_done = False
while not is_measurement_done: return_code = 0
while not is_measurement_done or return_code != 0:
try: try:
try: try:
subprocess.call(iperf_command, timeout=float(time) + 1.0 + TIMEOUT_OFFSET) return_code= subprocess.call(iperf_command, timeout=float(time) + 1.0 + TIMEOUT_OFFSET)
is_measurement_done = True is_measurement_done = True
except: except:
print_message("iPerf timed out. Retry...") print_message("iPerf timed out. Retry...")
@@ -821,10 +823,11 @@ class Client:
tcp_algo[congestion_control_index], tcp_algo[congestion_control_index],
] ]
is_measurement_done = False is_measurement_done = False
while not is_measurement_done: return_code = 0
while not is_measurement_done or return_code != 0:
try: try:
try: try:
subprocess.call(iperf_command, timeout=float(time) + 2.0 + TIMEOUT_OFFSET) return_code = subprocess.call(iperf_command, timeout=float(time) + 2.0 + TIMEOUT_OFFSET)
is_measurement_done = True is_measurement_done = True
except: except:
print_message("iPerf timed out. Retry...") print_message("iPerf timed out. Retry...")
@@ -885,10 +888,11 @@ class Client:
) )
sleep(2) sleep(2)
is_measurement_done = False is_measurement_done = False
while not is_measurement_done: return_code = 0
while not is_measurement_done or return_code != 0:
try: try:
try: try:
subprocess.call(iperf_command, timeout=float(time) + 2.0 + TIMEOUT_OFFSET) return_code = subprocess.call(iperf_command, timeout=float(time) + 2.0 + TIMEOUT_OFFSET)
is_measurement_done = True is_measurement_done = True
except: except:
print_message("iPerf timed out. Retry...") print_message("iPerf timed out. Retry...")