From: Michal Sojka Date: Fri, 10 Dec 2010 17:01:37 +0000 (+0100) Subject: Show graphs in ms instead of us X-Git-Tag: fix-allnoconfig~233^2~1 X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/commitdiff_plain/67617ebf00d594ee3c932b6c8e1850265f28adee Show graphs in ms instead of us It is more readable in case of long delays. --- diff --git a/gw-tests/filter-sff.sh b/gw-tests/filter-sff.sh index a597954..f1c78e3 100755 --- a/gw-tests/filter-sff.sh +++ b/gw-tests/filter-sff.sh @@ -19,7 +19,7 @@ plot_cmds() { set title "2048 GW jobs (one per id, mask C00007FF), no modifications" set logscale y set grid -set xlabel "Time [{/Symbol m}s]" +set xlabel "Time [ms]" set ylabel "Latency profile [messages]" plot [0:1500] [1:$COUNT] \\ EOF diff --git a/gw-tests/filter.sh b/gw-tests/filter.sh index 4a24c71..51a8114 100755 --- a/gw-tests/filter.sh +++ b/gw-tests/filter.sh @@ -19,7 +19,7 @@ plot_cmds() { set title "2048 GW jobs (one per id, mask 0x7FF), no modifications" set logscale y set grid -set xlabel "Time [{/Symbol m}s]" +set xlabel "Time [ms]" set ylabel "Latency profile [messages]" plot [0:] [1:$COUNT] \\ EOF diff --git a/gw-tests/mod.sh b/gw-tests/mod.sh index a342415..6a870e6 100755 --- a/gw-tests/mod.sh +++ b/gw-tests/mod.sh @@ -42,7 +42,7 @@ plot_cmds() { set title "Single GW job for all messages with modifications, 8 byte messages" set logscale y set grid -set xlabel "Time [{/Symbol m}s]" +set xlabel "Time [ms]" set ylabel "Latency profile [messages]" plot [0:600] [1:$COUNT] \ "nop-hist.txt" with lp lt 1 title "No modifications", \ diff --git a/gw-tests/nop-highprio-time.sh b/gw-tests/nop-highprio-time.sh index 0d13e9a..953835c 100755 --- a/gw-tests/nop-highprio-time.sh +++ b/gw-tests/nop-highprio-time.sh @@ -11,12 +11,12 @@ plot_cmds() { set title "Single GW job for all messages, no modifications, high (soft)irq task priority" set grid set xlabel "Time [s]" -set ylabel "Latency [{/Symbol m}s]" +set ylabel "Latency [ms]" plot [:] [:500] \ - "len2-msgs.txt" using 2:(1000000*$14) with points title "2 byte messages", \ - "len4-msgs.txt" using 2:(1000000*$14) with points title "4 byte messages", \ - "len6-msgs.txt" using 2:(1000000*$14) with points title "6 byte messages", \ - "len8-msgs.txt" using 2:(1000000*$14) with points title "8 byte messages" + "len2-msgs.txt" using 2:(1000*$14) with points title "2 byte messages", \ + "len4-msgs.txt" using 2:(1000*$14) with points title "4 byte messages", \ + "len6-msgs.txt" using 2:(1000*$14) with points title "6 byte messages", \ + "len8-msgs.txt" using 2:(1000*$14) with points title "8 byte messages" EOF } diff --git a/gw-tests/nop-highprio.sh b/gw-tests/nop-highprio.sh index 0b09312..8363fd5 100755 --- a/gw-tests/nop-highprio.sh +++ b/gw-tests/nop-highprio.sh @@ -19,7 +19,7 @@ plot_cmds() { set title "Single GW job for all messages, no modifications, high (soft)irq task priority" set logscale y set grid -set xlabel "Time [{/Symbol m}s]" +set xlabel "Time [ms]" set ylabel "Latency profile [messages]" plot [0:600] [1:$COUNT] \ "len2-hist.txt" with lp lt 1 title "2 byte messages", \ diff --git a/gw-tests/nop-time.sh b/gw-tests/nop-time.sh index 007542d..4d3152d 100755 --- a/gw-tests/nop-time.sh +++ b/gw-tests/nop-time.sh @@ -11,12 +11,12 @@ plot_cmds() { set title "Single GW job for all messages, no modifications" set grid set xlabel "Time [s]" -set ylabel "Latency [{/Symbol m}s]" +set ylabel "Latency [ms]" plot [:] [:500] \ - "len2-msgs.txt" using 2:(1000000*$14) with points title "2 byte messages", \ - "len4-msgs.txt" using 2:(1000000*$14) with points title "4 byte messages", \ - "len6-msgs.txt" using 2:(1000000*$14) with points title "6 byte messages", \ - "len8-msgs.txt" using 2:(1000000*$14) with points title "8 byte messages" + "len2-msgs.txt" using 2:(1000*$14) with points title "2 byte messages", \ + "len4-msgs.txt" using 2:(1000*$14) with points title "4 byte messages", \ + "len6-msgs.txt" using 2:(1000*$14) with points title "6 byte messages", \ + "len8-msgs.txt" using 2:(1000*$14) with points title "8 byte messages" EOF } diff --git a/gw-tests/nop.sh b/gw-tests/nop.sh index 3747a85..341124f 100755 --- a/gw-tests/nop.sh +++ b/gw-tests/nop.sh @@ -15,7 +15,7 @@ plot_cmds() { set title "Single GW job for all messages, no modifications" set logscale y set grid -set xlabel "Time [{/Symbol m}s]" +set xlabel "Time [ms]" set ylabel "Latency profile [messages]" plot [0:600] [1:$COUNT] \ "len2-hist.txt" with lp lt 1 title "2 byte messages", \ diff --git a/gw-tests/pc.sh b/gw-tests/pc.sh index fa511d8..477b13c 100755 --- a/gw-tests/pc.sh +++ b/gw-tests/pc.sh @@ -14,7 +14,7 @@ plot_cmds() { set title "No GW, two interfaces in PC" set logscale y set grid -set xlabel "Time [{/Symbol m}s]" +set xlabel "Time [ms]" set ylabel "Latency profile [messages]" plot [0:] [1:$COUNT] \ "len2-hist.txt" with lp lt 1 title "2 byte messages", \ diff --git a/gw-tests/user.sh b/gw-tests/user.sh index 6fedbda..18e6730 100755 --- a/gw-tests/user.sh +++ b/gw-tests/user.sh @@ -17,7 +17,7 @@ plot_cmds() { set title "Kernel vs. userspace GW, no modifications" set logscale y set grid -set xlabel "Time [{/Symbol m}s]" +set xlabel "Time [ms]" set ylabel "Latency profile [messages]" plot [0:] [1:$COUNT] \ "kern2-hist.txt" with lp lt 1 title "Kernel GW, 2 byte messages", \ diff --git a/gw-tests/vcan.sh b/gw-tests/vcan.sh index b760d5f..7002bfc 100755 --- a/gw-tests/vcan.sh +++ b/gw-tests/vcan.sh @@ -24,7 +24,7 @@ plot_cmds() { set title "Chained GW jobs on a signle VCAN interface" set logscale y set grid -set xlabel "Time [{/Symbol m}s]" +set xlabel "Time [ms]" set ylabel "Latency profile [messages]" plot [0:10000] [1:$COUNT] \\ EOF diff --git a/gw-tests/vcans.sh b/gw-tests/vcans.sh index 69e867d..d73165f 100755 --- a/gw-tests/vcans.sh +++ b/gw-tests/vcans.sh @@ -24,7 +24,7 @@ plot_cmds() { set title "Chained GW jobs on multiple VCAN interfaces" set logscale y set grid -set xlabel "Time [{/Symbol m}s]" +set xlabel "Time [ms]" set ylabel "Latency profile [messages]" plot [0:1000] [1:$COUNT] \\ EOF diff --git a/latester/histogram.h b/latester/histogram.h index ad7591c..4a9aade 100644 --- a/latester/histogram.h +++ b/latester/histogram.h @@ -40,10 +40,7 @@ void histogram_fprint(struct histogram *h, FILE *f) cum = sum; for (i = 0; i < h->allocated; i++) { if (h->data[i] != 0) { - if (!getenv("CANPING_MS")) - fprintf(f, "%d %lld\n", i*h->resolution, cum); - else - fprintf(f, "%g %lld\n", 1e-3*(i*h->resolution), cum); + fprintf(f, "%g %lld\n", 1e-3*(i*h->resolution), cum); } cum -= h->data[i]; }