struct timespec ts_rx_onwire, ts_rx_onwire_kern;
struct timespec ts_rx_final, ts_rx_final_kern;
struct can_frame sent, received;
- unsigned lat_measured_us, tx_time_us;
};
#define MAX_INFOS 10000
tstamp->tv_sec, tstamp->tv_nsec/1000);
}
-int timespec_subtract (struct timespec *result, struct timespec *x, struct timespec *yy);
+int timespec_subtract (struct timespec *result, const struct timespec *x, const struct timespec *yy);
-void msg_info_print(FILE *f, struct msg_info *mi)
+static inline unsigned get_timestamp_diff_us(struct msg_info *mi);
+
+void msg_info_process(FILE *f, struct msg_info *mi)
{
struct timespec diff;
void *local = talloc_new (NULL);
static long num = 0;
char sent[64], received[64];
+ int diff_us = get_timestamp_diff_us(mi);
+ int tx_time_us = calc_frame_length(&mi->received);
+
+ /* Update histograms */
+ histogram_add(&histogram, diff_us);
+ histogram_add(&histogram_gw, diff_us - tx_time_us);
if (!f)
return;
+ /* Print information to a file */
sprint_canframe(sent, &mi->sent, true);
sprint_canframe(received, &mi->received, true);
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),
- mi->tx_time_us);
+ tx_time_us);
break;
case 3:
- fprintf(f, "%ld: %s %s -> %s (%s) -> %s (%s) %s = %s (%s), %s (%s) %d\n",
+ fprintf(f, "%ld: %s %s -> %s (%s) -> %s (%s) %s = %s (%s), %s (%s) %d %.6f\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);
+ tx_time_us,
+ 1e-6*(diff_us - tx_time_us));
break;
}
#undef S
/* 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)
+int timespec_subtract (struct timespec *result, const struct timespec *x, const struct timespec *yy)
{
struct timespec ylocal = *yy, *y = &ylocal;
/* Perform the carry for the later subtraction by updating Y. */
printf("%s sec=%ld nsec=%ld\n", msg, tv->tv_sec, tv->tv_nsec);
}
-static inline void calc_msg_latencies(struct msg_info *mi)
+static inline unsigned get_timestamp_diff_us(struct msg_info *mi)
{
struct timespec diff;
switch (num_interfaces) {
timespec_subtract(&diff, &mi->ts_rx_final_kern, &mi->ts_sent);
break;
default:
- return;
+ return 0;
}
- mi->lat_measured_us = diff.tv_sec * 1000000 + diff.tv_nsec/1000;
- mi->tx_time_us = calc_frame_length(&mi->received);
+ unsigned us = diff.tv_sec * 1000000 + diff.tv_nsec/1000;
+ return us;
}
void set_sched_policy_and_prio(int policy, int rtprio)
}
}
-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;
mi->ts_rx_final = ts_user;
mi->received = frame;
- calc_msg_latencies(mi);
-
- histogram_add(&histogram, mi->lat_measured_us);
- histogram_add(&histogram_gw, mi->lat_measured_us - mi->tx_time_us);
-
ret = write(completion_pipe[1], &mi, sizeof(mi));
if (ret == -1)
error(1, errno, "completion_pipe write");
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);
ret = read(completion_pipe[0], &mi, sizeof(mi));
if (ret < sizeof(mi))
error(1, errno, "read completion returned %d", ret);
- msg_info_print(opt.f_msgs, mi);
+
+ msg_info_process(opt.f_msgs, mi);
msg_info_free(mi);
completed++;
}
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);
+ fprintf(opt.f_stat, "out_of_range_below=%d\n", hs.below);
+ fprintf(opt.f_stat, "out_of_range_above=%d\n", hs.above);
+ 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