Some changes from 14 days ago

diff --git a/compile b/compile
index d85a97a915a64f1ac45d06954ea58c959972962f..73624490b74fc3d70a3bd53f3eca99f7ac050429 100755 (executable)
--- a/compile
+++ b/compile
@@ -7,6 +7,7 @@ cd `dirname $0`
 make -C socketcan/kernel/2.6 CONFIG_CAN_KVASER_PCI=m
 
 # Compile lincan and vca_canping
 make -C socketcan/kernel/2.6 CONFIG_CAN_KVASER_PCI=m
 
 # Compile lincan and vca_canping

+make distclean

 make default-config
 make
     
 make default-config
 make
     

diff --git a/tests/ethload.sh b/tests/ethload.sh
index a5e57f6570a152dda017e63826e03a2b7d129b11..5b31c544b34fe5c4a007f08fb321e87c6a853738 100755 (executable)
--- a/tests/ethload.sh
+++ b/tests/ethload.sh
@@ -8,7 +8,7 @@ t() {
        PID_LOAD=$!
        [ $i == "boost" ] && boost_irq_prio 90
        PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN1`
        PID_LOAD=$!
        [ $i == "boost" ] && boost_irq_prio 90
        PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN1`

-       vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-$i -t 1 -d $CAN0 -w 2 -c 10000
+       vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-$i -t 1 -d $CAN0 -w 0 -c 10000

        kill $PID_S
        kill $PID_LOAD
     done
        kill $PID_S
        kill $PID_LOAD
     done


@@ -22,9 +22,9 @@ set logscale y
 set grid
 set xlabel "Time [{/Symbol m}s]"
 set ylabel "Latency profile [messages]"
 set grid
 set xlabel "Time [{/Symbol m}s]"
 set ylabel "Latency profile [messages]"

-plot [0:] "socketcan-norm-1000.dat" with lp title "Socketcan",\
-          "lincan-norm-1000.dat" with lp title "Lincan",\
-          "socketcan-boost-1000.dat" with lp title "Socketcan boosted IRQ prio",\
-          "lincan-boost-1000.dat" with lp title "Lincan boosted IRQ prio"
+plot [0:] "socketcan-norm-1000.dat" with lp lt 1 title "Socketcan",\
+          "lincan-norm-1000.dat" with lp lt 2 title "Lincan",\
+          "socketcan-boost-1000.dat" with lp lt 1 title "Socketcan boosted IRQ prio",\
+          "lincan-boost-1000.dat" with lp lt 2 title "Lincan boosted IRQ prio"

 '
 
 '
 

diff --git a/tests/ethload300MHz.sh b/tests/ethload300MHz.sh
index 8ce677560dee911b953a996925d8823374b321fe..c7ee55d5f9cd0f70cd93ac31dbe91e4c4545095b 100755 (executable)
--- a/tests/ethload300MHz.sh
+++ b/tests/ethload300MHz.sh
@@ -9,7 +9,7 @@ t() {
        [ $i == "boost" ] && boost_irq_prio 90
        cpufreq-set -f 300MHz
        PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN1`
        [ $i == "boost" ] && boost_irq_prio 90
        cpufreq-set -f 300MHz
        PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN1`

-       vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-$i -t 1 -d $CAN0 -w 2 -c 10000
+       vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER-$i -t 1 -d $CAN0 -w 0 -c 10000

        cpufreq-set -f 2400MHz
        kill $PID_S
        kill $PID_LOAD
        cpufreq-set -f 2400MHz
        kill $PID_S
        kill $PID_LOAD


@@ -24,9 +24,8 @@ set logscale y
 set grid
 set xlabel "Time [{/Symbol m}s]"
 set ylabel "Latency profile [messages]"
 set grid
 set xlabel "Time [{/Symbol m}s]"
 set ylabel "Latency profile [messages]"

-plot [0:] "socketcan-norm-1000.dat" with lp title "Socketcan",\
-          "lincan-norm-1000.dat" with lp title "Lincan",\
-          "socketcan-boost-1000.dat" with lp title "Socketcan boosted IRQ prio",\
-          "lincan-boost-1000.dat" with lp title "Lincan boosted IRQ prio"
+plot [0:] "socketcan-norm-1000.dat" with lp lt 1 title "Socketcan",\
+          "lincan-norm-1000.dat" with lp lt 2 title "Lincan",\
+          "socketcan-boost-1000.dat" with lp lt 1 title "Socketcan boosted IRQ prio",\
+          "lincan-boost-1000.dat" with lp lt 2 title "Lincan boosted IRQ prio"

 '
 '

-

diff --git a/tests/rtt-virtual.sh b/tests/rtt-virtual.sh
index 52b87b322d351c8d8f46ac1ada1f7dbcdfa48a21..918cac77a9095363b3ac35542110c4073a17fb1a 100755 (executable)
--- a/tests/rtt-virtual.sh
+++ b/tests/rtt-virtual.sh
@@ -4,7 +4,7 @@
 
 t() {
     PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN0`
 
 t() {
     PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN0`

-    vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER -t 1 -d $CAN0 -w 1 -c 10000
+    vca_canping -m 1 -R FF:$RTPRIO -v -g $DRIVER -t 1 -d $CAN0 -w 0 -c 10000

     kill $PID_S
 }
 
     kill $PID_S
 }
 

diff --git a/tests/rtt.sh b/tests/rtt.sh
index 898fb565810ff95d6bf3531092cc2f2399b97fe0..cf0a3463c858617335e991bf8e77e25318dafca2 100755 (executable)
--- a/tests/rtt.sh
+++ b/tests/rtt.sh
@@ -4,7 +4,7 @@
 
 t() {
     PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN1`
 
 t() {
     PID_S=`vca_canping -s 1 -b -R FF:$RTPRIO -d $CAN1`

-    vca_canping -m 1 -R FF:$RTPRIO -v -e $DRIVER-times -g $DRIVER -t 1 -d $CAN0 -w 1 -n 10 -c 10000
+    vca_canping -m 1 -R FF:$RTPRIO -v -e $DRIVER-times -g $DRIVER -t 1 -d $CAN0 -w 0 -n 10 -c 10000

     kill $PID_S
 }
 
     kill $PID_S
 }
 


@@ -26,5 +26,5 @@ set logscale y
 set grid
 set xlabel "Ping number"
 set ylabel "Round-trip time [{/Symbol m}s]"
 set grid
 set xlabel "Ping number"
 set ylabel "Round-trip time [{/Symbol m}s]"

-plot "lincan-times-1000.dat" with lines, "socketcan-times-1000.dat" with lines
+plot "socketcan-times-1000.dat" with lines, "lincan-times-1000.dat" with lines

 '
 '