]> rtime.felk.cvut.cz Git - can-benchmark.git/blobdiff - latester/latester.c
Commit not-finished state of frame length calculation
[can-benchmark.git] / latester / latester.c
index bf0eff0f8f4845b001c988347f01ba3ee58889f1..2e8f6e31eb9854d4fde58a39d490e9530b820f8f 100644 (file)
@@ -1,8 +1,8 @@
-/**************************************************************************/
-/* CAN latency tester                                                     */
-/* Copyright (C) 2010, 2011 Michal Sojka, DCE FEE CTU Prague                    */
-/* License: GPLv2                                                        */
-/**************************************************************************/
+/*******************************************************************************/
+/* CAN latency tester                                                          */
+/* Copyright (C) 2010, 2011, 2012, 2013, 2014 Michal Sojka, DCE FEE CTU Prague */
+/* License: GPLv2                                                             */
+/*******************************************************************************/
 
 #include <ctype.h>
 #include <errno.h>
@@ -30,6 +30,7 @@
 #include <talloc.h>
 #include <unistd.h>
 
+#include "canframelen.h"
 #include <linux/can.h>
 #include <linux/can/raw.h>
 
@@ -67,6 +68,7 @@ struct options {
        /* Temporary variables */
        FILE *f_msgs;
        FILE *f_hist;
+       FILE *f_hist_gw;
        FILE *f_stat;
 };
 
@@ -98,12 +100,13 @@ struct msg_info {
        struct timespec ts_rx_onwire, ts_rx_onwire_kern;
        struct timespec ts_rx_final, ts_rx_final_kern;
        struct can_frame sent, received;
+       unsigned lat_measured_us, tx_time_us;
 };
 
 #define MAX_INFOS 10000
 struct msg_info msg_infos[MAX_INFOS];
 
-struct histogram histogram;
+struct histogram histogram, histogram_gw;
 
 void sprint_canframe(char *buf , struct can_frame *cf, int sep) {
        /* documentation see lib.h */
@@ -158,89 +161,6 @@ static inline char *tstamp_str(const void *ctx, struct timespec *tstamp)
                               tstamp->tv_sec, tstamp->tv_nsec/1000);
 }
 
-unsigned calc_stuff_bits(struct can_frame *frame) {
-       uint32_t bitmap[4];
-       unsigned start = 0, end;
-       uint32_t mask, ones = 0, basemask = 0xf0000000;
-       unsigned stuffed = 0;
-       memset(bitmap, 0, sizeof(bitmap));
-
-       if (frame->can_id & CAN_EFF_FLAG) {
-               bitmap[0] =
-                       (frame->can_id >> 25);
-               bitmap[1] =
-                       (frame->can_id >> 18) << 25             |
-                       3 << 23                                 |
-                       (frame->can_id & 0x3ffff) << 7          |
-                       (!!(frame->can_id & CAN_RTR_FLAG)) << 6 |
-                       0 << 4                                  |
-                       frame->can_dlc & 0xf;
-               bitmap[2] = htonl(((uint32_t*)frame->data)[0]);
-               bitmap[3] = htonl(((uint32_t*)frame->data)[1]);
-               start = 28;
-               end = 64 + 8*frame->can_dlc;
-       } else {
-               bitmap[0] =
-                       (frame->can_id << 7) |
-                       (!!(frame->can_id & CAN_RTR_FLAG)) << 6 |
-                       0 << 4                                  |
-                       frame->can_dlc & 0xf;
-               bitmap[1] = htonl(((uint32_t*)frame->data)[0]);
-               bitmap[2] = htonl(((uint32_t*)frame->data)[1]);
-               start = 14;
-               end = 32 + 8*frame->can_dlc;
-       }
-       /* TODO: Calc stuff bits in CRC */
-       while (start < end) {
-               mask = basemask >> (start & 0x1f);
-               while (1) {
-                       ones = ones ? mask : 0;
-                       uint32_t chunk = (bitmap[start >> 5] & mask) ^ ones;
-                       //printf("start=%d  bitmap=0x%08x  mask=0x%08x  ones=0x%08x  chunk=0x%08x\n", start, bitmap[start >> 5], mask, ones, chunk);
-                       if (chunk) {
-                               unsigned change = __builtin_clz(chunk);
-                               start = start & ~0x1f | change;
-                               basemask = 0xf8000000;
-                       } else {
-                               unsigned oldstart = start;
-                               start += __builtin_popcount(mask);
-                               mask = (oldstart & 0x1f) ? basemask << (-oldstart & 0x1f) : 0;
-                               //printf("oldstart=%d  shl=%d  mask=0x%08x\n", oldstart, -oldstart & 0x1f, mask);
-                               if (mask && start < end)
-                                       continue;
-                               if (start <= end && !mask) {
-                                       stuffed++;
-                                       basemask = 0xf0000000;
-                                       printf("stuffed %d\n", !ones);
-                               }
-                       }
-                       break;
-               }
-               ones = !ones;
-       }
-       printf ("STUFFED %d BITS\n", stuffed);
-}
-
-unsigned calc_frame_txtime(struct can_frame *frame) {
-       return calc_stuff_bits(frame) +
-               1 +             /* SOF */
-               11 +            /* ID A */
-               ((frame->can_id & CAN_EFF_FLAG) ?
-                1 +            /* SRR */
-                1 +            /* IDE */
-                18 +           /* ID B */
-                1 +            /* RTR */
-                2              /* r1, r0 */
-                :
-                1 +            /* rtr */
-                2) +           /* ide, r0 */
-               4 +             /* dlc */
-               8*frame->can_dlc +
-               15 +            /* CRC */
-               3 +             /* CRC del, ACK, ACK del */
-               7;              /* EOF */
-}
-
 void msg_info_print(FILE *f, struct msg_info *mi)
 {
        struct timespec diff;
@@ -248,6 +168,9 @@ void msg_info_print(FILE *f, struct msg_info *mi)
        static long num = 0;
        char sent[64], received[64];
 
+       if (!f)
+               return;
+
        sprint_canframe(sent, &mi->sent, true);
        sprint_canframe(received, &mi->received, true);
 
@@ -260,7 +183,7 @@ void msg_info_print(FILE *f, struct msg_info *mi)
                        num, S(mi->ts_sent), sent, S(mi->ts_rx_final_kern), S(mi->ts_rx_final), received,
                        DIFF(mi->ts_sent, mi->ts_rx_final_kern),
                        DIFF(mi->ts_sent, mi->ts_rx_final),
-                       calc_frame_txtime(mi->received));
+                       mi->tx_time_us);
                break;
        case 3:
                fprintf(f, "%ld: %s %s -> %s (%s) -> %s (%s) %s = %s (%s), %s (%s) %d\n",
@@ -271,7 +194,7 @@ 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),
-                       calc_frame_txtime(mi->received));
+                       mi->tx_time_us);
                break;
        }
 #undef S
@@ -313,7 +236,7 @@ void dbg_print_timespec(char *msg, struct timespec *tv)
        printf("%s sec=%ld nsec=%ld\n", msg, tv->tv_sec, tv->tv_nsec);
 }
 
-static inline unsigned get_msg_latency_us(struct msg_info *mi)
+static inline void calc_msg_latencies(struct msg_info *mi)
 {
        struct timespec diff;
        switch (num_interfaces) {
@@ -330,9 +253,10 @@ static inline unsigned get_msg_latency_us(struct msg_info *mi)
                        timespec_subtract(&diff, &mi->ts_rx_final_kern, &mi->ts_sent);
                break;
        default:
-               return 0;
+               return;
        }
-       return diff.tv_sec * 1000000 + diff.tv_nsec/1000;
+       mi->lat_measured_us = diff.tv_sec * 1000000 + diff.tv_nsec/1000;
+       mi->tx_time_us = calc_frame_length(&mi->received);
 }
 
 void set_sched_policy_and_prio(int policy, int rtprio)
@@ -596,7 +520,10 @@ void process_final_rx(int s)
        mi->ts_rx_final = ts_user;
        mi->received = frame;
 
-       histogram_add(&histogram, get_msg_latency_us(mi));
+       calc_msg_latencies(mi);
+
+       histogram_add(&histogram, mi->lat_measured_us);
+       histogram_add(&histogram_gw, mi->lat_measured_us - mi->tx_time_us);
 
        ret = write(completion_pipe[1], &mi, sizeof(mi));
        if (ret == -1)
@@ -779,12 +706,19 @@ int parse_options(int argc, const char *argv[])
        }
 
        if (opt.name) {
-               char *f = talloc_asprintf(local, "%s-hist.txt", opt.name);
+               char *f = talloc_asprintf(local, "%s-hist-raw.txt", opt.name);
                opt.f_hist = fopen(f, "w");
                if (!opt.f_hist)
                        error(1, errno, "fopen: %s", f);
        }
 
+       if (opt.name) {
+               char *f = talloc_asprintf(local, "%s-hist.txt", opt.name);
+               opt.f_hist_gw = fopen(f, "w");
+               if (!opt.f_hist_gw)
+                       error(1, errno, "fopen: %s", f);
+       }
+
        if (opt.name) {
                char *f = talloc_asprintf(local, "%s-stat.txt", opt.name);
                opt.f_stat = fopen(f, "w");
@@ -825,6 +759,7 @@ int main(int argc, const char *argv[])
                msg_infos[i].id = -1;
 
        histogram_init(&histogram, 5000000, 1);
+       histogram_init(&histogram_gw, 5000000, 1);
 
        ret = pipe(completion_pipe);
        if (ret == -1)
@@ -834,6 +769,13 @@ int main(int argc, const char *argv[])
                error(1, errno, "pipe fcntl");
 
        init_ftrace();
+       if (getenv("LATESTER_CONTROL_HACKBENCH")) {
+               char cmd[1000];
+               sprintf(cmd, "ssh -x -a -S $HOME/.ssh/cangw-connection root@192.168.2.3 'kill -CONT -%s'",
+                       getenv("LATESTER_CONTROL_HACKBENCH"));
+               printf("Running: %s\n", cmd);
+               system(cmd);
+       }
 
        pthread_create(&thread, 0, measure_thread, NULL);
 
@@ -883,40 +825,54 @@ int main(int argc, const char *argv[])
 
        pthread_join(thread, NULL);
 
+       if (getenv("LATESTER_CONTROL_HACKBENCH")) {
+               char cmd[1000];
+               sprintf(cmd, "ssh -x -a -S $HOME/.ssh/cangw-connection root@192.168.2.3 'kill -STOP -%s'",
+                       getenv("LATESTER_CONTROL_HACKBENCH"));
+               printf("Running: %s\n", cmd);
+               system(cmd);
+       }
+
        close(completion_pipe[0]);
        close(completion_pipe[1]);
 
        histogram_fprint(&histogram, opt.f_hist);
-       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));
+       histogram_fprint(&histogram_gw, opt.f_hist_gw);
+       if (opt.f_hist)
+               fclose(opt.f_hist);
+       if (opt.f_hist_gw)
+               fclose(opt.f_hist_gw);
+       if (opt.f_msgs)
+               fclose(opt.f_msgs);
+
+       if (opt.f_stat) {
+               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);
-       if (stats.overrun && !opt.quiet)
-               printf("overrun=%d\n", stats.overrun);
-       fprintf(opt.f_stat, "enobufs=%d\n", stats.enobufs);
-       if (stats.enobufs && !opt.quiet)
-               printf("enobufs=%d\n", stats.enobufs);
-       fprintf(opt.f_stat, "lost=%d\n", stats.lost);
-       if (stats.lost && !opt.quiet)
-               printf("lost=%d\n", stats.lost);
-       fprintf(opt.f_stat, "timeouts=%d\n", stats.timeouts);
-       if (stats.timeouts && !opt.quiet)
-               printf("timeouts=%d\n", stats.timeouts);
-       fprintf(opt.f_stat, "invalid_frame=%d\n", stats.timeouts);
-       if (stats.timeouts && !opt.quiet)
-               printf("invalid_frame=%d\n", stats.timeouts);
-
-       fclose(opt.f_stat);
+               fprintf(opt.f_stat, "sent=%d\n", count);
+               fprintf(opt.f_stat, "overrun=%d\n", stats.overrun);
+               if (stats.overrun && !opt.quiet)
+                       printf("overrun=%d\n", stats.overrun);
+               fprintf(opt.f_stat, "enobufs=%d\n", stats.enobufs);
+               if (stats.enobufs && !opt.quiet)
+                       printf("enobufs=%d\n", stats.enobufs);
+               fprintf(opt.f_stat, "lost=%d\n", stats.lost);
+               if (stats.lost && !opt.quiet)
+                       printf("lost=%d\n", stats.lost);
+               fprintf(opt.f_stat, "timeouts=%d\n", stats.timeouts);
+               if (stats.timeouts && !opt.quiet)
+                       printf("timeouts=%d\n", stats.timeouts);
+               fprintf(opt.f_stat, "invalid_frame=%d\n", stats.timeouts);
+               if (stats.timeouts && !opt.quiet)
+                       printf("invalid_frame=%d\n", stats.timeouts);
+
+               fclose(opt.f_stat);
+       }
 
        return 0;
 }