unsigned overrun;
unsigned lost;
struct timespec tic, tac;
+ unsigned timeouts;
+ unsigned invalid_frame;
} stats;
int num_interfaces = 0;
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;
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;
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++;
}
struct timespec timeout;
struct sockaddr_can addr;
sigset_t set;
+ int consecutive_timeouts = 0;
MEMSET_ZERO(pfd);
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
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;
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);