]> rtime.felk.cvut.cz Git - can-benchmark.git/blobdiff - latester/latester.c
Do not call poll with negative timeout
[can-benchmark.git] / latester / latester.c
index 6b5c7ed72006717b717148a1e062b7395d54b0c5..c980f247ac9841b3aa4755aa3966880c2550865e 100644 (file)
 #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 "histogram.h"
 
+//#define FTRACE
+
 #ifndef DEBUG
 #define dbg(level, fmt, arg...) do {} while (0)
 #else
 volatile sig_atomic_t finish_flag = 0; /* Threads should terminate. */
 sem_t finish_sem;              /* Thread signals a termination */
 
-#define MAX_INTERFACES 4
-
 /* Command line options */
-char *option_interface[MAX_INTERFACES];
+struct options {
+       char **interface;
+       canid_t id;
+       unsigned period_us;
+       unsigned timeout_ms;
+       unsigned count;
+       unsigned oneattime;
+       FILE *file;
+       FILE *histogram;
+       int length;
+       int userhist;
+};
+
+struct options opt = {
+       .id = 10,
+       .period_us = 0,
+       .timeout_ms = 1000,
+       .length = 2,
+};
+
+struct {
+       unsigned enobufs;
+       unsigned overrun;
+} stats;
+
 int num_interfaces = 0;
-canid_t option_id;
-unsigned option_period_us = 100000;
+int count = 0;                 /* Number of sent messages */
+int completion_pipe[2];
 
 struct msg_info {
        canid_t id;
@@ -60,47 +87,121 @@ struct msg_info {
        struct timespec ts_sent, ts_sent_kern;
        struct timespec ts_rx_onwire, ts_rx_onwire_kern;
        struct timespec ts_rx_final, ts_rx_final_kern;
+       struct can_frame sent, received;
 };
 
 #define MAX_INFOS 10000
 struct msg_info msg_infos[MAX_INFOS];
-uint16_t curr_msg = 0;
+
+struct histogram histogram;
+
+void sprint_canframe(char *buf , struct can_frame *cf, int sep) {
+       /* documentation see lib.h */
+
+       int i,offset;
+       int dlc = (cf->can_dlc > 8)? 8 : cf->can_dlc;
+
+       if (cf->can_id & CAN_ERR_FLAG) {
+               sprintf(buf, "%08X#", cf->can_id & (CAN_ERR_MASK|CAN_ERR_FLAG));
+               offset = 9;
+       } else if (cf->can_id & CAN_EFF_FLAG) {
+               sprintf(buf, "%08X#", cf->can_id & CAN_EFF_MASK);
+               offset = 9;
+       } else {
+               sprintf(buf, "%03X#", cf->can_id & CAN_SFF_MASK);
+               offset = 4;
+       }
+
+       if (cf->can_id & CAN_RTR_FLAG) /* there are no ERR frames with RTR */
+               sprintf(buf+offset, "R");
+       else
+               for (i = 0; i < dlc; i++) {
+                       sprintf(buf+offset, "%02X", cf->data[i]);
+                       offset += 2;
+                       if (sep && (i+1 < dlc))
+                               sprintf(buf+offset++, ".");
+               }
+}
 
 static inline struct msg_info *frame2info(struct can_frame *frame)
 {
        uint16_t idx;
-       if (frame->can_dlc == 2) {
+       if (frame->can_dlc >= 2) {
                memcpy(&idx, frame->data, sizeof(idx));
                if (idx >= MAX_INFOS)
                        error(1, 0, "%s idx too high", __FUNCTION__);
-       } else
+       } else {
+               
                error(1, 0, "%s error", __FUNCTION__);
+       }
        return &msg_infos[idx];
 }
 
-static inline char *tstamp_str(char *buf, struct timespec *tstamp)
+static inline char *tstamp_str(const void *ctx, struct timespec *tstamp)
+{
+       return talloc_asprintf(ctx, "%ld.%06ld",
+                              tstamp->tv_sec, tstamp->tv_nsec/1000);
+}
+
+void msg_info_print(FILE *f, struct msg_info *mi)
 {
-       sprintf(buf, "%ld.%06ld", tstamp->tv_sec, tstamp->tv_nsec/1000);
+       struct timespec diff;
+       void *local = talloc_new (NULL);
+       static long num = 0;
+       char sent[64], received[64];
+
+       sprint_canframe(sent, &mi->sent, true);
+       sprint_canframe(received, &mi->received, true);
+
+#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: %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",
+                       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,
+                       DIFF(mi->ts_sent, mi->ts_rx_onwire_kern),
+                       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));
+#undef S
+#undef DIFF
+       num++;
+       talloc_free (local);
 }
 
-void print_msg_info(struct msg_info *mi)
+int msg_info_store(FILE *f, struct msg_info *mi)
 {
-       struct timespec ts_diff1, ts_diff2;
-       char str_sent[32], str_kern[32], str_user[32], str_diff1[32], str_diff2[32];
-       timespec_subtract(&ts_diff1, &mi->ts_rx_final_kern, &mi->ts_sent);
-       timespec_subtract(&ts_diff2, &mi->ts_rx_final,      &mi->ts_sent);
-       tstamp_str(str_sent, &mi->ts_sent);
-       tstamp_str(str_kern, &mi->ts_rx_final_kern);
-       tstamp_str(str_user, &mi->ts_rx_final);
-       tstamp_str(str_diff1, &ts_diff1);
-       tstamp_str(str_diff2, &ts_diff2);
-       printf("%s -> %s (%s) = %s (%s)\n", str_sent, str_user, str_kern, str_diff1, str_diff2);
+       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.  */
-     
+
 int timespec_subtract (struct timespec *result, struct timespec *x, struct timespec *yy)
 {
        struct timespec ylocal = *yy, *y = &ylocal;
@@ -115,12 +216,12 @@ int timespec_subtract (struct timespec *result, struct timespec *x, struct times
                y->tv_nsec += 1000000000 * nsec;
                y->tv_sec -= nsec;
        }
-     
+
        /* Compute the time remaining to wait.
           `tv_nsec' is certainly positive. */
        result->tv_sec = x->tv_sec - y->tv_sec;
        result->tv_nsec = x->tv_nsec - y->tv_nsec;
-     
+
        /* Return 1 if result is negative. */
        return x->tv_sec < y->tv_sec;
 }
@@ -131,6 +232,22 @@ void dbg_print_timespec(char *msg, struct timespec *tv)
        printf("%s sec=%ld nsec=%ld\n", msg, tv->tv_sec, tv->tv_nsec);
 }
 
+static inline unsigned get_msg_latency_us(struct msg_info *mi)
+{
+       struct timespec diff;
+       if (num_interfaces == 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
+               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);
+       return diff.tv_sec * 1000000 + diff.tv_nsec/1000;
+}
+
 void set_sched_policy_and_prio(int policy, int rtprio)
 {
        struct sched_param scheduling_parameters;
@@ -156,10 +273,10 @@ static inline int sock_get_if_index(int s, const char *if_name)
 {
        struct ifreq ifr;
        MEMSET_ZERO(ifr);
-       
+
        strcpy(ifr.ifr_name, if_name);
        if (ioctl(s, SIOCGIFINDEX, &ifr) < 0)
-               error(1, errno, "SIOCGIFINDEX");
+               error(1, errno, "SIOCGIFINDEX '%s'", if_name);
        return ifr.ifr_ifindex;
 }
 
@@ -168,19 +285,104 @@ static inline get_tstamp(struct timespec *ts)
        clock_gettime(CLOCK_REALTIME, ts);
 }
 
+
+int trace_fd = -1;
+int marker_fd = -1;
+
+int init_ftrace()
+{
+#ifdef FTRACE
+       char *debugfs;
+       char path[256];
+       FILE *f;
+       
+       debugfs = "/sys/kernel/debug";
+       if (debugfs) {
+               strcpy(path, debugfs);
+               strcat(path,"/tracing/tracing_on");
+               trace_fd = open(path, O_WRONLY);
+               if (trace_fd >= 0)
+                       write(trace_fd, "1", 1);
+
+               strcpy(path, debugfs);
+               strcat(path,"/tracing/trace_marker");
+               marker_fd = open(path, O_WRONLY);
+
+               strcpy(path, debugfs);
+               strcat(path,"/tracing/set_ftrace_pid");
+               f = fopen(path, "w");
+               fprintf(f, "%d\n", getpid());
+               fclose(f);
+               system("echo function_graph > /sys/kernel/debug/tracing/current_tracer");
+               system("echo can_send > /sys/kernel/debug/tracing/set_graph_function");
+               system("echo > /sys/kernel/debug/tracing/trace");
+               system("echo 1 > /sys/kernel/debug/tracing/tracing_enabled");
+       }
+#endif /* FTRACE */
+}
+
+static inline void trace_on()
+{
+       if (trace_fd >= 0)
+               write(trace_fd, "1", 1);
+}
+
+static inline void trace_off(int ret)
+{
+       if (marker_fd >= 0) {
+               char marker[100];
+               sprintf(marker, "write returned %d\n", ret);
+               write(marker_fd, marker, strlen(marker));
+       }
+       if (trace_fd >= 0)
+               write(trace_fd, "0", 1);
+}
+
+void msg_info_free(struct msg_info *mi)
+{
+       mi->id = -1;
+}
+
 int send_frame(int socket)
 {
        struct can_frame frame;
        struct msg_info *mi;
        int ret;
+       static int curr_msg = -1;
+       int i;
+       uint16_t idx;
 
-       frame.can_id = option_id;
-       frame.can_dlc = 2;
-       memcpy(frame.data, &curr_msg, sizeof(curr_msg));
+       MEMSET_ZERO(frame);
+       i = curr_msg+1;
+       while (msg_infos[i].id != -1 && i != curr_msg) {
+               i++;
+               if (i >= MAX_INFOS)
+                       i = 0;
+       }
+       if (i == curr_msg)
+               error(1, 0, "Msg info table is full! Probably, many packets were lost.");
+       else
+               curr_msg = i;
+
+       frame.can_id = opt.id;
+       if (opt.length < 2)
+               error(1, 0, "Length < 2 is not yet supported");
+       frame.can_dlc = opt.length;
+       idx = curr_msg;
+       memcpy(frame.data, &idx, sizeof(idx));
        mi = frame2info(&frame);
 
+       mi->id = frame.can_id;
+       mi->length = frame.can_dlc;
        get_tstamp(&mi->ts_sent);
+       mi->sent = frame;
+       
+       trace_on();
        ret = write(socket, &frame, sizeof(frame));
+       trace_off(ret);
+
+       if (ret == -1)
+               msg_info_free(mi);
        return ret;
 }
 
@@ -190,16 +392,25 @@ static inline void get_next_timeout(struct timespec *timeout)
        static struct timespec last = {-1, 0 };
 
        clock_gettime(CLOCK_MONOTONIC, &now);
-       
+
        if (last.tv_sec == -1)
                last = now;
-       last.tv_sec += option_period_us/1000000;
-       last.tv_nsec += (option_period_us%1000000)*1000;
-       while (last.tv_nsec >= 1000000000) {
-               last.tv_nsec -= 1000000000;
-               last.tv_sec++;
-       }               
-       timespec_subtract(timeout, &last, &now);
+       if (opt.period_us != 0) {
+               last.tv_sec += opt.period_us/1000000;
+               last.tv_nsec += (opt.period_us%1000000)*1000;
+               while (last.tv_nsec >= 1000000000) {
+                       last.tv_nsec -= 1000000000;
+                       last.tv_sec++;
+               }
+               if (timespec_subtract(timeout, &last, &now) /* is negative */) {
+                       stats.overrun++;
+                       memset(timeout, 0, sizeof(*timeout));
+               }
+       } else if (opt.timeout_ms != 0) {
+               timeout->tv_sec = opt.timeout_ms/1000;
+               timeout->tv_nsec = (opt.timeout_ms%1000)*1000000;
+       } else
+               error(1, 0, "Timeout and period cannot be both zero");
 }
 
 void receive(int s, struct can_frame *frame, struct timespec *ts_kern, struct timespec *ts_user)
@@ -221,7 +432,7 @@ void receive(int s, struct can_frame *frame, struct timespec *ts_kern, struct ti
        /* these settings may be modified by recvmsg() */
        iov.iov_len = sizeof(*frame);
        msg.msg_namelen = sizeof(addr);
-       msg.msg_controllen = sizeof(ctrlmsg);  
+       msg.msg_controllen = sizeof(ctrlmsg);
        msg.msg_flags = 0;
 
        nbytes = recvmsg(s, &msg, 0);
@@ -251,7 +462,13 @@ void process_tx(int s)
 
 void process_on_wire_rx(int s)
 {
-       error(1, 0, "%s: not implemented", __FUNCTION__);
+       struct timespec ts_kern, ts_user, ts_diff;
+       struct can_frame frame;
+       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;
 }
 
 
@@ -260,30 +477,39 @@ void process_final_rx(int s)
        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;
+       mi->received = frame;
 
-       print_msg_info(mi);
+       if (opt.histogram)
+               histogram_add(&histogram, get_msg_latency_us(mi));
+
+       ret = write(completion_pipe[1], &mi, sizeof(mi));
+       if (ret == -1)
+               error(1, errno, "completion_pipe write");
 }
 
 void *measure_thread(void *arg)
 {
        int s, i, ret;
-       struct pollfd pfd[MAX_INTERFACES];
+       struct pollfd pfd[3];
        struct timespec timeout;
        struct sockaddr_can addr;
        sigset_t set;
+       unsigned msg_in_progress = 0;
 
        MEMSET_ZERO(pfd);
-       
+
        for (i=0; i<num_interfaces; i++) {
                if ((s = socket(PF_CAN, SOCK_RAW, CAN_RAW)) < 0)
                        error(1, errno, "socket");
 
                addr.can_family = AF_CAN;
-               addr.can_ifindex = sock_get_if_index(s, option_interface[i]);
+               addr.can_ifindex = sock_get_if_index(s, opt.interface[i]);
 
                if (i == 0) {   /* TX socket */
                        /* disable default receive filter on this RAW socket */
@@ -302,42 +528,86 @@ void *measure_thread(void *arg)
                               &timestamp_on, sizeof(timestamp_on)) < 0)
                        error(1, errno, "setsockopt SO_TIMESTAMP");
 
-//             const int dropmonitor_on = 1;
-//             if (setsockopt(s, SOL_SOCKET, SO_RXQ_OVFL,
-//                            &dropmonitor_on, sizeof(dropmonitor_on)) < 0)
-//                     error(1, errno, "setsockopt SO_RXQ_OVFL not supported by your Linux Kernel");
+               const int dropmonitor_on = 1;
+               if (setsockopt(s, SOL_SOCKET, SO_RXQ_OVFL,
+                              &dropmonitor_on, sizeof(dropmonitor_on)) < 0)
+                       error(1, errno, "setsockopt SO_RXQ_OVFL not supported by your Linux Kernel");
 
                pfd[i].fd = s;
-               pfd[i].events = (i == 0) ? POLLERR : POLLIN;
+               if (i == 0)
+                       pfd[i].events = POLLIN | POLLERR | ((opt.period_us == 0 && !opt.oneattime) ? POLLOUT : 0);
+               else
+                       pfd[i].events = POLLIN;
+       }
+
+       set_sched_policy_and_prio(SCHED_FIFO, 40);
+
+#define SEND()                                                         \
+       do {                                                            \
+               ret = send_frame(pfd[0].fd);                            \
+               if (ret != sizeof(struct can_frame)) {                  \
+                       if (ret == -1 && errno == ENOBUFS && opt.period_us == 0 && !opt.oneattime) { \
+                               stats.enobufs++;                        \
+                               /* Ignore this error - pfifo_fast qeuue is full */ \
+                       } else                                          \
+                               error(1, errno, "send_frame (line %d)", __LINE__); \
+               }                                                       \
+               else {                                                  \
+                       count++;                                        \
+                       msg_in_progress++;                              \
+               }                                                       \
+       } while (0)
+
+       if (opt.oneattime) {
+               SEND();
+               count = 1;
        }
 
-       set_sched_policy_and_prio(SCHED_FIFO, 99);
+       while (!finish_flag &&
+              (opt.count == 0 || count < opt.count || msg_in_progress != 0)) {
 
-       while (!finish_flag) {
                get_next_timeout(&timeout);
+               //printf("ppoll"); fflush(stdout);
                ret = ppoll(pfd, num_interfaces, &timeout, NULL);
+               //printf("=%d\n", ret);
                switch (ret) {
-               case -1:
+               case -1: // Error
                        if (!INTERRUPTED_SYSCALL(errno))
                                error(1, errno, "ppoll");
                        break;
-               case 0:
-                       ret = send_frame(pfd[0].fd);
-                       if (ret != sizeof(struct can_frame))
-                               error(1, errno, "send_frame");
+               case 0: // Timeout
+                       if (opt.period_us) {
+                               if (opt.count == 0 || count < opt.count) {
+                                       SEND();
+                               }
+                       } else {
+                               error(1, 0, "poll timeout");
+                       }
                        break;
-               default:
-                       if (pfd[0].revents != 0) {
+               default: // Event
+                       if (pfd[0].revents & (POLLIN|POLLERR)) {
                                process_tx(pfd[0].fd);
                        }
-                       if (pfd[1].revents != 0) {
-                               switch (num_interfaces) {
-                               case 2: process_final_rx(pfd[1].fd); break;
-                               case 3: process_on_wire_rx(pfd[1].fd); break;
-                               }
+                       if (pfd[0].revents & POLLOUT) {
+                               if (opt.count == 0 || count < opt.count)
+                                       SEND();
                        }
-                       if (pfd[2].revents != 0) {
-                               process_final_rx(pfd[2].fd);
+                       pfd[0].revents = 0;
+
+                       if (num_interfaces == 3 && pfd[1].revents != 0) {
+                               process_on_wire_rx(pfd[1].fd);
+                               pfd[1].revents = 0;
+                       }
+
+                       i = (num_interfaces == 2) ? 1 : 2;
+                       if (pfd[i].revents != 0) {
+                               process_final_rx(pfd[i].fd);
+                               msg_in_progress--;
+                               pfd[i].revents = 0;
+                               if ((opt.count == 0 || count < opt.count) &&
+                                   opt.oneattime) {
+                                       SEND();
+                               }
                        }
                }
        }
@@ -348,52 +618,71 @@ void *measure_thread(void *arg)
        return NULL;
 }
 
-void print_help(void)
-{
-       printf("Usage: latester -d <interface> -d <interface> ... [other options]\n"
-              "Other options:\n"
-              "  -d <interface> Interface to use. Must be given two times (tx, rx) or three times (tx, rx1, rx2).\n"
-               );
-}
-     
-int parse_options(int argc, char *argv[])
+struct poptOption optionsTable[] = {
+       { "device", 'd', POPT_ARG_ARGV, &opt.interface, 'd', "Interface to use. Must be given two times (tx, rx) or three times (tx, rx1, rx2)", "interface" },
+       { "count",  'c', POPT_ARG_INT|POPT_ARGFLAG_SHOW_DEFAULT,  &opt.count,   0,   "The count of messages to send, zero corresponds to infinity", "num"},
+       { "id",     'i', POPT_ARG_INT|POPT_ARGFLAG_SHOW_DEFAULT,  &opt.id,      0,   "CAN ID of sent messages", "id"},
+       { "period", 'p', POPT_ARG_INT|POPT_ARGFLAG_SHOW_DEFAULT,  &opt.period_us, 0, "Period for sending messages or zero (default) to send as fast as possible", "us"},
+       { "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"},
+       { "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"},
+       POPT_AUTOHELP
+       { NULL, 0, 0, NULL, 0 }
+};
+
+int parse_options(int argc, const char *argv[])
 {
        int c;
-       
-       opterr = 0;
-       while ((c = getopt (argc, argv, "d:h")) != -1)
-               switch (c)
-               {
+       poptContext optCon;   /* context for parsing command-line options */
+
+       optCon = poptGetContext(NULL, argc, argv, optionsTable, 0);
+       //poptSetOtherOptionHelp(optCon, "[OPTIONS]* <port>");
+
+       /* Now do options processing */
+       while ((c = poptGetNextOpt(optCon)) >= 0) {
+               switch (c) {
                case 'd':
-                       if (num_interfaces < MAX_INTERFACES) {
-                               option_interface[num_interfaces] = optarg;
-                               num_interfaces++;
-                       } else
-                               error(1, 0, "error: Too many -d options");
+                       num_interfaces++;
+                       break;
+               case 'f':
+                       opt.file = fopen(poptGetOptArg(optCon), "w");
+                       if (!opt.file)
+                               error(1, errno, "fopen: %s", poptGetOptArg(optCon));
                        break;
                case 'h':
-                       print_help();
-                       exit(0);
+                       opt.histogram = fopen(poptGetOptArg(optCon), "w");
+                       if (!opt.histogram)
+                               error(1, errno, "fopen: %s", poptGetOptArg(optCon));
                        break;
-               case '?':
-                       if (isprint (optopt))
-                               error (1, 0, "Unknown option `-%c'.\n", optopt);
-                       else
-                               error (1, 0, "Unknown option character `\\x%x'.\n", optopt);
-               default:
-                       error(1, 0, "Unhandled parameter");
                }
+       }
+       if (c < -1)
+               error(1, 0, "%s: %s\n",
+                     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 (opt.oneattime && opt.period_us)
+               error(1, 0, "oneattime and period cannot be specified at the same time");
+
+       poptFreeContext(optCon);
+
        return 0;
 }
 
-int main(int argc, char *argv[])
+
+int main(int argc, const char *argv[])
 {
        pthread_t thread;
        sigset_t set;
-       int ret;
-                          
+       int ret, i;
+
        parse_options(argc, argv);
 
        mlockall(MCL_CURRENT | MCL_FUTURE);
@@ -401,14 +690,75 @@ int main(int argc, 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);
+       }
 
+       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");
+
+       init_ftrace();
+       
        pthread_create(&thread, 0, measure_thread, NULL);
 
-       while (!finish_flag) {
-               sleep(1);
+       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++;
+                       }
+               }
        }
+       printf("\rMessage %d\n", count);
 
        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);
+
+       if (stats.overrun)
+               printf("overrun=%d\n", stats.overrun);
+       if (stats.enobufs)
+               printf("enobufs=%d\n", stats.enobufs);
+
        return 0;
 }