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:40:56 +02:00
parent f56e6788d5
commit bcfc8e919c
1 changed files with 10 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
measurement_main.py
View File

@@ -370,17 +370,9 @@ class Server:
self.config["server"], self.config["server"],
self.config["port"], self.config["port"],
) )
is_measurement_done = False
return_code = 0 subprocess.call(iperf_command)
while not is_measurement_done or return_code != 0:
try:
try:
return_code = subprocess.call(iperf_command, timeout=float(time) + 1.0 + TIMEOUT_OFFSET)
is_measurement_done = True
except:
print_message("iPerf timed out. Retry...")
except KeyboardInterrupt:
exit()
processHandler.kill_all() processHandler.kill_all()
congestion_control_index = (congestion_control_index + 1) % len( congestion_control_index = (congestion_control_index + 1) % len(
tcp_algo tcp_algo
@@ -449,17 +441,9 @@ class Server:
str(self.config["port"]), str(self.config["port"]),
"--one-off", "--one-off",
] ]
is_measurement_done = False
return_code = 0 subprocess.call(iperf_command)
while not is_measurement_done or return_code != 0:
try:
try:
return_code= subprocess.call(iperf_command, timeout=float(time) + 1.0 + TIMEOUT_OFFSET)
is_measurement_done = True
except:
print_message("iPerf timed out. Retry...")
except KeyboardInterrupt:
exit()
sleep(2) sleep(2)
processHandler.kill_all() processHandler.kill_all()
congestion_control_index = (congestion_control_index + 1) % len( congestion_control_index = (congestion_control_index + 1) % len(
@@ -823,11 +807,10 @@ class Client:
tcp_algo[congestion_control_index], tcp_algo[congestion_control_index],
] ]
is_measurement_done = False is_measurement_done = False
return_code = 0 while not is_measurement_done:
while not is_measurement_done or return_code != 0:
try: try:
try: try:
return_code = subprocess.call(iperf_command, timeout=float(time) + 2.0 + TIMEOUT_OFFSET) 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...")
@@ -888,11 +871,10 @@ class Client:
) )
sleep(2) sleep(2)
is_measurement_done = False is_measurement_done = False
return_code = 0 while not is_measurement_done:
while not is_measurement_done or return_code != 0:
try: try:
try: try:
return_code = subprocess.call(iperf_command, timeout=float(time) + 2.0 + TIMEOUT_OFFSET) 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...")