set cpu profiling variable

tumi8 · Oct 28, 2023 · 1e5197e · 1e5197e
1 parent fab8570
commit 1e5197e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 6 deletions.
diff --git a/code/docker-compose.yml b/code/docker-compose.yml
@@ -58,6 +58,7 @@ services:
     build: finalization
     environment:
       - EXPERIMENT=${EXPERIMENT}
+      - CPU_PROFILING=${CPU_PROFILING}
       - DEVIATION_ANALYSIS=${DEVIATION_ANALYSIS}
     volumes:
       - ${HOST_DIR}:/srv/

diff --git a/code/docker/run_final_analyse.sh b/code/docker/run_final_analyse.sh
@@ -2,6 +2,7 @@
 
 [[ -z "$HOST_DIR" ]] && echo "Need to set HOST_DIR" && exit 1;
 [[ -z "$OUT_DIR" ]] && echo "Need to set OUT_DIR" && exit 1;
+[[ -z "$CPU_PROFILING" ]] && echo "Need to set CPU_PROFILING" && exit 1;
 
 COMPOSE_FILE=docker-compose.yml
 

diff --git a/code/evaluate.py b/code/evaluate.py
@@ -44,7 +44,7 @@ def main(input_dirs: List[str], output_dir: str, cpu_profiling: bool, deviation_
         logging.info(f'Starting Pre-Analyse of {experiment}')
         run_analysis(input_dir, output_dir / experiment, cpu_profiling, 'run_pre_analyse.sh', experiment, deviation_analysis)
         logging.info(f'Starting Final-Analyse of {experiment}')
-        run_analysis(output_dir / experiment, output_dir / f'{experiment}-final', False, 'run_final_analyse.sh', experiment, deviation_analysis)
+        run_analysis(output_dir / experiment, output_dir / f'{experiment}-final', cpu_profiling, 'run_final_analyse.sh', experiment, deviation_analysis)
 
 
 if __name__ == '__main__':

diff --git a/code/evaluator/evaluate.sh b/code/evaluator/evaluate.sh
@@ -20,9 +20,7 @@ parallel -j $PARALLEL_JOBS "dropdb --if-exists root{%}; createdb root{%}; export
 
 python3 /opt/dbscripts/run_tls_analyse.py /srv/timestamper /out
 
-if [ "$CPU_PROFILING" = "True" ]
-then
-
+if [[ "$CPU_PROFILING" == "True" ]]; then
     for filename in /srv/server/perf*.data; do
         mkdir /root/.debug/
         tar xf "/srv/server/perf-server.data.tar_$(basename ${filename##*_} .data).bz2" -C ~/.debug

diff --git a/code/finalization/create-analysis.py b/code/finalization/create-analysis.py
@@ -138,6 +138,7 @@ def extract_run(file_name: str):
 def analyze_dir(result_dir: pathlib.Path, output_writer: csv.DictWriter):
     results = defaultdict(lambda: dict())
     result_name = os.path.basename(result_dir)
+    full_sphincs = False
 
     for file_name in os.listdir(result_dir):
         result_file = result_dir / file_name
@@ -153,6 +154,8 @@ def analyze_dir(result_dir: pathlib.Path, output_writer: csv.DictWriter):
                     results[run]['kem'] = kem.replace('_', '\\_')
                     sig = run_vars.get('sig_alg')
                     results[run]['sig'] = sig.replace('_', '\\_')
+                    if 'sphincssha' in sig:
+                        full_sphincs = True
 
                     if run_vars.get('tc') is not None:
                         results[run]['trafficEmulation'] = run_vars.get('tc')
@@ -258,7 +261,7 @@ def analyze_dir(result_dir: pathlib.Path, output_writer: csv.DictWriter):
             run['kem'] = 'p256'
         sig: str = run['sig']
 
-        if ('sphincs' not in result_name) and 'sphincsharaka' in sig:
+        if not full_sphincs and 'sphincsharaka' in sig:
             sig = sig.replace('haraka', '').replace('fsimple', '')
             run['sig'] = sig
 

diff --git a/code/finalization/run.sh b/code/finalization/run.sh
@@ -13,4 +13,6 @@ if [[ $DEVIATION_ANALYSIS == "True" ]]; then
     /opt/create-deviation-plot.py $out_name/derivations.csv $out_name/deviations
 fi
 
-/opt/eval_profiling.py /srv > $out_name/latencies.csv $out_name/profiling.csv
+if [[ "$CPU_PROFILING" == "True" ]]; then
+  /opt/eval_profiling.py /srv > $out_name/latencies.csv $out_name/profiling.csv
+fi