update scripts

diff --git a/gettable.awk b/gettable.awk
index 1fdb5265f9651d774d09d22754c142a30d8fe178..478316b9e1e0fd0cfd246b1a745880b3728a9ce7 100755 (executable)
--- a/gettable.awk
+++ b/gettable.awk
@@ -1,7 +1,7 @@
 #!/usr/bin/awk -f
 
 BEGIN {
-    OFS=" & "
+    OFS=","
     #print "Test", "Load", "Minimum (us)", "Average (us)", "Maximun (us)", "Standard Dev. (us)", "25th % (us)", "Median (us)", "75th % (us)"
 }
 

diff --git a/gettable.sh b/gettable.sh
index 4d852081b271518614c35cbfcf2fd3882535957e..5139c216e067c2b0a70ec96f276974886a2cbd0d 100755 (executable)
--- a/gettable.sh
+++ b/gettable.sh
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-echo "Test & Load & Minimum (us) & Average (us) & Maximun (us) & Standard Dev. (us) & 25th % (us) & Median (us) & 75th % (us)"
+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
@@ -8,6 +8,6 @@ for t in *.exe; do
   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 gettable.awk -v COMMENT=$p $f
   done
 done

diff --git a/sync.sh b/sync.sh
index f3c7702ad770758a3b63153f2abf994dba2543dc..2681447eb2de8df2b5e2d885a66617a69bf11255 100755 (executable)
--- a/sync.sh
+++ b/sync.sh
@@ -7,7 +7,7 @@ HOST=mazet@192.168.1.1
 
 date $(ssh $HOST date +%m%d%H%M%Y)
 
-for f in cyclictest hackbench '*.exe' '*.sh'; do
+for f in cyclictest hackbench '*.awk' '*.exe' '*.sh'; do
     scp $HOST:benchmarks/$f .
 done
 mv load.exe load

diff --git a/test.sh b/test.sh
index 94c419b2783198c88e523bfa8dfb1973f82497b4..e9bdc789cb68fa528968318cb2ffa5358a75f748 100755 (executable)
--- a/test.sh
+++ b/test.sh
@@ -9,18 +9,17 @@ function run() {
     ./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; } &
-    if [ $cpu -eq 0 ];
-      sleep 60
-    else
-      ./load $cpu
-    fi
+    ./load -n $cpu >/dev/null
     echo "Cleaning..."
     sleep 1
   done
 }
 
+touch purge
+rm -f purge *.log *.dat
+
 nbcpu=$(grep -c processor /proc/cpuinfo)
 for k in $(seq 0 $nbcpu); do
-  p=$(expr $k * 100 / $nbcpu)
+  p=$(expr $k \* 100 / $nbcpu)
   run $k $p%
 done