latester: Fix histogram and remove dead code

[can-benchmark.git] / latester / latester.c

diff --git a/latester/latester.c b/latester/latester.c
index fb299aa2c754b41313f171606c189de1e4a78354..a6873b938b50ffccdb64fceffb882c10db423f12 100644 (file)
--- a/latester/latester.c
+++ b/latester/latester.c
@@ -81,6 +81,7 @@ struct {
        unsigned enobufs;
        unsigned overrun;
        unsigned lost;
+       struct timespec tic, tac;
 } stats;
 
 int num_interfaces = 0;
@@ -187,33 +188,6 @@ void msg_info_print(FILE *f, struct msg_info *mi)
        talloc_free (local);
 }
 
-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))
-
-       switch (num_interfaces) {
-       case 2:
-               fprintf(f, "%ld %d %d %s\n",
-                       num, mi->id, mi->length,
-                       DIFF(mi->ts_sent, mi->ts_rx_final_kern));
-               break;
-       case 3:
-               fprintf(f, "%ld %d %d %s\n",
-                       num, mi->id, mi->length,
-                       DIFF(mi->ts_rx_onwire_kern, mi->ts_rx_final_kern));
-               break;
-       }
-#undef S
-#undef DIFF
-       talloc_free (local);
-}
-
-
 /* Subtract the `struct timespec' values X and Y, storing the result in
    RESULT.  Return 1 if the difference is negative, otherwise 0.  */
 
@@ -251,13 +225,13 @@ static inline unsigned get_msg_latency_us(struct msg_info *mi)
 {
        struct timespec diff;
        switch (num_interfaces) {
-       case 2:
+       case 3:
                if (opt.userhist)
                        timespec_subtract(&diff, &mi->ts_rx_final, &mi->ts_rx_onwire);
                else
                        timespec_subtract(&diff, &mi->ts_rx_final_kern, &mi->ts_rx_onwire_kern);
                break;
-       case 3:
+       case 2:
                if (opt.userhist)
                        timespec_subtract(&diff, &mi->ts_rx_final, &mi->ts_sent);
                else
@@ -582,6 +556,8 @@ void *measure_thread(void *arg)
        if (opt.oneattime)
                SEND();
 
+       get_tstamp(&stats.tic);
+
        while (!finish_flag &&
               (opt.count == 0 || count < opt.count || msg_in_progress != 0)) {
 
@@ -631,6 +607,8 @@ void *measure_thread(void *arg)
                }
        }
 
+       get_tstamp(&stats.tac);
+
        for (i=0; i<num_interfaces; i++)
                close(pfd[i].fd);
 
@@ -800,6 +778,14 @@ int main(int argc, const char *argv[])
        fclose(opt.f_hist);
        fclose(opt.f_msgs);
 
+
+       fprintf(opt.f_stat, "cmdline='");
+       for (i=0; i<argc; i++)
+               fprintf(opt.f_stat, "%s%s", argv[i], i < argc-1 ? " " : "");
+       fprintf(opt.f_stat, "'\n");
+
+       timespec_subtract(&diff, &stats.tac, &stats.tic);
+       fprintf(opt.f_stat, "duration=%s # seconds\n", tstamp_str(NULL, &diff));
        
        fprintf(opt.f_stat, "sent=%d\n", count);
        fprintf(opt.f_stat, "overrun=%d\n", stats.overrun);