#include <fcntl.h>
#include <math.h>
#include <net/if.h>
+#include <poll.h>
+#include <popt.h>
#include <pthread.h>
#include <semaphore.h>
+#include <sched.h>
#include <signal.h>
#include <stdbool.h>
#include <stdint.h>
#include <stdlib.h>
#include <string.h>
#include <sys/ioctl.h>
+#include <sys/mman.h>
+#include <sys/socket.h>
+#include <sys/stat.h>
#include <sys/time.h>
#include <sys/types.h>
-//#include <ul_list.h>
+#include <talloc.h>
#include <unistd.h>
-#include <sched.h>
-#include <sys/mman.h>
-#include <sys/socket.h>
+
#include <linux/can.h>
#include <linux/can/raw.h>
-#include <poll.h>
-#include <talloc.h>
-#include <popt.h>
#include "histogram.h"
unsigned timeout_ms;
unsigned count;
unsigned oneattime;
- char *file;
- char *histogram_fn;
+ FILE *file;
+ FILE *histogram;
};
struct options opt = {
int num_interfaces = 0;
int count = 0; /* Number of sent messages */
+int completion_pipe[2];
struct msg_info {
canid_t id;
tstamp->tv_sec, tstamp->tv_nsec/1000);
}
-void print_msg_info(struct msg_info *mi)
+void msg_info_print(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)
- printf("%s -> %s (%s) = %s (%s)\n",
- S(mi->ts_sent), S(mi->ts_rx_final_kern), S(mi->ts_rx_final),
+ fprintf(f, "%ld: %s -> %s (%s) = %s (%s)\n",
+ num, S(mi->ts_sent), S(mi->ts_rx_final_kern), S(mi->ts_rx_final),
DIFF(mi->ts_sent, mi->ts_rx_final_kern),
DIFF(mi->ts_sent, mi->ts_rx_final));
else
- printf("%s -> %s (%s) -> %s (%s) = %s (%s), %s (%s)\n",
- S(mi->ts_sent),
+ fprintf(f, "%ld: %s -> %s (%s) -> %s (%s) = %s (%s), %s (%s)\n",
+ num, S(mi->ts_sent),
S(mi->ts_rx_onwire_kern), S(mi->ts_rx_onwire),
S(mi->ts_rx_final_kern), S(mi->ts_rx_final),
DIFF(mi->ts_sent, mi->ts_rx_onwire_kern),
DIFF(mi->ts_rx_onwire_kern, mi->ts_rx_final_kern),
DIFF(mi->ts_rx_onwire, mi->ts_rx_final));
#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);
}
struct timespec ts_kern, ts_user, ts_diff;
struct can_frame frame;
struct msg_info *mi;
+ int ret;
+
receive(s, &frame, &ts_kern, &ts_user);
mi = frame2info(&frame);
mi->ts_rx_final_kern = ts_kern;
mi->ts_rx_final = ts_user;
- if (opt.histogram_fn)
+ if (opt.histogram)
histogram_add(&histogram, get_msg_latency_us(mi));
- if (0 && !opt.file)
- print_msg_info(mi);
- msg_info_free(mi);
+ ret = write(completion_pipe[1], &mi, sizeof(mi));
+ if (ret == -1)
+ error(1, errno, "completion_pipe write");
}
void *measure_thread(void *arg)
{ "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, &opt.file, 0, "File where to store results", "filename"},
- { "histogram", 'h', POPT_ARG_STRING, &opt.histogram_fn, 0, "Store histogram in file", "filename"},
+ { "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"},
POPT_AUTOHELP
{ NULL, 0, 0, NULL, 0 }
};
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)
pthread_t thread;
sigset_t set;
int ret;
- FILE *fhist;
parse_options(argc, argv);
signal(SIGINT, term_handler);
signal(SIGTERM, term_handler);
- if (opt.histogram_fn) {
- histogram_init(&histogram, 1000000, 1);
- fhist = fopen(opt.histogram_fn, "w");
- if (fhist == NULL)
- error(1, errno, "open %s", opt.histogram_fn);
+ if (opt.histogram) {
+ histogram_init(&histogram, 5000000, 1);
}
-
+ ret = pipe(completion_pipe);
+ if (ret == -1)
+ error(1, errno, "pipe");
+ ret = fcntl(completion_pipe[1], F_SETFL, O_NONBLOCK);
+ if (ret == -1)
+ error(1, errno, "pipe fcntl");
+
pthread_create(&thread, 0, measure_thread, NULL);
- while (!finish_flag && (opt.count == 0 || count < opt.count)) {
- if (1 || opt.file) {
+ struct timespec next, now, diff;
+ clock_gettime(CLOCK_MONOTONIC, &next);
+ int completed = 0;
+ while (!finish_flag && (opt.count == 0 || completed < opt.count)) {
+ struct pollfd pfd[1];
+ pfd[0].fd = completion_pipe[0];
+ pfd[0].events = POLLIN;
+ ret = poll(pfd, 1, 100);
+ if (ret == -1 && !INTERRUPTED_SYSCALL(errno))
+ error(1, errno, "poll main");
+ if (ret > 0 && (pfd[0].revents & POLLIN)) {
+ struct msg_info *mi;
+ int ret;
+ 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_free(mi);
+ completed++;
+ }
+
+ clock_gettime(CLOCK_MONOTONIC, &now);
+ if (timespec_subtract(&diff, &next, &now)) {
printf("\rMessage %d", count);
fflush(stdout);
+ next.tv_nsec += 100000000;
+ while (next.tv_nsec >= 1000000000) {
+ next.tv_nsec -= 1000000000;
+ next.tv_sec++;
+ }
}
- usleep(100000);
}
- if (1 || opt.file)
- printf("\rMessage %d\n", count);
+ printf("\rMessage %d\n", count);
pthread_join(thread, NULL);
- if (opt.histogram_fn) {
- histogram_fprint(&histogram, fhist);
- fclose(fhist);
+ 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);
return 0;
}
projects / can-benchmark.git / blobdiff