diff --git a/autostart_mobile_measurement.sh b/autostart_mobile_measurement.sh index cd6f9f8..da8f592 100755 --- a/autostart_mobile_measurement.sh +++ b/autostart_mobile_measurement.sh @@ -11,7 +11,7 @@ cd $WORKING_DIR beep -f 130 -l 100 -n -f 262 -l 100 -n -f 330 -l 100 -n -f 392 -l 100 -n -f 523 -l 100 -n -f 660 -l 100 -n -f 784 -l 300 -n -f 660 -l 300 -n -f 146 -l 100 -n -f 262 -l 100 -n -f 311 -l 100 -n -f 415 -l 100 -n -f 523 -l 100 -n -f 622 -l 100 -n -f 831 -l 300 -n -f 622 -l 300 -n -f 155 -l 100 -n -f 294 -l 100 -n -f 349 -l 100 -n -f 466 -l 100 -n -f 588 -l 100 -n -f 699 -l 100 -n -f 933 -l 300 -n -f 933 -l 100 -n -f 933 -l 100 -n -f 933 -l 100 -n -f 1047 -l 400 pipenv run pipenv run ./measurement_main.py -c 130.75.73.69 \ --bandwidth \ - --set time=30 \ + --set time=60 \ --gps /dev/serial/by-id/usb-u-blox_AG_-_www.u-blox.com_u-blox_5_-_GPS_Receiver-if00 \ --serial /dev/ttyUSB2 \ -n 600 \ diff --git a/measurement_main.py b/measurement_main.py index 69e0bd0..1c0216d 100644 --- a/measurement_main.py +++ b/measurement_main.py @@ -26,6 +26,7 @@ NR_EN_DC_STATUS_COMMAND = b"AT+QENDC\r\n" NR_SERIAL_RESPOND_TIME = 0.3 # s CMD_TIME_EPOCH = "date +%s" TIMEOUT_OFFSET = 10.0 +WAIT_AFTER_IPERF = 5.0 class ProcessHandler: @@ -193,7 +194,7 @@ def is_tcp_probe_enabled(): def disable_tso(interface): - os.system("ethtool -K {} tx off sg off tso off".format(interface)) + os.system("ethtool -K {} tx off sg off tso off gro off".format(interface)) def enable_tcp_probe(): @@ -446,7 +447,7 @@ class Server: "--one-off", ] subprocess.call(iperf_command) - sleep(10) + sleep(WAIT_AFTER_IPERF) processHandler.kill_all() congestion_control_index = (congestion_control_index + 1) % len( tcp_algo @@ -894,7 +895,7 @@ class Client: congestion_control_index = (congestion_control_index + 1) % len( tcp_algo ) - sleep(12) + sleep(WAIT_AFTER_IPERF + 2) def cbr(self): bitrate = "1M"