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:11:54 +02:00
parent afd33ea608
commit b7634fb791
1 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
measurement_main.py
View File

@@ -373,10 +373,13 @@ class Server:
is_measurement_done = False is_measurement_done = False
while not is_measurement_done: while not is_measurement_done:
try: try:
subprocess.call(iperf_command, timeout=float(time) + 1.0 + TIMEOUT_OFFSET) try:
is_measurement_done = True subprocess.call(iperf_command, timeout=float(time) + 1.0 + TIMEOUT_OFFSET)
except: is_measurement_done = True
print_message("iPerf timed out. Retry...") 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
@@ -445,13 +448,15 @@ class Server:
str(self.config["port"]), str(self.config["port"]),
"--one-off", "--one-off",
] ]
is_measurement_done = False
while not is_measurement_done: while not is_measurement_done:
try: try:
subprocess.call(iperf_command, timeout=float(time) + 1.0 + TIMEOUT_OFFSET) try:
is_measurement_done = True subprocess.call(iperf_command, timeout=float(time) + 1.0 + TIMEOUT_OFFSET)
except: is_measurement_done = True
print_message("iPerf timed out. Retry...") 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(
@@ -817,10 +822,13 @@ class Client:
is_measurement_done = False is_measurement_done = False
while not is_measurement_done: while not is_measurement_done:
try: try:
subprocess.call(iperf_command, timeout=float(time) + 2.0 + TIMEOUT_OFFSET) try:
is_measurement_done = True subprocess.call(iperf_command, timeout=float(time) + 2.0 + TIMEOUT_OFFSET)
except: is_measurement_done = True
print_message("iPerf timed out. Retry...") except:
print_message("iPerf timed out. Retry...")
except KeyboardInterrupt:
exit()
sleep(4) sleep(4)
processHandler.kill_all() processHandler.kill_all()
congestion_control_index = (congestion_control_index + 1) % len( congestion_control_index = (congestion_control_index + 1) % len(
@@ -878,10 +886,13 @@ class Client:
is_measurement_done = False is_measurement_done = False
while not is_measurement_done: while not is_measurement_done:
try: try:
subprocess.call(iperf_command, timeout=float(time) + 2.0 + TIMEOUT_OFFSET) try:
is_measurement_done = True subprocess.call(iperf_command, timeout=float(time) + 2.0 + TIMEOUT_OFFSET)
except: is_measurement_done = True
print_message("iPerf timed out. Retry...") 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