WIP jan battle

This commit is contained in:
Quentin Dufour 2020-01-17 17:07:03 +00:00
parent 11472da493
commit 037dbb0a91
2 changed files with 70 additions and 4 deletions

View file

@ -688,3 +688,68 @@ jan_tor_analysis:
tor3 -f /etc/torrc_guard_1, \ tor3 -f /etc/torrc_guard_1, \
tor3 -f /etc/torrc_guard_1. tor3 -f /etc/torrc_guard_1.
jan_battle:
./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. \
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.

View file

@ -100,9 +100,10 @@ def analyze_failure(s):
def analyze_interval(s): def analyze_interval(s):
with open('jan_interval.csv', 'w') as f: with open('jan_interval.csv', 'w') as f:
f.write(f"rate,perc,lat\n") f.write(f"rate,perc,lat\n")
for rate, entr in s['per_interval_res'].items(): for inter, entr in s['per_interval_res'].items():
rate = round(1000 / int(inter))
for perc, lat in entr.items(): for perc, lat in entr.items():
f.write(f"{rate},{perc},{lat}\n") f.write(f"{rate},{float(perc)*100}%,{lat/1000}\n")
def analyze_circuit(s): def analyze_circuit(s):
a = sorted(s['per_circuit_res'], key=lambda v: v['0.5']) a = sorted(s['per_circuit_res'], key=lambda v: v['0.5'])
@ -110,14 +111,14 @@ def analyze_circuit(s):
f.write(f"id,perc,lat\n") f.write(f"id,perc,lat\n")
for idx,e in enumerate(a,start=1): for idx,e in enumerate(a,start=1):
for perc, lat in e.items(): for perc, lat in e.items():
f.write(f"{idx},{perc},{lat}\n") f.write(f"{idx},{float(perc)*100}%,{lat/1000}\n")
a = sorted(s['per_circuit_res'], key=lambda v: v['1']) a = sorted(s['per_circuit_res'], key=lambda v: v['1'])
with open('jan_circuit_max.csv', 'w') as f: with open('jan_circuit_max.csv', 'w') as f:
f.write(f"id,perc,lat\n") f.write(f"id,perc,lat\n")
for idx,e in enumerate(a,start=1): for idx,e in enumerate(a,start=1):
for perc, lat in e.items(): for perc, lat in e.items():
f.write(f"{idx},{perc},{lat}\n") f.write(f"{idx},{float(perc)*100}%,{lat/1000}\n")
def analyze(s): def analyze(s):
print("analyzing...") print("analyzing...")