From bee825ae305be8e740901c3a2f2d484e84e9eaf1 Mon Sep 17 00:00:00 2001
From: Steffen Vogel <stvogel@eonerc.rwth-aachen.de>
Date: Sat, 22 Oct 2016 20:38:31 -0400
Subject: [PATCH] generate json object from histogram
---
include/villas/hist.h | 12 +++++++++-
lib/hist.c | 53 ++++++++++++++++++++++++++++++++++++++-----
2 files changed, 58 insertions(+), 7 deletions(-)
diff --git a/include/villas/hist.h b/include/villas/hist.h
index 72b232a21..11be82119 100644
--- a/include/villas/hist.h
+++ b/include/villas/hist.h
@@ -14,6 +14,10 @@
#include "config.h"
+#ifdef WITH_JANSSON
+ #include <jansson.h>
+#endif
+
#define HIST_HEIGHT (LOG_WIDTH - 55)
#define HIST_SEQ 17
@@ -75,6 +79,12 @@ void hist_plot(struct hist *h);
char * hist_dump(struct hist *h);
/** Prints Matlab struct containing all infos to file. */
-void hist_matlab(struct hist *h, FILE *f);
+int hist_dump_matlab(struct hist *h, FILE *f);
+
+#ifdef WITH_JANSSON
+int hist_dump_json(struct hist *h, FILE *f);
+
+json_t * hist_json(struct hist *h);
+#endif
#endif /* _HIST_H_ */
diff --git a/lib/hist.c b/lib/hist.c
index 8f29f6597..33bbce263 100644
--- a/lib/hist.c
+++ b/lib/hist.c
@@ -157,19 +157,60 @@ char * hist_dump(struct hist *h)
return buf;
}
-void hist_matlab(struct hist *h, FILE *f)
+#ifdef WITH_JANSSON
+json_t * hist_json(struct hist *h)
+{
+ json_t *b = json_array();
+
+ for (int i = 0; i < h->length; i++)
+ json_array_append(b, json_integer(h->data[i]));
+
+ return json_pack("{ s: f, s: f, s: i, s: i, s: i, s: f, s: f, s: f, s: f, s: f, s: o }",
+ "low", h->low,
+ "high", h->high,
+ "total", h->total,
+ "higher", h->higher,
+ "lower", h->lower,
+ "highest", h->highest,
+ "lowest", h->lowest,
+ "mean", hist_mean(h),
+ "variance", hist_var(h),
+ "stddev", hist_stddev(h),
+ "buckets", b
+ );
+}
+
+int hist_dump_json(struct hist *h, FILE *f)
+{
+ json_t *j = hist_json(h);
+
+ int ret = json_dumpf(j, f, 0);
+
+ json_decref(j);
+
+ return ret;
+}
+#endif /* WITH_JANNSON */
+
+int hist_dump_matlab(struct hist *h, FILE *f)
{
char *buf = hist_dump(h);
fprintf(f, "%lu = struct( ", time(NULL));
- fprintf(f, "'min', %f, 'max', %f, ", h->low, h->high);
- fprintf(f, "'total', %u, higher', %u, 'lower', %u, ", h->total, h->higher, h->lower);
- fprintf(f, "'highest', %f, 'lowest', %f, ", h->highest, h->lowest);
+ fprintf(f, "'low', %f, ", h->low);
+ fprintf(f, "'high', %f, ", h->high);
+ fprintf(f, "'total', %u, ", h->total);
+ fprintf(f, "'higher', %u, ", h->higher);
+ fprintf(f, "'lower', %u, ", h->lower);
+ fprintf(f, "'highest', %f, ", h->highest);
+ fprintf(f, "'lowest', %f, ", h->lowest);
fprintf(f, "'mean', %f, ", hist_mean(h));
- fprintf(f, "'var', %f, ", hist_var(h));
+ fprintf(f, "'variance', %f, ", hist_var(h));
fprintf(f, "'stddev', %f, ", hist_stddev(h));
- fprintf(f, "'hist', %s ", buf);
+ fprintf(f, "'buckets', %s ", buf);
fprintf(f, "),\n");
free(buf);
+
+ return 0;
}