From 392aae78346273683ec16de646ec91c830652ab3 Mon Sep 17 00:00:00 2001 From: Laurent MAZET Date: Wed, 5 Nov 2025 11:01:36 +0100 Subject: [PATCH] adapt to mode --- addlogdate.sh | 2 +- generatecandle.sh | 2 +- generatedoc.sh | 8 ++++---- generateplot.sh | 8 ++++---- getname.sh | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/addlogdate.sh b/addlogdate.sh index 2818622..d9945b7 100755 --- a/addlogdate.sh +++ b/addlogdate.sh @@ -10,7 +10,7 @@ echo "TestModeDedicated
core(s)Load echo "" for log; do - $base/getdate.awk $log | awk 'NR != 1 {gsub(/,/, ""); print "" $0 ""}' + [ -f "$log" ] && grep -q OK "$log" && $base/getdate.awk $log | awk 'NR != 1 {gsub(/,/, ""); print "" $0 ""}' done echo "" diff --git a/generatecandle.sh b/generatecandle.sh index e429bca..e3ea5eb 100755 --- a/generatecandle.sh +++ b/generatecandle.sh @@ -24,7 +24,7 @@ for csv; do 2) core="2 cores";; esac - awk -F, '$1 == "'"$title"'" && $2 == '$dcore' { $1=$2=""; print }' $csv | sed 's/ //' | sort -n > $name.tab + awk -F, '$1 == "'"$title"'" && $2 == "'"$mode"'" && $3 == '$dcore' { $1=$2=$3=""; print }' $csv | sed 's/ //' | sort -n > $name.tab if [ -s "$name.tab" ]; then cat $base/candles.gp | \ m4 -D CORE="$core" -D DATA="$name.tab" -D MODE="$mode" -D TITLE="$title" | \ diff --git a/generatedoc.sh b/generatedoc.sh index e8a051f..2b1247d 100755 --- a/generatedoc.sh +++ b/generatedoc.sh @@ -37,14 +37,14 @@ for tab; do echo "" echo "
" - echo "
" + echo "" echo "
" for load in $(cat $tab | sed 's/%.*//'); do - echo "

Measures with load of $load%

" + echo "

Measures with load of $load% ($mode)

" echo "
" - echo "" - echo "" + echo "" + echo "" echo "
" done diff --git a/generateplot.sh b/generateplot.sh index e9edacc..1909035 100755 --- a/generateplot.sh +++ b/generateplot.sh @@ -5,10 +5,10 @@ base=$(cd $(dirname $0); pwd) for data; do log=$(echo $data | sed 's/\.dat/.log/') - title=$(awk '/Test:/ { sub(/[^:]*: /, ""); print}' $log) - core=$(awk -F: '/Dedicated core/ { print ($2 == 0) ? "any core" : $2 " core" ($2 > 1 ? "s" : "") }' $log) - load=$(awk '/CPU load/ { print $3 }' $log) - mode=$(awk '$2 == "mode" { print $1 }' $log) + title=$(awk '/Test:/ { sub(/[^:]*: /, ""); print; exit}' $log) + core=$(awk -F: '/Dedicated core/ { print ($2 == 0) ? "any core" : $2+0 " core" ($2 > 1 ? "s" : ""); exit }' $log) + load=$(awk '/CPU load/ { print $3; exit }' $log) + mode=$(awk '$2 == "mode" { print $1; exit }' $log) output=$(echo $data | sed 's/\.dat/-raw.pdf/') cat $base/rawmeasures.gp | \ diff --git a/getname.sh b/getname.sh index f59138a..ab216a4 100755 --- a/getname.sh +++ b/getname.sh @@ -17,13 +17,13 @@ case "$1" in case "$*" in "Clock resolution") test=clock;; "Cycle accuracy") test=cycle;; - "Message queue latency") test=mq_lat;; + "Message queue latency") test=mq;; "Mutex latency") test=mutex;; - "Pipe latency") test=pipe_lat;; + "Pipe latency") test=pipe;; "Semaphore latency") test=semaphore;; "Thread (create) latency") test=thread_c;; "Thread (create and join) latency") test=thread_c+j;; - "UDP socket latency") test=udp_lat;; + "UDP socket latency") test=udp;; *) exit 1;; esac echo $test -- 2.30.2