Refactor run_iperf function and improve test execution logging
This commit is contained in:
parent
d74aa8ba2c
commit
5c4cb2606e
1 changed files with 18 additions and 25 deletions
43
runtest.sh
43
runtest.sh
|
@ -75,6 +75,8 @@ run_iperf() {
|
|||
tmp_json=$(mktemp)
|
||||
|
||||
local result
|
||||
|
||||
sleep 1s
|
||||
result=$(iperf3 "${args[@]}" -J >"$tmp_json" 2>"$tmp_err")
|
||||
|
||||
parsed=$(jq -r '
|
||||
|
@ -104,9 +106,8 @@ run_iperf() {
|
|||
}
|
||||
|
||||
# Start test email
|
||||
echo -e "Subject: Test ${BOOT_ID} Started\n\nThis is to inform you that the tests have commenced for test ${BOOT_ID}." | msmtp $RECIPIENT
|
||||
echo -e "Subject: Test ${BOOT_ID} Started\n\nThis is to inform you that the tests have commenced for test ${BOOT_ID}." | msmtp "$RECIPIENT"
|
||||
|
||||
COUNTER=0
|
||||
FAILED_START=$(get_tx_failed)
|
||||
|
||||
# Create CSV header if needed
|
||||
|
@ -114,9 +115,8 @@ if [ ! -f "$TEST_FILE" ]; then
|
|||
echo "StartTimestamp,EndTimestamp,Link,Level,Noise,BSSID,TX Bitrate,RX Bitrate,$(speedtest --csv-header),TX Failures,Channel,Frequency,Packet Loss,Jitter,LocalTCPUp,LocalTCPDown,LocalUDPUp,LocalUDPDown,RemoteTCPUp,RemoteTCPDown,RemoteUDPUp,RemoteUDPDown" >"$TEST_FILE"
|
||||
fi
|
||||
|
||||
while [ "$COUNTER" -lt "$NUM_TESTS" ]; do
|
||||
COUNTER=$((COUNTER + 1))
|
||||
echo "Executing test $COUNTER of $NUM_TESTS..."
|
||||
for ((COUNTER = 1; COUNTER <= NUM_TESTS; COUNTER++)); do
|
||||
echo "Executing test run $COUNTER of $NUM_TESTS..."
|
||||
|
||||
for ((i = 1; i <= NUM_SAMPLES; i++)); do
|
||||
echo " Gathering sample $i of $NUM_SAMPLES..."
|
||||
|
@ -124,45 +124,39 @@ while [ "$COUNTER" -lt "$NUM_TESTS" ]; do
|
|||
|
||||
# Wireless stats
|
||||
link_level_noise=$(awk 'NR==3 {gsub(/\./, "", $3); gsub(/\./, "", $4); gsub(/\./, "", $5); print $3","$4","$5}' /proc/net/wireless)
|
||||
bssid_and_bitrate=$(iw dev $INTERFACE link | awk '/Connected/ {bssid=$3} /tx bitrate/ {tx=$3} /rx bitrate/ {rx=$3} END {print bssid","tx","rx}')
|
||||
bssid_and_bitrate=$(iw dev "$INTERFACE" link | awk '/Connected/ {bssid=$3} /tx bitrate/ {tx=$3} /rx bitrate/ {rx=$3} END {print bssid","tx","rx}')
|
||||
|
||||
speed_results=""
|
||||
for ((retry = 1; retry <= MAX_RETRIES; retry++)); do
|
||||
echo " Attempting speed test (try $retry)..."
|
||||
speed_results=$(speedtest --secure --csv 2>/dev/null)
|
||||
speed_results=$(speedtest --secure --csv 2>/dev/null) || true
|
||||
|
||||
if [[ -n "$speed_results" ]]; then
|
||||
break
|
||||
fi
|
||||
|
||||
echo " [!] Speedtest failed at $(date -Iseconds). Retrying in $RETRY_DELAY seconds..."
|
||||
sleep $RETRY_DELAY
|
||||
sleep "$RETRY_DELAY"
|
||||
done
|
||||
|
||||
if [[ -z "$speed_results" ]]; then
|
||||
TIMESTAMP=$(date -Iseconds)
|
||||
echo " [!] Speedtest permanently failed at $TIMESTAMP. Skipping sample $i of test $COUNTER."
|
||||
|
||||
# Optionally log failure to a sidecar file for later nerd rage
|
||||
echo "$TIMESTAMP,Test $COUNTER,Sample $i" >>"${TEST_FILE%.csv}-failures.log"
|
||||
|
||||
continue # Skip this sample
|
||||
continue
|
||||
fi
|
||||
|
||||
# TX failure delta
|
||||
FAILED_NOW=$(get_tx_failed)
|
||||
FAILED_DELTA=$((FAILED_NOW - FAILED_START))
|
||||
FAILED_START=$FAILED_NOW # Update for next sample
|
||||
FAILED_START=$FAILED_NOW
|
||||
|
||||
freq=$(iw dev $INTERFACE link | awk '/freq:/ {print $2}')
|
||||
freq=$(iw dev "$INTERFACE" link | awk '/freq:/ {print $2}')
|
||||
channel=$(freq_to_channel "$freq")
|
||||
|
||||
packet_loss=$(ping -c $PING_COUNT -q $PING_TARGET | grep -oP '\d+(?=% packet loss)')
|
||||
jitter=$(ping -c $PING_COUNT $PING_TARGET | grep "time=" | awk '{print $(NF-1)}' | sed 's/time=//g' | awk '{sum+=$1; sumsq+=$1*$1} END {if (NR>1) print sqrt(sumsq/NR - (sum/NR)**2); else print 0}')
|
||||
packet_loss=$(ping -c "$PING_COUNT" -q "$PING_TARGET" | grep -oP '\d+(?=% packet loss)')
|
||||
jitter=$(ping -c "$PING_COUNT" "$PING_TARGET" | grep "time=" | awk '{print $(NF-1)}' | sed 's/time=//g' | awk '{sum+=$1; sumsq+=$1*$1} END {if (NR>1) print sqrt(sumsq/NR - (sum/NR)**2); else print 0}')
|
||||
|
||||
echo " Running iperf3 tests..."
|
||||
|
||||
# Run them all. These are in bits per second, convert as needed later.
|
||||
LocalTCPUp=$(run_iperf "$IPERF_LOCAL_TARGET" tcp up)
|
||||
LocalTCPDown=$(run_iperf "$IPERF_LOCAL_TARGET" tcp down)
|
||||
LocalUDPUp=$(run_iperf "$IPERF_LOCAL_TARGET" udp up)
|
||||
|
@ -175,14 +169,13 @@ while [ "$COUNTER" -lt "$NUM_TESTS" ]; do
|
|||
|
||||
END_TIME=$(date -Iseconds)
|
||||
|
||||
# Log everything
|
||||
echo "$START_TIME,$END_TIME,$link_level_noise,$bssid_and_bitrate,$speed_results,$FAILED_DELTA,$channel,$freq,$packet_loss,$jitter,$LocalTCPUp,$LocalTCPDown,$LocalUDPUp,$LocalUDPDown,$RemoteTCPUp,$RemoteTCPDown,$RemoteUDPUp,$RemoteUDPDown" >>"$TEST_FILE"
|
||||
|
||||
if [ "$COUNTER" -lt "$NUM_TESTS" ]; then
|
||||
echo "Dozing off for $TIME_BETWEEN..."
|
||||
sleep $TIME_BETWEEN
|
||||
fi
|
||||
done
|
||||
|
||||
if [ "$COUNTER" -lt "$NUM_TESTS" ]; then
|
||||
echo "Waiting $TIME_BETWEEN before the next test run..."
|
||||
sleep "$TIME_BETWEEN"
|
||||
fi
|
||||
done
|
||||
|
||||
echo "Stopping kismet..."
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue