From baa1984efbcfdf18cdd00baf203dd24b9d5cf24c Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Wed, 26 Aug 2009 14:52:23 +0200 Subject: [PATCH] Some changes from 14 days ago --- compile | 1 + tests/ethload.sh | 10 +++++----- tests/ethload300MHz.sh | 11 +++++------ tests/rtt-virtual.sh | 2 +- tests/rtt.sh | 4 ++-- 5 files changed, 14 insertions(+), 14 deletions(-) diff --git a/compile b/compile index d85a97a..7362449 100755 --- 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 distclean make default-config make diff --git a/tests/ethload.sh b/tests/ethload.sh index a5e57f6..5b31c54 100755 --- 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` - 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 @@ -22,9 +22,9 @@ set logscale y 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 8ce6775..c7ee55d 100755 --- 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` - 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 @@ -24,9 +24,8 @@ set logscale y 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 52b87b3..918cac7 100755 --- 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` - 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 } diff --git a/tests/rtt.sh b/tests/rtt.sh index 898fb56..cf0a346 100755 --- 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` - 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 } @@ -26,5 +26,5 @@ set logscale y 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 ' -- 2.39.2