X-Git-Url: http://rtime.felk.cvut.cz/gitweb/can-benchmark.git/blobdiff_plain/27c8ce5c4cd6ef751eb4c0914805aef74ce50f68..309795bbe136ef61daeffe54f677326bcff31941:/latester/latester.c

diff --git a/latester/latester.c b/latester/latester.c
index a72558a..a6873b9 100644
--- a/latester/latester.c
+++ b/latester/latester.c
@@ -59,10 +59,15 @@ struct options {
 	unsigned timeout_ms;
 	unsigned count;
 	unsigned oneattime;
-	FILE *file;
-	FILE *histogram;
+	char *name;
 	int length;
 	int userhist;
+	int quiet;
+
+	/* Temporary variables */
+	FILE *f_msgs;
+	FILE *f_hist;
+	FILE *f_stat;
 };
 
 struct options opt = {
@@ -75,6 +80,8 @@ struct options opt = {
 struct {
 	unsigned enobufs;
 	unsigned overrun;
+	unsigned lost;
+	struct timespec tic, tac;
 } stats;
 
 int num_interfaces = 0;
@@ -157,12 +164,14 @@ void msg_info_print(FILE *f, struct msg_info *mi)
 #define S(ts) tstamp_str(local, &ts)
 #define DIFF(a, b) (timespec_subtract(&diff, &b, &a), S(diff))
 
-	if (num_interfaces == 2)
+	switch (num_interfaces) {
+	case 2:
 		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
+		break;
+	case 3:
 		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),
@@ -171,35 +180,14 @@ 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));
+		break;
+	}
 #undef S
 #undef DIFF
 	num++;
 	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))
-
-	if (num_interfaces == 2)
-		fprintf(f, "%ld %d %d %s\n",
-			num, mi->id, mi->length,
-			DIFF(mi->ts_sent, mi->ts_rx_final_kern));
-	else
-		fprintf(f, "%ld %d %d %s\n",
-			num, mi->id, mi->length,
-			DIFF(mi->ts_rx_onwire_kern, mi->ts_rx_final_kern));
-#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.  */
 
@@ -236,16 +224,22 @@ void dbg_print_timespec(char *msg, struct timespec *tv)
 static inline unsigned get_msg_latency_us(struct msg_info *mi)
 {
 	struct timespec diff;
-	if (num_interfaces == 3)
+	switch (num_interfaces) {
+	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);
-	else
+		break;
+	case 2:
 		if (opt.userhist)
 			timespec_subtract(&diff, &mi->ts_rx_final, &mi->ts_sent);
 		else
 			timespec_subtract(&diff, &mi->ts_rx_final_kern, &mi->ts_sent);
+		break;
+	default:
+		return 0;
+	}
 	return diff.tv_sec * 1000000 + diff.tv_nsec/1000;
 }
 
@@ -382,7 +376,7 @@ int send_frame(int socket)
 	ret = write(socket, &frame, sizeof(frame));
 	trace_off(ret);
 
-	if (ret == -1)
+	if (ret == -1 || num_interfaces == 1)
 		msg_info_free(mi);
 	return ret;
 }
@@ -502,8 +496,7 @@ void process_final_rx(int s)
 	mi->ts_rx_final = ts_user;
 	mi->received = frame;
 
-	if (opt.histogram)
-		histogram_add(&histogram, get_msg_latency_us(mi));
+	histogram_add(&histogram, get_msg_latency_us(mi));
 
 	ret = write(completion_pipe[1], &mi, sizeof(mi));
 	if (ret == -1)
@@ -563,6 +556,8 @@ void *measure_thread(void *arg)
 	if (opt.oneattime)
 		SEND();
 
+	get_tstamp(&stats.tic);
+
 	while (!finish_flag &&
 	       (opt.count == 0 || count < opt.count || msg_in_progress != 0)) {
 
@@ -612,6 +607,8 @@ void *measure_thread(void *arg)
 		}
 	}
 
+	get_tstamp(&stats.tac);
+
 	for (i=0; i<num_interfaces; i++)
 		close(pfd[i].fd);
 
@@ -626,10 +623,10 @@ struct poptOption optionsTable[] = {
 	{ "timeout",'t', POPT_ARG_INT|POPT_ARGFLAG_SHOW_DEFAULT,  &opt.timeout_ms,0, "Timeout when period is zero", "ms"},
 	{ "oneattime",'o', POPT_ARG_NONE,			  &opt.oneattime,0,  "Send the next message only when the previous was finally received"},
 	{ "verbose",'v', POPT_ARG_NONE,			  	  NULL, 'v',   	     "Send the next message only when the previous was finally received"},
-	{ "file",   'f', POPT_ARG_STRING, 			  NULL, 'f',   	     "File where to store results", "filename"},
-	{ "histogram", 'h', POPT_ARG_STRING, 			  NULL, 'h',   	     "Store histogram in file", "filename"},
+	{ "name",   'n', POPT_ARG_STRING,			  &opt.name, 0,	     "Prefix of the generated files"},
 	{ "length", 'l', POPT_ARG_INT|POPT_ARGFLAG_SHOW_DEFAULT,  &opt.length, 0,    "The length of generated messages", "bytes"},
 	{ "userhist", 'u', POPT_ARG_NONE,  			  &opt.userhist, 0,  "Generate histogram from userspace timestamps"},
+	{ "quiet",  'q', POPT_ARG_NONE,  			  &opt.quiet, 0,     "Do not print progress and statistics"},
 	POPT_AUTOHELP
 	{ NULL, 0, 0, NULL, 0 }
 };
@@ -638,6 +635,7 @@ int parse_options(int argc, const char *argv[])
 {
 	int c;
 	poptContext optCon;   /* context for parsing command-line options */
+	void *local = talloc_new (NULL);
 
 	optCon = poptGetContext(NULL, argc, argv, optionsTable, 0);
 	//poptSetOtherOptionHelp(optCon, "[OPTIONS]* <port>");
@@ -648,16 +646,6 @@ int parse_options(int argc, const char *argv[])
 		case 'd':
 			num_interfaces++;
 			break;
-		case 'f':
-			opt.file = fopen(poptGetOptArg(optCon), "w");
-			if (!opt.file)
-				error(1, errno, "fopen: %s", poptGetOptArg(optCon));
-			break;
-		case 'h':
-			opt.histogram = fopen(poptGetOptArg(optCon), "w");
-			if (!opt.histogram)
-				error(1, errno, "fopen: %s", poptGetOptArg(optCon));
-			break;
 		}
 	}
 	if (c < -1)
@@ -665,21 +653,47 @@ int parse_options(int argc, const char *argv[])
 		      poptBadOption(optCon, POPT_BADOPTION_NOALIAS),
 		      poptStrerror(c));
 
-	if (num_interfaces < 2 || num_interfaces > 3)
-		error(1, 0, "-d option must be given exactly 2 or 3 times");
+	if (num_interfaces < 1 || num_interfaces > 3)
+		error(1, 0, "-d option must only be given one, two or three times");
 
 	if (opt.oneattime && opt.period_us)
 		error(1, 0, "oneattime and period cannot be specified at the same time");
 
-	poptFreeContext(optCon);
+	if (opt.name) {
+		char *f = talloc_asprintf(local, "%s-msgs.txt", opt.name);
+		opt.f_msgs = fopen(f, "w");
+		if (!opt.f_msgs)
+			error(1, errno, "fopen: %s", f);
+	}
+
+	if (opt.name) {
+		char *f = talloc_asprintf(local, "%s-hist.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-stat.txt", opt.name);
+		opt.f_stat = fopen(f, "w");
+		if (!opt.f_stat)
+			error(1, errno, "fopen: %s", f);
+	}
 
+	poptFreeContext(optCon);
+	talloc_free(local);
 	return 0;
 }
 
 void print_progress()
 {
-	printf("\rSent %5d, in progress %5d", count, msg_in_progress);
-	fflush(stdout);
+	if (! opt.quiet) {
+		if (num_interfaces > 1)
+			printf("\rSent %5d, in progress %5d", count, msg_in_progress);
+		else
+			printf("\rSent %5d", count);
+		fflush(stdout);
+	}
 }
 
 int main(int argc, const char *argv[])
@@ -698,9 +712,7 @@ int main(int argc, const char *argv[])
 	for (i=0; i<MAX_INFOS; i++)
 		msg_infos[i].id = -1;
 
-	if (opt.histogram) {
-		histogram_init(&histogram, 5000000, 1);
-	}
+	histogram_init(&histogram, 5000000, 1);
 
 	ret = pipe(completion_pipe);
 	if (ret == -1)
@@ -713,7 +725,7 @@ int main(int argc, const char *argv[])
 
 	pthread_create(&thread, 0, measure_thread, NULL);
 
-	struct timespec next, now, diff;
+	struct timespec next, now, diff, allsent = {0,0};
 	clock_gettime(CLOCK_MONOTONIC, &next);
 	int completed = 0;
 	while (!finish_flag && (opt.count == 0 || completed < opt.count)) {
@@ -729,8 +741,7 @@ int main(int argc, const char *argv[])
 			ret = read(completion_pipe[0], &mi, sizeof(mi));
 			if (ret < sizeof(mi))
 				error(1, errno, "read completion returned %d", ret);
-			if (opt.file)
-				msg_info_print(opt.file, mi);
+			msg_info_print(opt.f_msgs, mi);
 			msg_info_free(mi);
 			completed++;
 		}
@@ -744,26 +755,50 @@ int main(int argc, const char *argv[])
 				next.tv_sec++;
 			}
 		}
+		if (opt.count != 0 && count >= opt.count) {
+			if (allsent.tv_sec == 0)
+				allsent = now;
+			timespec_subtract(&diff, &now, &allsent);
+			if (diff.tv_sec >= 1)
+				finish_flag = 1;
+		}
 	}
 	print_progress();
-	printf("\n");
+	if (!opt.quiet)
+		printf("\n");
+
+	stats.lost = msg_in_progress;
 
 	pthread_join(thread, NULL);
 
 	close(completion_pipe[0]);
 	close(completion_pipe[1]);
 
-	if (opt.histogram) {
-		histogram_fprint(&histogram, opt.histogram);
-		fclose(opt.histogram);
-	}
-	if (opt.file)
-		fclose(opt.file);
+	histogram_fprint(&histogram, opt.f_hist);
+	fclose(opt.f_hist);
+	fclose(opt.f_msgs);
+
 
-	if (stats.overrun)
+	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);
-	if (stats.enobufs)
+	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);
+
+	fclose(opt.f_stat);
 
 	return 0;
 }