From eae4ee007b4fa99878b74c875600f86d94669fb4 Mon Sep 17 00:00:00 2001 From: jean-philippe bempel Date: Wed, 22 Apr 2020 14:47:06 +0200 Subject: [PATCH] fix glob of files for percentiles --- scripts/bench.sh | 2 +- scripts/percentiles.py | 3 ++- scripts/start.sh | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/scripts/bench.sh b/scripts/bench.sh index 5569c6942..6fa0a15f0 100755 --- a/scripts/bench.sh +++ b/scripts/bench.sh @@ -60,7 +60,7 @@ function bench () { pkill -P $PID sleep 1 done - python percentiles.py ${TAG}-${JDK}.csv results_${TAG}-${JDK}-*.csv + python percentiles.py ${TAG}-${JDK}.csv results_${TAG}-${JDK}-?.csv } function checks () { diff --git a/scripts/percentiles.py b/scripts/percentiles.py index a72dab9b7..80a38e35d 100644 --- a/scripts/percentiles.py +++ b/scripts/percentiles.py @@ -12,7 +12,8 @@ def get_percentile(percentile, values): latencies = [] percentiles = [] with open(output_filename, "w") as output_file: - output_file.write(','.join(input_files) + '\n') + headers = [input_file.replace('results_', '').replace('.csv', '') for input_file in input_files] + output_file.write(','.join(headers) + '\n') for input_filename in input_files: with open(input_filename) as input_file: for line in input_file: diff --git a/scripts/start.sh b/scripts/start.sh index 667c959e7..b029fd5ff 100755 --- a/scripts/start.sh +++ b/scripts/start.sh @@ -20,7 +20,7 @@ if [ "$2" == "jdk8dev" ]; then export JAVA_HOME=../../jdk/jdk8dev fi -if [ "$2" == "" ]; +if [ "$2" == "jdk11" ]; then export JAVA_HOME=../../jdk/jdk-11.0.7+10 fi