From 402f38d52656f6b2184b71f23156903b306acca5 Mon Sep 17 00:00:00 2001 From: Steffen Vogel Date: Thu, 31 Aug 2017 10:23:28 +0200 Subject: [PATCH] hist: use hist_{last,highest,lowest,mean} functions --- include/villas/hist.h | 2 ++ lib/stats.c | 14 +++++++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/include/villas/hist.h b/include/villas/hist.h index f6efd61e6..935908576 100644 --- a/include/villas/hist.h +++ b/include/villas/hist.h @@ -58,6 +58,8 @@ struct hist { }; #define hist_last(h) ((h)->last) +#define hist_highest(h) ((h)->highest) +#define hist_lowest(h) ((h)->lowest) #define hist_total(h) ((h)->total) /** Initialize struct hist with supplied values and allocate memory for buckets. */ diff --git a/lib/stats.c b/lib/stats.c index e6a1782d9..082971d7e 100644 --- a/lib/stats.c +++ b/lib/stats.c @@ -143,10 +143,10 @@ json_t * stats_json_periodic(struct stats *s, struct path *p) { return json_pack("{ s: s, s: f, s: f, s: i, s: i }" "path", path_name(p), - "owd", s->histograms[STATS_OWD].last, - "rate", 1.0 / s->histograms[STATS_GAP_SAMPLE].last, - "dropped", s->histograms[STATS_REORDERED].total, - "skipped", s->histograms[STATS_SKIPPED].total + "owd", hist_last(&s->histograms[STATS_OWD]) + "rate", 1.0 / hist_last(&s->histograms[STATS_GAP_SAMPLE]), + "dropped", hist_total(&s->histograms[STATS_REORDERED]), + "skipped", host_ttotal(&s->histograms[STATS_SKIPPED]) ); } @@ -252,9 +252,9 @@ void stats_send(struct stats *s, struct node *n) int i = 0; for (int j = 0; j < STATS_COUNT; j++) { - smp->data[i++].f = s->histograms[j].last; - smp->data[i++].f = s->histograms[j].highest; - smp->data[i++].f = s->histograms[j].lowest; + smp->data[i++].f = hist_last(&s->histograms[j]); + smp->data[i++].f = hist_highest(&s->histograms[j]); + smp->data[i++].f = hist_lowest(&s->histograms[j]); smp->data[i++].f = hist_mean(&s->histograms[j]); smp->data[i++].f = hist_var(&s->histograms[j]); }