diff --git a/publications/comnet/experiments/parallel/03_throughput_under_loss_v5.sh b/publications/comnet/experiments/parallel/03_throughput_under_loss_v5.sh index cf37b6e8..bddb8156 100755 --- a/publications/comnet/experiments/parallel/03_throughput_under_loss_v5.sh +++ b/publications/comnet/experiments/parallel/03_throughput_under_loss_v5.sh @@ -3,9 +3,9 @@ set -euo pipefail source "$(dirname "${BASH_SOURCE[0]}")/common_parallel.sh" EXPERIMENT="03_throughput_under_loss" -LOSSES=(0 1 2 5 10) +LOSSES=(${LOSSES_OVERRIDE:-0 1 2 5 10}) DELAY=10 -QOS_LEVELS=(0 1) +QOS_LEVELS=(${QOS_OVERRIDE:-0}) STRATEGIES=("control-only" "per-publish" "per-topic") RUNS_PER_DATAPOINT=15 @@ -21,13 +21,13 @@ for qos in "${QOS_LEVELS[@]}"; do label="tcp_qos${qos}_loss${loss}pct" echo "[${EXPERIMENT}] ${label}" run_monitored_split "$EXPERIMENT" "$label" \ - "--url mqtt://${BROKER_IP}:1883 --mode throughput --duration 60 --warmup 5 --payload-size 256 --qos ${qos} --publishers 4 --subscribers 4" + "--url mqtt://${BROKER_IP}:1883 --mode throughput --duration 60 --warmup 5 --payload-size 256 --qos ${qos} --publishers 16 --subscribers 8 --inflight 64" for strategy in "${STRATEGIES[@]}"; do label="quic-${strategy}_qos${qos}_loss${loss}pct" echo "[${EXPERIMENT}] ${label}" run_monitored_split "$EXPERIMENT" "$label" \ - "--url quic://${BROKER_IP}:14567 --ca-cert /opt/mqtt-certs/ca.pem --quic-stream-strategy ${strategy} --mode throughput --duration 60 --warmup 5 --payload-size 256 --qos ${qos} --publishers 4 --subscribers 4" + "--url quic://${BROKER_IP}:14567 --ca-cert /opt/mqtt-certs/ca.pem --quic-stream-strategy ${strategy} --mode throughput --duration 60 --warmup 5 --payload-size 256 --qos ${qos} --publishers 16 --subscribers 8 --inflight 64" done clear_netem diff --git a/publications/comnet/experiments/parallel/04_stream_strategies_v5.sh b/publications/comnet/experiments/parallel/04_stream_strategies_v5.sh index 416f990c..838d078c 100755 --- a/publications/comnet/experiments/parallel/04_stream_strategies_v5.sh +++ b/publications/comnet/experiments/parallel/04_stream_strategies_v5.sh @@ -24,7 +24,7 @@ for strategy in "${STRATEGIES[@]}"; do label="${strategy}_${ntopics}topics_throughput" echo "[${EXPERIMENT}] ${label}" run_monitored_split "$EXPERIMENT" "$label" \ - "--url quic://${BROKER_IP}:14567 --ca-cert /opt/mqtt-certs/ca.pem --quic-stream-strategy ${strategy} --mode throughput --duration 60 --warmup 5 --payload-size 256 --publishers 1 --topics ${ntopics} --subscribers 1" + "--url quic://${BROKER_IP}:14567 --ca-cert /opt/mqtt-certs/ca.pem --quic-stream-strategy ${strategy} --mode throughput --duration 60 --warmup 5 --payload-size 256 --publishers 1 --topics ${ntopics} --subscribers 1 --inflight 64" done done diff --git a/publications/comnet/experiments/parallel/06_resource_overhead_v5.sh b/publications/comnet/experiments/parallel/06_resource_overhead_v5.sh index c8093378..8499985c 100755 --- a/publications/comnet/experiments/parallel/06_resource_overhead_v5.sh +++ b/publications/comnet/experiments/parallel/06_resource_overhead_v5.sh @@ -16,13 +16,13 @@ for conc in "${CONCURRENCIES[@]}"; do label="tcp_${conc}conn" echo "[${EXPERIMENT}] ${label}" run_monitored_split "$EXPERIMENT" "$label" \ - "--url mqtt://${BROKER_IP}:1883 --mode throughput --duration 60 --warmup 5 --payload-size 256 --publishers ${conc} --subscribers ${conc}" + "--url mqtt://${BROKER_IP}:1883 --mode throughput --duration 60 --warmup 5 --payload-size 256 --publishers ${conc} --subscribers ${conc} --inflight 64" for strategy in "${STRATEGIES[@]}"; do label="quic-${strategy}_${conc}conn" echo "[${EXPERIMENT}] ${label}" run_monitored_split "$EXPERIMENT" "$label" \ - "--url quic://${BROKER_IP}:14567 --ca-cert /opt/mqtt-certs/ca.pem --quic-stream-strategy ${strategy} --mode throughput --duration 60 --warmup 5 --payload-size 256 --publishers ${conc} --subscribers ${conc}" + "--url quic://${BROKER_IP}:14567 --ca-cert /opt/mqtt-certs/ca.pem --quic-stream-strategy ${strategy} --mode throughput --duration 60 --warmup 5 --payload-size 256 --publishers ${conc} --subscribers ${conc} --inflight 64" done done diff --git a/publications/comnet/experiments/parallel/common_parallel.sh b/publications/comnet/experiments/parallel/common_parallel.sh index 5ea03d46..2f9ee14a 100755 --- a/publications/comnet/experiments/parallel/common_parallel.sh +++ b/publications/comnet/experiments/parallel/common_parallel.sh @@ -222,6 +222,11 @@ run_monitored_pub_only() { local output_dir="${RESULTS_DIR}/${experiment}" mkdir -p "$output_dir" + if [ -f "${output_dir}/${label}_run${RUNS_PER_DATAPOINT}.json" ]; then + echo " skip (already complete): ${label}" + return 0 + fi + for run in $(seq 1 "$RUNS_PER_DATAPOINT"); do local run_label="${label}_run${run}" if [ "$BROKER_FRESH" = "1" ]; then @@ -245,6 +250,11 @@ run_monitored_split() { local output_dir="${RESULTS_DIR}/${experiment}" mkdir -p "$output_dir" + if [ -f "${output_dir}/${label}_run${RUNS_PER_DATAPOINT}.json" ]; then + echo " skip (already complete): ${label}" + return 0 + fi + for run in $(seq 1 "$RUNS_PER_DATAPOINT"); do local run_label="${label}_run${run}" if [ "$BROKER_FRESH" = "1" ]; then