adapt to mode

diff --git a/addlogdate.sh b/addlogdate.sh
index 2818622ef5f315f12a7159485e3ca5a26ac7d2d1..d9945b7035a26c18f09346c85666671bb49accd8 100755 (executable)
--- a/addlogdate.sh
+++ b/addlogdate.sh
@@ -10,7 +10,7 @@ echo "<thead><tr><th>Test</th><th>Mode</th><th>Dedicated<br>core(s)</th><th>Load
 echo "<tbody>"
 
 for log; do
-  $base/getdate.awk $log | awk 'NR != 1 {gsub(/,/, "</td><td>"); print "<tr><td>" $0 "</td></tr>"}' 
+  [ -f "$log" ] && grep -q OK "$log" && $base/getdate.awk $log | awk 'NR != 1 {gsub(/,/, "</td><td>"); print "<tr><td>" $0 "</td></tr>"}' 
 done
 
 echo "</tbody>"

diff --git a/generatecandle.sh b/generatecandle.sh
index e429bcab2de5578b1a25066fc7b95e17e95c3699..e3ea5eb0e18c7a71e667204819ac24fdab4b3c61 100755 (executable)
--- 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 e8a051f7736f40fae75b046645a4d8e05e72d884..2b1247da973b0a117ad136e859bb29366afb93b4 100755 (executable)
--- a/generatedoc.sh
+++ b/generatedoc.sh
@@ -37,14 +37,14 @@ for tab; do
   echo "</div>"
 
   echo "<div style=\"figure\">"
-  echo "<div><a href=\"$test-${dcore}k.pdf\"><img src=\"$test-${dcore}k.png\" width=\"80%\"/></a></div>"
+  echo "<img src=\"$test-${dcore}k-m${nmode}.png\" width=\"80%\"/>"
   echo "</div>"
 
   for load in $(cat $tab | sed 's/%.*//'); do
-    echo "<h3>Measures with load of $load%</h3>"
+    echo "<h3>Measures with load of $load% ($mode)</h3>"
     echo "<div style=\"figure\">"
-    echo "<img src=\"$test-${dcore}k-${load}%-raw.png\" width=\"45%\"/>"
-    echo "<img src=\"$test-${dcore}k-${load}%-hist.png\" width=\"45%\"/>"
+    echo "<img src=\"$test-${dcore}k-${load}%-m${nmode}-raw.png\" width=\"45%\"/>"
+    echo "<img src=\"$test-${dcore}k-${load}%-m${nmode}-hist.png\" width=\"45%\"/>"
     echo "</div>"
   done
 

diff --git a/generateplot.sh b/generateplot.sh
index e9edacc5d93f06e80bdc95301bf8f41dedf56841..190903532c6a42021ea669dcd8dfa40675083751 100755 (executable)
--- 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 f59138a6f0d745086654a5df466394f46fcf3634..ab216a4b0a1272ddf7ed28286d3c2b2a8845c336 100755 (executable)
--- 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