X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/6e134e189cfd6e6340beff2b8298f72366934663..4d282cd02b4632590d95a6d3213fa0e04383b2dc:/latester/latester.c

diff --git a/latester/latester.c b/latester/latester.c
index c5090f9..cb578a1 100644
--- a/latester/latester.c
+++ b/latester/latester.c
@@ -149,12 +149,12 @@ void msg_info_print(FILE *f, struct msg_info *mi)
 #define DIFF(a, b) (timespec_subtract(&diff, &b, &a), S(diff))
 
 	if (num_interfaces == 2)
-		fprintf(f, "%ld: %s [%s] -> %s (%s) [%s] = %s (%s)\n",
+		fprintf(f, "%ld: %s %s -> %s (%s) %s = %s (%s)\n",
 			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));
 	else
-		fprintf(f, "%ld: %s [%s] -> %s (%s) -> %s (%s) [%s] = %s (%s), %s (%s)\n",
+		fprintf(f, "%ld: %s %s -> %s (%s) -> %s (%s) %s = %s (%s), %s (%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,
@@ -282,7 +282,7 @@ int send_frame(int socket)
 
 	MEMSET_ZERO(frame);
 	i = curr_msg+1;
-	while (msg_infos[i].id != 0 && i != curr_msg) {
+	while (msg_infos[i].id != -1 && i != curr_msg) {
 		i++;
 		if (i >= MAX_INFOS)
 			i = 0;
@@ -310,7 +310,7 @@ int send_frame(int socket)
 
 void msg_info_free(struct msg_info *mi)
 {
-	mi->id = 0;
+	mi->id = -1;
 }
 
 static inline void get_next_timeout(struct timespec *timeout)
@@ -597,7 +597,7 @@ int main(int argc, const char *argv[])
 {
 	pthread_t thread;
 	sigset_t set;
-	int ret;
+	int ret, i;
 
 	parse_options(argc, argv);
 
@@ -606,6 +606,9 @@ int main(int argc, const char *argv[])
 	signal(SIGINT, term_handler);
 	signal(SIGTERM, term_handler);
 
+	for (i=0; i<MAX_INFOS; i++)
+		msg_infos[i].id = -1;
+
 	if (opt.histogram) {
 		histogram_init(&histogram, 5000000, 1);
 	}