Merge branch 'master' of rtime.felk.cvut.cz:/can-benchmark

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

diff --git a/latester/latester.c b/latester/latester.c
index 24015f1a0097925e760ed848949f8baf87cdb799..b7bb38b49bea7489d0bbe3a08d060155dc6e98d0 100644 (file)
--- a/latester/latester.c
+++ b/latester/latester.c
@@ -82,6 +82,8 @@ struct {
        unsigned overrun;
        unsigned lost;
        struct timespec tic, tac;
+       unsigned timeouts;
+       unsigned invalid_frame;
 } stats;
 
 int num_interfaces = 0;
@@ -188,33 +190,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.  */
 
@@ -252,13 +227,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
@@ -360,11 +335,16 @@ static inline void trace_off(int ret)
                write(trace_fd, "0", 1);
 }
 
-void msg_info_free(struct msg_info *mi)
+static inline void msg_info_free(struct msg_info *mi)
 {
        mi->id = -1;
 }
 
+static inline bool msg_info_used(struct msg_info *mi)
+{
+       return mi->id != -1;
+}
+
 int send_frame(int socket)
 {
        struct can_frame frame;
@@ -376,7 +356,7 @@ int send_frame(int socket)
 
        MEMSET_ZERO(frame);
        i = curr_msg+1;
-       while (msg_infos[i].id != -1 && i != curr_msg) {
+       while (msg_info_used(&msg_infos[i]) && i != curr_msg) {
                i++;
                if (i >= MAX_INFOS)
                        i = 0;
@@ -505,8 +485,11 @@ void process_on_wire_rx(int s)
        struct msg_info *mi;
        receive(s, &frame, &ts_kern, &ts_user);
        mi = frame2info(&frame);
-       mi->ts_rx_onwire_kern = ts_kern;
-       mi->ts_rx_onwire = ts_user;
+       if (msg_info_used(mi)) {
+               mi->ts_rx_onwire_kern = ts_kern;
+               mi->ts_rx_onwire = ts_user;
+       } else
+               stats.invalid_frame++;
 }
 
 
@@ -537,6 +520,7 @@ void *measure_thread(void *arg)
        struct timespec timeout;
        struct sockaddr_can addr;
        sigset_t set;
+       int consecutive_timeouts = 0;
 
        MEMSET_ZERO(pfd);
 
@@ -603,7 +587,13 @@ void *measure_thread(void *arg)
                                        SEND();
                                }
                        } else {
-                               error(1, 0, "poll timeout");
+                               /* Lost message - send a new one */
+                               stats.timeouts++;
+                               consecutive_timeouts++;
+                               if (consecutive_timeouts < 10)
+                                       SEND();
+                               else /* Something is really broken */
+                                       finish_flag = 1;
                        }
                        break;
                default: // Event
@@ -623,6 +613,7 @@ void *measure_thread(void *arg)
 
                        i = (num_interfaces == 2) ? 1 : 2;
                        if (pfd[i].revents != 0) {
+                               consecutive_timeouts = 0;
                                process_final_rx(pfd[i].fd);
                                msg_in_progress--;
                                pfd[i].revents = 0;
@@ -824,6 +815,12 @@ int main(int argc, const char *argv[])
        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);