latester: Detect more errors

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

diff --git a/latester/latester.c b/latester/latester.c
index a6873b938b50ffccdb64fceffb882c10db423f12..e4185b2e9047251d9aa76bbf684cdb19febd58ed 100644 (file)
--- a/latester/latester.c
+++ b/latester/latester.c
@@ -82,6 +82,7 @@ struct {
        unsigned overrun;
        unsigned lost;
        struct timespec tic, tac;
+       unsigned timeouts;
 } stats;
 
 int num_interfaces = 0;
@@ -131,7 +132,7 @@ void sprint_canframe(char *buf , struct can_frame *cf, int sep) {
                }
 }
 
-static inline struct msg_info *frame2info(struct can_frame *frame)
+static inline uint16_t frame_index(struct can_frame *frame)
 {
        uint16_t idx;
        if (frame->can_dlc >= 2) {
@@ -142,7 +143,12 @@ static inline struct msg_info *frame2info(struct can_frame *frame)
 
                error(1, 0, "%s error", __FUNCTION__);
        }
-       return &msg_infos[idx];
+       return idx;
+}
+
+static inline struct msg_info *frame2info(struct can_frame *frame)
+{
+       return &msg_infos[frame_index(frame)];
 }
 
 static inline char *tstamp_str(const void *ctx, struct timespec *tstamp)
@@ -510,6 +516,7 @@ void *measure_thread(void *arg)
        struct timespec timeout;
        struct sockaddr_can addr;
        sigset_t set;
+       int consecutive_timeouts = 0;
 
        MEMSET_ZERO(pfd);
 
@@ -576,7 +583,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
@@ -589,13 +602,16 @@ void *measure_thread(void *arg)
                        }
                        pfd[0].revents = 0;
 
-                       if (num_interfaces == 3 && pfd[1].revents != 0) {
+                       if (num_interfaces == 3 && pfd[1].revents & POLLIN) {
                                process_on_wire_rx(pfd[1].fd);
                                pfd[1].revents = 0;
                        }
+                       if (num_interfaces == 3 && pfd[1].revents & ~POLLIN)
+                               error(1, 0, "Unexpected pfd[1].revents: 0x%04x\n", pfd[1].revents);
 
                        i = (num_interfaces == 2) ? 1 : 2;
-                       if (pfd[i].revents != 0) {
+                       if (pfd[i].revents & POLLIN) {
+                               consecutive_timeouts = 0;
                                process_final_rx(pfd[i].fd);
                                msg_in_progress--;
                                pfd[i].revents = 0;
@@ -604,6 +620,8 @@ void *measure_thread(void *arg)
                                        SEND();
                                }
                        }
+                       if (pfd[i].revents & ~POLLIN)
+                               error(1, 0, "Unexpected pfd[%d].revents: 0x%04x\n", pfd[i].revents);
                }
        }
 
@@ -797,6 +815,9 @@ 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);
 
        fclose(opt.f_stat);