latester: Fix array size

[can-benchmark.git] / latester / histogram.h

diff --git a/latester/histogram.h b/latester/histogram.h
index ad7591ccccf7f1220f80d3488307ff6560da0cd5..b4546e4a76ef72003105f050efc4d8f0dadd14dd 100644 (file)
--- a/latester/histogram.h
+++ b/latester/histogram.h
@@ -23,8 +23,9 @@ int histogram_init(struct histogram *h,
                return -1;
 }
 
-void histogram_add(struct histogram *h, unsigned value)
+void histogram_add(struct histogram *h, int value)
 {
+       if (value < 0) value = 0;
        unsigned index = value / h->resolution;
        if (index >= h->allocated)
                index = h->allocated - 1;
@@ -35,20 +36,57 @@ void histogram_fprint(struct histogram *h, FILE *f)
 {
        unsigned long long sum = 0, cum;
        unsigned i;
+
+       if (!f)
+               return;
+
        for (i = 0; i < h->allocated; i++)
                sum += h->data[i];
        cum = sum;
        for (i = 0; i < h->allocated; i++) {
                if (h->data[i] != 0) {
-                       if (!getenv("CANPING_MS"))
-                               fprintf(f, "%d %lld\n", i*h->resolution, cum);
-                       else
-                               fprintf(f, "%g %lld\n", 1e-3*(i*h->resolution), cum);
+                       fprintf(f, "%g %lld\n", 1e-3*(i*h->resolution), cum);
                }
                cum -= h->data[i];
        }
 }
 
 
+struct histogram_stats {
+       unsigned count;
+       unsigned long long sum;
+       unsigned avg;
+       unsigned percentile[101];
+};
+
+void histogram_stats(struct histogram *h, struct histogram_stats *s)
+{
+       unsigned long long sum;
+       unsigned i, j;
+
+       if (!s)
+               return;
+
+       memset(s, 0, sizeof(*s));
+
+       for (i = 0; i < h->allocated; i++) {
+               s->count += h->data[i];
+               s->sum += h->data[i] * i * h->resolution;
+       }
+       if (s->count == 0)
+               return;
+
+       s->avg = s->sum / s->count;
+
+       for (i = 0, j = 0, sum = 0; i < 100; i++) {
+               while (sum <= i * s->count / 100)
+                       sum += h->data[j++];
+
+               s->percentile[i] = (j-1) * h->resolution;
+       }
+       while (sum < i * s->count / 100)
+               sum += h->data[j++];
+       s->percentile[100] = (j-1) * h->resolution;
+}
 
 #endif