latester update

diff --git a/gw-tests/gw-nop.sh b/gw-tests/gw-nop.sh
index 4f9dafb58aa14b1c45934c57dc18bae8d19cd4f0..69b328df95b273c79dc1123802f52fe9a71f47a9 100755 (executable)
--- a/gw-tests/gw-nop.sh
+++ b/gw-tests/gw-nop.sh
@@ -13,9 +13,9 @@ plot_cmds() {
 set title "$gw"
 set logscale y
 set grid
-set xlabel "Time [ms]"
+set xlabel "Time [{/Symbol m}s]"
 set ylabel "Latency profile [messages]"
-plot [0:] \
+plot [0:1000] [1:$COUNT] \
           "hist.dat" with lp lt 1 title ""
 EOF
 }

diff --git a/gw-tests/lib.sh b/gw-tests/lib.sh
index a20f791a03b344b96716483b7eb35463baf52329..f270c788847f636f86c9407a95f034e6c9f03778 100644 (file)
--- a/gw-tests/lib.sh
+++ b/gw-tests/lib.sh
@@ -72,7 +72,9 @@ _run() {
     kvers=$(sshgw uname -r)
     dir=$(create_dirs_and_links $(basename $0 .sh) $kvers)
     cd $dir
-    main
+    if [[ ! "$OPT_PLOT_ONLY" ]]; then
+       main
+    fi
     _plot
 }
 

diff --git a/latester/latester.c b/latester/latester.c
index 3df0a6c46c18786a22aa203d0851a200e26afde9..55234dd01fd8b5697ec8b845813edf2d74a7737b 100644 (file)
--- a/latester/latester.c
+++ b/latester/latester.c
@@ -107,18 +107,19 @@ void msg_info_print(FILE *f, struct msg_info *mi)
 {
        struct timespec diff;
        void *local = talloc_new (NULL);
+       static long num = 0;
 
 #define S(ts) tstamp_str(local, &ts)
 #define DIFF(a, b) (timespec_subtract(&diff, &b, &a), S(diff))
 
        if (num_interfaces == 2)
-               fprintf(f, "%s -> %s (%s) = %s (%s)\n",
-                      S(mi->ts_sent), S(mi->ts_rx_final_kern), S(mi->ts_rx_final),
+               fprintf(f, "%ld: %s -> %s (%s) = %s (%s)\n",
+                      num, S(mi->ts_sent), S(mi->ts_rx_final_kern), S(mi->ts_rx_final),
                       DIFF(mi->ts_sent, mi->ts_rx_final_kern),
                       DIFF(mi->ts_sent, mi->ts_rx_final));
        else
-               fprintf(f, "%s -> %s (%s) -> %s (%s) = %s (%s), %s (%s)\n",
-                      S(mi->ts_sent),
+               fprintf(f, "%ld: %s -> %s (%s) -> %s (%s) = %s (%s), %s (%s)\n",
+                      num, S(mi->ts_sent),
                       S(mi->ts_rx_onwire_kern), S(mi->ts_rx_onwire),
                       S(mi->ts_rx_final_kern), S(mi->ts_rx_final),
                       DIFF(mi->ts_sent, mi->ts_rx_onwire_kern),
@@ -127,6 +128,7 @@ void msg_info_print(FILE *f, struct msg_info *mi)
                       DIFF(mi->ts_rx_onwire, mi->ts_rx_final));
 #undef S
 #undef DIFF
+       num++;
        talloc_free (local);
 }
 
@@ -134,17 +136,18 @@ int msg_info_store(FILE *f, struct msg_info *mi)
 {
        struct timespec diff;
        void *local = talloc_new (NULL);
+       static long num = 0;
 
 #define S(ts) tstamp_str(local, &ts)
 #define DIFF(a, b) (timespec_subtract(&diff, &b, &a), S(diff))
 
        if (num_interfaces == 2)
-               fprintf(f, "%d %d %s\n",
-                       mi->id, mi->length,
+               fprintf(f, "%ld %d %d %s\n",
+                       num, mi->id, mi->length,
                        DIFF(mi->ts_sent, mi->ts_rx_final_kern));
        else
-               fprintf(f, "%d %d %s\n",
-                       mi->id, mi->length,
+               fprintf(f, "%ld %d %d %s\n",
+                       num, mi->id, mi->length,
                        DIFF(mi->ts_rx_onwire_kern, mi->ts_rx_final_kern));
 #undef S
 #undef DIFF
@@ -562,7 +565,7 @@ int main(int argc, const char *argv[])
        signal(SIGTERM, term_handler);
 
        if (opt.histogram) {
-               histogram_init(&histogram, 1000000, 1);
+               histogram_init(&histogram, 5000000, 1);
        }
 
        ret = pipe(completion_pipe);