diff --git a/README.md b/README.md index eb269d9..ece7ee3 100644 --- a/README.md +++ b/README.md @@ -369,8 +369,8 @@ sudo chmod u+s powercap ### Grid5000 ```bash -ssh grenoble.g5k -oarsub -q default -l host=2,walltime=2 -I +ssh nancy.g5k +oarsub -q default -l host=2,walltime=2 -p "wattmeter=YES" -I # Check the name of the other node in https://intranet.grid5000.fr/oar/Lyon/drawgantt-svg/ # Let's call them p1 and p2 ping p2 @@ -383,10 +383,12 @@ python exp.py send g5k # Notes scp /lib/x86_64-linux-gnu/libssl.so.3.6 lyon.g5k:~/ scp /lib/x86_64-linux-gnu/libcrypto.so.3.6 lyon.g5k:~/ -scp records/wikipedia grenoble.g5k:tlsbench/records/ +scp records/wikipedia nancy.g5k:tlsbench/records/ LD_PRELOAD="/home/pengelib/tlsbench/libssl.so.3.6 /home/pengelib/tlsbench/libcrypto.so.3.6" ./netreplay --help ``` +https://api.grid5000.fr/stable/sites/lyon/metrics?nodes=dahu-6&metrics=wattmetre_power_watt,bmc_node_power_watt&start_time=2026-02-26T14:00&end_time=2026-02-26T14:40 + ## Problems ### Youtube diff --git a/exp.py b/exp.py index 456c760..a14d246 100644 --- a/exp.py +++ b/exp.py @@ -763,7 +763,7 @@ def run_exp(config, only_record=None, idle=False, shutdown=False, debug=False): logfile_name = "log-"+timestr logfile_path = exp_dir+"/"+logfile_name logfile = open(logfile_path, "w") - logfile.write("exp impl alg kex cipher ed side tls record n time cpu bytes_in bytes_out Wh Wh_rapl prof\n") + logfile.write("exp impl alg kex cipher ed side tls record n start stop time cpu bytes_in bytes_out Wh Wh_rapl prof\n") logfile.close() perf_dir = "" @@ -800,7 +800,7 @@ def run_exp(config, only_record=None, idle=False, shutdown=False, debug=False): while True: try: with open(logfile_path, "a") as logfile: - logfile.write(f"idle - - - - - - - - - {time_diff} 0 {remote_bytes_in_diff} {remote_bytes_out_diff} {energy_diff} {energy_rapl_diff} -\n") + logfile.write(f"idle - - - - - - - - - {start} {end} {time_diff} 0 {remote_bytes_in_diff} {remote_bytes_out_diff} {energy_diff} {energy_rapl_diff} -\n") logfile.close() break except Exception as e: @@ -979,7 +979,7 @@ def run_exp(config, only_record=None, idle=False, shutdown=False, debug=False): while True: try: with open(logfile_path, "a") as logfile: - logfile.write(f"{expname} {impl} {alg} {kex} {cipher} {earlydata} {side} {tls_int} {record_filename} {repeats} {time_diff} {cpu_diff} {remote_bytes_in_diff} {remote_bytes_out_diff} {energy_diff} {energy_rapl_diff} {prof_filename}\n") + logfile.write(f"{expname} {impl} {alg} {kex} {cipher} {earlydata} {side} {tls_int} {record_filename} {repeats} {start} {end} {time_diff} {cpu_diff} {remote_bytes_in_diff} {remote_bytes_out_diff} {energy_diff} {energy_rapl_diff} {prof_filename}\n") logfile.close() break except Exception as e: