Better global plots

This commit is contained in:
Pascal Engélibert 2026-09-04 16:41:32 +02:00
commit da9593860d
2 changed files with 104 additions and 30 deletions

47
exp.py
View file

@ -137,7 +137,13 @@ CONFIGS = {
#{ "filename": "wp2", "repeat": 10000, "time": 300, "reproduce": 100 },
#{ "filename": "guardian", "realistic": True, "repeat": 10000, "time": 60, "reproduce": 1 },
#{ "filename": "wikipedia", "realistic": True, "repeat": 10000, "time": 120, "reproduce": 10 },
{ "filename": "zimbra", "realistic": True, "repeat": 10000, "time": 60, "reproduce": 10 },
#{ "filename": "zimbra", "realistic": True, "repeat": 10000, "time": 60, "reproduce": 10 },
#{ "filename": "reddit", "realistic": True, "repeat": 10000, "time": 120, "reproduce": 10 },
#{ "filename": "amazon", "realistic": True, "repeat": 10000, "time": 120, "reproduce": 10 },
{ "filename": "instagram", "realistic": True, "repeat": 10000, "time": 120, "reproduce": 10 },
{ "filename": "yt", "realistic": True, "repeat": 10000, "time": 120, "reproduce": 10 },
{ "filename": "yt-ublock", "realistic": True, "repeat": 10000, "time": 120, "reproduce": 10 },
{ "filename": "guardian-ublock", "realistic": True, "repeat": 10000, "time": 120, "reproduce": 10 },
],
"repo_dir": "/home/tuxmain/reps/tlsbench",
"exp_dir": "/dev/shm/exp",
@ -169,19 +175,22 @@ CONFIGS = {
#"debug",
],
"sides": [
#"client",
"client",
"server",
],
"tls": [
#False,
False,
True,
],
"records": [
#{ "filename": "wp2", "repeat": 10000, "time": 600, "reproduce": 1 },
{ "filename": "yt2-ads", "repeat": 10000, "time": 600, "reproduce": 1 },
{ "filename": "yt2-ublock", "repeat": 10000, "time": 600, "reproduce": 1 },
#{ "filename": "yt2-ads", "repeat": 10000, "time": 600, "reproduce": 1 },
#{ "filename": "yt2-ublock", "repeat": 10000, "time": 600, "reproduce": 1 },
#{ "filename": "test", "repeat": 1, "time": 10 },
#{ "filename": "wp2", "repeat": 10000, "time": 300, "reproduce": 100 },
#{ "filename": "wikipedia", "realistic": True, "repeat": 10000, "time": 60, "reproduce": 10 },
#{ "filename": "yt", "realistic": True, "repeat": 10000, "time": 120, "reproduce": 10 },
{ "filename": "amazon", "realistic": True, "repeat": 10000, "time": 120, "reproduce": 10 },
],
"repo_dir": "/home/tuxmain/reps/tlsbench",
"exp_dir": "/dev/shm/exp",
@ -216,14 +225,19 @@ CONFIGS = {
"server",
],
"tls": [
#False,
False,
True,
],
"records": [
{ "filename": "wp2", "repeat": 10000, "time": 300, "reproduce": 2 },
{ "filename": "yt2-ads", "repeat": 10000, "time": 300, "reproduce": 2 },
{ "filename": "yt2-ublock", "repeat": 10000, "time": 300, "reproduce": 2 },
#{ "filename": "wp2", "repeat": 10000, "time": 300, "reproduce": 100 },
#{ "filename": "wp2", "repeat": 10000, "time": 300, "reproduce": 2 },
#{ "filename": "yt2-ads", "repeat": 10000, "time": 300, "reproduce": 2 },
#{ "filename": "yt2-ublock", "repeat": 10000, "time": 300, "reproduce": 2 },
{ "filename": "yt-ublock", "realistic": True, "repeat": 10000, "time": 60, "reproduce": 10 },
{ "filename": "guardian", "realistic": True, "repeat": 10000, "time": 60, "reproduce": 10 },
{ "filename": "guardian-ublock", "realistic": True, "repeat": 10000, "time": 60, "reproduce": 10 },
{ "filename": "amazon", "realistic": True, "repeat": 10000, "time": 60, "reproduce": 10 },
{ "filename": "wikipedia", "realistic": True, "repeat": 10000, "time": 60, "reproduce": 10 },
{ "filename": "reddit", "realistic": True, "repeat": 10000, "time": 60, "reproduce": 10 },
],
"repo_dir": "/home/tuxmain/reps/tlsbench",
"exp_dir": "/dev/shm/exp",
@ -354,7 +368,7 @@ CERT_SIGN_ALGS = [
IMPLS = [
"aws-lc", # Amazon's crypto widely used in Rust stuff
"boring", # Google's fork of OpenSSL used in Chrome and Android
#"graviola", # New crypto in Rust
"graviola", # New crypto in Rust
"openssl", # widely used
#"openssl-static",
"ring", # used in most Rust stuff
@ -482,7 +496,10 @@ EXPERIMENTS = {
#"rsa4096",
"realistic",
],
"earlydata": ["0", "1"],
"earlydata": [
"0",
"1"
],
},
}
@ -684,7 +701,7 @@ def run_netreplay_client(
if skip_verif:
cmd.append("-s")
if concurrency != None:
cmd += ["--concurrency", concurrency]
cmd += ["--concurrency", str(concurrency)]
cmdline = " ".join(cmd)
#print(cmdline)
return ssh_run_bg(ssh, cmdline, env)
@ -918,7 +935,7 @@ def run_exp(config, only_record=None, idle=False, shutdown=False, debug=False):
debug=debug,
notify_addr=config["notify_addr"],
ld_preload=config["ld_preload"] if "ld_preload" in config else None,
concurrency=config.get("concurrency"),
concurrency=record.get("concurrency", config.get("concurrency")),
)
else:
netreplay = run_netreplay_server(
@ -957,7 +974,7 @@ def run_exp(config, only_record=None, idle=False, shutdown=False, debug=False):
notify_addr=config["notify_addr"],
ld_preload=config["ld_preload"] if "ld_preload" in config else None,
skip_verif=not config["measure_both"],
concurrency=config.get("concurrency"),
concurrency=record.get("concurrency", config.get("concurrency")),
)
prof_filename = "-"