Add column with routing delay

Now, it is no longer needed to calculate it in gnuplot.

diff --git a/latester/latester.c b/latester/latester.c
index 67e1dcb1f6d17ede19d5c02c4c97bba238f46945..a4f825c577fd68b0e7955efd9066b577539e40c1 100644 (file)
--- a/latester/latester.c
+++ b/latester/latester.c
@@ -166,7 +166,7 @@ int timespec_subtract (struct timespec *result, struct timespec *x, struct times
 
 void msg_info_print(FILE *f, struct msg_info *mi)
 {
 
 void msg_info_print(FILE *f, struct msg_info *mi)
 {

-       struct timespec diff;
+       struct timespec diff, routing_delay, tx_time;

        void *local = talloc_new (NULL);
        static long num = 0;
        char sent[64], received[64];
        void *local = talloc_new (NULL);
        static long num = 0;
        char sent[64], received[64];


@@ -189,7 +189,12 @@ void msg_info_print(FILE *f, struct msg_info *mi)
                        mi->tx_time_us);
                break;
        case 3:
                        mi->tx_time_us);
                break;
        case 3:

-               fprintf(f, "%ld: %s %s -> %s (%s) -> %s (%s) %s = %s (%s), %s (%s) %d\n",
+               tx_time.tv_sec = 0;
+               tx_time.tv_nsec = mi->tx_time_us*1000;
+               timespec_subtract(&routing_delay, &mi->ts_rx_final_kern, &mi->ts_rx_onwire_kern);
+               timespec_subtract(&routing_delay, &routing_delay, &tx_time);
+
+               fprintf(f, "%ld: %s %s -> %s (%s) -> %s (%s) %s = %s (%s), %s (%s) %d %s\n",

                        num, S(mi->ts_sent), sent,
                        S(mi->ts_rx_onwire_kern), S(mi->ts_rx_onwire),
                        S(mi->ts_rx_final_kern), S(mi->ts_rx_final), received,
                        num, S(mi->ts_sent), sent,
                        S(mi->ts_rx_onwire_kern), S(mi->ts_rx_onwire),
                        S(mi->ts_rx_final_kern), S(mi->ts_rx_final), received,


@@ -197,7 +202,8 @@ void msg_info_print(FILE *f, struct msg_info *mi)
                        DIFF(mi->ts_sent, mi->ts_rx_onwire),
                        DIFF(mi->ts_rx_onwire_kern, mi->ts_rx_final_kern),
                        DIFF(mi->ts_rx_onwire, mi->ts_rx_final),
                        DIFF(mi->ts_sent, mi->ts_rx_onwire),
                        DIFF(mi->ts_rx_onwire_kern, mi->ts_rx_final_kern),
                        DIFF(mi->ts_rx_onwire, mi->ts_rx_final),

-                       mi->tx_time_us);
+                       mi->tx_time_us,
+                       S(routing_delay));

                break;
        }
 #undef S
                break;
        }
 #undef S