diff --git a/scripts/Makefile b/scripts/Makefile index 3040ad4..6218079 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -688,68 +688,135 @@ jan_tor_analysis: tor3 -f /etc/torrc_guard_1, \ tor3 -f /etc/torrc_guard_1. -jan_battle: +jan_battle_normal: ./run-3 \ - 64,battle. \ - orig-client 7500 40 172, \ - orig-client 7500 40 172, \ - orig-client 7500 40 172, \ - dup2-client 7500 40 172 2, \ - dup2-client 7500 40 172 2, \ - dup2-client 7500 40 172 2, \ - lightning-client 7500 40 172 12 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ - lightning-client 7500 40 172 12 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ - lightning-client 7500 40 172 12 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ - lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \ - orig-server-single 7500 40 172, \ - orig-server 7500 40 172, \ - orig-server 7500 40 172, \ - dup2-server-single 7500 40 172 2, \ - dup2-server 7500 40 172 2, \ - dup2-server 7500 40 172 2, \ - lightning-server-single 7500 40 172 12 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ - lightning-server 7500 40 172 12 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ - lightning-server 7500 40 172 12 disable_scheduler=1!fast_count=8!tick_tock=1!measlat=1!window=300000, \ - lightning-server-single 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ - lightning-server-single 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ - lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \ + 8,battle. \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + orig-client 135000 40 172, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + dup2-client 135000 40 172 2, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-client 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + orig-server 135000 40 172, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + dup2-server 135000 40 172 2, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \ + lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_2, \ tor2 -f /etc/torrc_guard_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_2. \ - tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_2, \ - tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_2, \ - tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_2, \ - tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_2, \ - tor2 -f /etc/torrc_single_hop_16, \ tor2 -f /etc/torrc_guard_16, \ - tor3 -f /etc/torrc_guard_2. - - + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16. \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16, \ + tor2 -f /etc/torrc_guard_16. +