/* License: GPLv2 */
/*******************************************************************************/
+#define _GNU_SOURCE
#include <ctype.h>
#include <errno.h>
#include <error.h>
tstamp->tv_sec, tstamp->tv_nsec/1000);
}
+int timespec_subtract (struct timespec *result, struct timespec *x, struct timespec *yy);
+
void msg_info_print(FILE *f, struct msg_info *mi)
{
- struct timespec diff;
+ struct timespec diff, routing_delay, tx_time;
void *local = talloc_new (NULL);
static long num = 0;
char sent[64], received[64];
mi->tx_time_us);
break;
case 3:
- fprintf(f, "%ld: %s %s -> %s (%s) -> %s (%s) %s = %s (%s), %s (%s) %d\n",
+ tx_time.tv_sec = 0;
+ tx_time.tv_nsec = mi->tx_time_us*1000;
+ timespec_subtract(&routing_delay, &mi->ts_rx_final_kern, &mi->ts_rx_onwire_kern);
+ timespec_subtract(&routing_delay, &routing_delay, &tx_time);
+
+ fprintf(f, "%ld: %s %s -> %s (%s) -> %s (%s) %s = %s (%s), %s (%s) %d %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),
DIFF(mi->ts_rx_onwire_kern, mi->ts_rx_final_kern),
DIFF(mi->ts_rx_onwire, mi->ts_rx_final),
- mi->tx_time_us);
+ mi->tx_time_us,
+ S(routing_delay));
break;
}
#undef S
return ifr.ifr_ifindex;
}
-static inline get_tstamp(struct timespec *ts)
+static inline void get_tstamp(struct timespec *ts)
{
clock_gettime(CLOCK_REALTIME, ts);
}
int trace_fd = -1;
int marker_fd = -1;
-int init_ftrace()
+void init_ftrace()
{
#ifdef FTRACE
char *debugfs;
return ret;
}
-static inline send_and_check(int s)
+static inline void send_and_check(int s)
{
int ret;
ret = send_frame(s);
}
}
-static inline void get_next_timeout(struct timespec *timeout)
+static inline void get_next_timeout(struct timespec *timeout, bool advance)
{
struct timespec now;
static struct timespec last = {-1, 0 };
clock_gettime(CLOCK_MONOTONIC, &now);
- if (last.tv_sec == -1)
+ if (last.tv_sec == -1) {
last = now;
+ last.tv_nsec = last.tv_nsec/1000000*1000000;
+ }
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 (advance) {
+ 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));
}
+/* printf("next %ld.%06ld now %ld.%06ld --> timeout %ld.%06ld\n", */
+/* last.tv_sec, last.tv_nsec/1000, */
+/* now.tv_sec, now.tv_nsec/1000, */
+/* timeout->tv_sec, timeout->tv_nsec/1000); */
} else if (opt.timeout_ms != 0) {
timeout->tv_sec = opt.timeout_ms/1000;
timeout->tv_nsec = (opt.timeout_ms%1000)*1000000;
cmsg && (cmsg->cmsg_level == SOL_SOCKET);
cmsg = CMSG_NXTHDR(&msg,cmsg)) {
if (cmsg->cmsg_type == SO_TIMESTAMPNS)
- *ts_kern = *(struct timespec *)CMSG_DATA(cmsg);
- else if (cmsg->cmsg_type == SO_RXQ_OVFL)
- dropcnt += *(__u32 *)CMSG_DATA(cmsg);
+ memcpy(ts_kern, CMSG_DATA(cmsg), sizeof(struct timespec));
+ else if (cmsg->cmsg_type == SO_RXQ_OVFL) {
+ uint32_t ovfl;
+ memcpy(&ovfl, CMSG_DATA(cmsg), sizeof(ovfl));
+ dropcnt += ovfl;
+ }
}
}
void process_on_wire_rx(int s)
{
- struct timespec ts_kern, ts_user, ts_diff;
+ struct timespec ts_kern, ts_user;
struct can_frame frame;
struct msg_info *mi;
receive(s, &frame, &ts_kern, &ts_user);
void process_final_rx(int s)
{
- struct timespec ts_kern, ts_user, ts_diff;
+ struct timespec ts_kern, ts_user;
struct can_frame frame;
struct msg_info *mi;
int ret;
struct pollfd pfd[3];
struct timespec timeout;
struct sockaddr_can addr;
- sigset_t set;
int consecutive_timeouts = 0;
MEMSET_ZERO(pfd);
SEND();
get_tstamp(&stats.tic);
-
+ ret = 0;
while (!finish_flag &&
(opt.count == 0 || count < opt.count || msg_in_progress != 0)) {
- get_next_timeout(&timeout);
+ get_next_timeout(&timeout, ret == 0);
+ //printf("timeout %ld.%06ld\n", timeout.tv_sec, timeout.tv_nsec/1000);
//printf("ppoll"); fflush(stdout);
ret = ppoll(pfd, num_interfaces, &timeout, NULL);
//printf("=%d\n", ret);
}
}
if (pfd[i].revents & ~POLLIN)
- error(1, 0, "Unexpected pfd[%d].revents: 0x%04x\n", pfd[i].revents);
+ error(1, 0, "Unexpected pfd[%d].revents: 0x%04x\n", i, pfd[i].revents);
}
}
int main(int argc, const char *argv[])
{
pthread_t thread;
- sigset_t set;
int ret, i;
parse_options(argc, argv);
fclose(opt.f_msgs);
if (opt.f_stat) {
+ struct histogram_stats hs;
fprintf(opt.f_stat, "cmdline='");
for (i=0; i<argc; i++)
fprintf(opt.f_stat, "%s%s", argv[i], i < argc-1 ? " " : "");
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)
if (stats.timeouts && !opt.quiet)
printf("invalid_frame=%d\n", stats.timeouts);
+ histogram_stats(&histogram_gw, &hs);
+ double avg = hs.count ? (double)hs.sum/hs.count : 0;
+ fprintf(opt.f_stat, "avg=%g\n", avg);
+ for (i = 0; i <= 20; i++)
+ fprintf(opt.f_stat, "percentile%d=%d\n", i*5, hs.percentile[i*5]);
+
fclose(opt.f_stat);
}
projects / can-benchmark.git / blobdiff