Adds iperf timeout for bandwith measurements.

This commit is contained in:
Lukas Prause
2022-10-14 12:46:12 +02:00
parent 912a78c562
commit 1c40864ff2

View File

@@ -25,6 +25,7 @@ NR_SERVINGCELL_COMMAND = b'AT+QENG="servingcell"\r\n'
NR_EN_DC_STATUS_COMMAND = b"AT+QENDC\r\n" NR_EN_DC_STATUS_COMMAND = b"AT+QENDC\r\n"
NR_SERIAL_RESPOND_TIME = 0.3 # s NR_SERIAL_RESPOND_TIME = 0.3 # s
CMD_TIME_EPOCH = "date +%s" CMD_TIME_EPOCH = "date +%s"
TIMEOUT_OFFSET = 5.0
class ProcessHandler: class ProcessHandler:
@@ -369,7 +370,7 @@ class Server:
self.config["port"], self.config["port"],
) )
try: try:
subprocess.call(iperf_command, timeout=float(time) + 1) subprocess.call(iperf_command, timeout=float(time) + 1 + TIMEOUT_OFFSET)
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 +442,7 @@ class Server:
"--one-off", "--one-off",
] ]
try: try:
subprocess.call(iperf_command, timeout=float(time) + 1.0) subprocess.call(iperf_command, timeout=float(time) + 1.0 + TIMEOUT_OFFSET)
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 +808,7 @@ class Client:
tcp_algo[congestion_control_index], tcp_algo[congestion_control_index],
] ]
try: try:
subprocess.call(iperf_command, timeout=float(time) + 2) subprocess.call(iperf_command, timeout=float(time) + 2 + TIMEOUT_OFFSET)
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 +866,7 @@ class Client:
) )
sleep(2) sleep(2)
try: try:
subprocess.call(iperf_command, timeout=float(time)+2) subprocess.call(iperf_command, timeout=float(time)+ 2 + TIMEOUT_OFFSET)
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()