From d6510f6af3b721801646166df23139509d164a06 Mon Sep 17 00:00:00 2001 From: Laurent Mazet Date: Sat, 11 Oct 2025 21:06:34 +0200 Subject: [PATCH] fix base dir --- generatecandle.sh | 16 ++++++++++------ generateplot.sh | 6 ++++-- gettable.sh | 6 ++++-- test.sh | 6 +++--- 4 files changed, 21 insertions(+), 13 deletions(-) diff --git a/generatecandle.sh b/generatecandle.sh index bd8d584..adf1899 100755 --- a/generatecandle.sh +++ b/generatecandle.sh @@ -1,15 +1,19 @@ #!/bin/sh -tmp=$(mktemp) +base=$(cd $(dirname $0); pwd) for csv; do core="any core" - sed 1d $csv | cut -d, -f1 | sort | uniq | while IFS=$'\n' read name; do - output=$(echo $name| awk '{ print tolower($1) }').pdf - awk -F, '$1 == "'"$name"'" { sub (/[^,]*,/, ""); gsub (/,/, " "); print }' $csv > $tmp + sed 1d $csv | cut -d, -f1 | sort | uniq | while IFS=$'\n' read title; do - cat candles.gp | \ - m4 -D CORE="$core" -D DATA="$tmp" -D NAME="$name" | \ + name=$($base/getname.sh "$title") + + output=$name.pdf + + awk -F, '$1 == "'"$title"'" { sub (/[^,]*,/, ""); gsub (/,/, " "); print }' $csv > $name.tab + + cat $base/candles.gp | \ + m4 -D CORE="$core" -D DATA="$name.tab" -D NAME="$name" | \ gnuplot > "$output" done done diff --git a/generateplot.sh b/generateplot.sh index 6af786f..161710b 100755 --- a/generateplot.sh +++ b/generateplot.sh @@ -1,5 +1,7 @@ #!/bin/sh +base=$(cd $(dirname $0); pwd) + for data; do log=$(echo $data | sed 's/\.dat/.log/') @@ -8,12 +10,12 @@ for data; do load=$(echo $data | sed 's/.*-\([0-9]*\)%.*/\1%/') output=$(echo $data | sed 's/\.dat/-raw.pdf/') - cat rawmeasures.gp | \ + cat $base/rawmeasures.gp | \ m4 -D CORE="$core" -D DATA="$data" -D LOAD="$load" -D NAME="$name" | \ gnuplot > $output output=$(echo $data | sed 's/\.dat/-hist.pdf/') - cat histogram.gp | \ + cat $base/histogram.gp | \ m4 -D CORE="$core" -D DATA="$data" -D LOAD="$load" -D NAME="$name" | \ gnuplot > $output done diff --git a/gettable.sh b/gettable.sh index 5139c21..910f561 100755 --- a/gettable.sh +++ b/gettable.sh @@ -1,13 +1,15 @@ #!/bin/sh +base=$(cd $(dirname $0); pwd) + echo "Test,Load (%),Minimum (us),Average (us),Maximun (us),Standard Dev. (us),25th % (us),Median (us),75th % (us)" nbcpu=$(grep -c processor /proc/cpuinfo) for t in *.exe; do - t=${t/.exe/}; + t=$(echo $t | sed 's/\.exe//'); for k in $(seq 0 $nbcpu); do p=$(expr $k \* 100 / $nbcpu) f=$t-$p%.log - [ -f $f ] && awk -f gettable.awk -v COMMENT=$p $f + [ -f $f ] && awk -f $base/gettable.awk -v COMMENT=$p $f done done diff --git a/test.sh b/test.sh index e9bdc78..9c871b9 100755 --- a/test.sh +++ b/test.sh @@ -1,11 +1,11 @@ #!/bin/sh -function run() { +run() { cpu=$1 load=$2 for exe in *.exe; do - test=${exe/.exe/} - echo -e "\033[0;1mTest $test\033[0;0m" + test=$(echo $exe | sed 's/\.exe//') + echo "\033[0;1mTest $test\033[0;0m" ./getinfo.sh | tee $test-$load.log { ./$exe -d 1 -n 10000 -s -o $test-$load.dat | tee -a $test-$load.log; \ kill -2 $(ps -e | awk '/[l]oad/ || /[s]leep/ { print $1 }') 2>/dev/null; } & -- 2.30.2