From 35840b9eb75c3f950c80e7769306871006cfd2f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pascal=20Eng=C3=A9libert?= Date: Tue, 16 Jun 2026 13:40:44 +0200 Subject: [PATCH] Prepare g5k --- exp.py | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/exp.py b/exp.py index a725b46..1956cb1 100644 --- a/exp.py +++ b/exp.py @@ -131,9 +131,9 @@ CONFIGS = { 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": 600, "reproduce": 1 }, + { "filename": "yt2-ads", "repeat": 10000, "time": 600, "reproduce": 1 }, + { "filename": "yt2-ublock", "repeat": 10000, "time": 600, "reproduce": 1 }, #{ "filename": "wp2", "repeat": 10000, "time": 300, "reproduce": 100 }, ], "repo_dir": "/home/tuxmain/reps/tlsbench", @@ -258,16 +258,16 @@ CONFIGS = { "server", ], "tls": [ - #False, + False, True, ], "records": [ # Can't repeat more than 8000 times here # TODO check if netreplay client frees ports correctly, or try to reuse ports - #{ "filename": "wp2", "repeat": 8000, "time": 180 }, - #{ "filename": "yt2-ads", "repeat": 8000, "time": 180 }, - #{ "filename": "yt2-ublock", "repeat": 8000, "time": 180 }, - { "filename": "wp2", "repeat": 10000, "time": 120, "reproduce": 10 }, + { "filename": "wp2", "repeat": 8000, "time": 450 }, + { "filename": "yt2-ads", "repeat": 8000, "time": 600 }, + { "filename": "yt2-ublock", "repeat": 8000, "time": 600 }, + #{ "filename": "wp2", "repeat": 10000, "time": 120, "reproduce": 10 }, ], "repo_dir": "/home/pengelib/tlsbench", "exp_dir": "/dev/shm/exp", @@ -286,8 +286,9 @@ CONFIGS = { "notify_listen": ("0.0.0.0", 8090), "notify_addr": "172.16.101.x:8090", "ld_preload": { - "openssl": "/home/pengelib/openssl-openssl-3.6.1/libssl.so.3:/home/pengelib/openssl-openssl-3.6.1/libcrypto.so.3", + "openssl": "/home/pengelib/openssl-3.6.2/libssl.so.3:/home/pengelib/openssl-3.6.2/libcrypto.so.3", }, + "concurrency": "32", "measure_both": True, "target": "paradoxe-x", "controller_target": "paradoxe-x", @@ -1008,7 +1009,7 @@ def run_exp(config, only_record=None, idle=False, shutdown=False, debug=False): record_filename = record["filename"] cpu_diff = new_cpu - cpu - controller_cpu_diff = controller_new_cpu - controller_cpu + controller_cpu_diff = new_controller_cpu - controller_cpu remote_bytes_in_diff = new_remote_bytes_in - remote_bytes_in remote_bytes_out_diff = new_remote_bytes_out - remote_bytes_out energy_diff = new_energy - energy