common: Use jansson support header

Signed-off-by: Philipp Jungkamp <philipp.jungkamp@rwth-aachen.de>

Author: pjungkamp

common/lib/hist.cpp

@@ -11,6 +11,7 @@
 #include <villas/config.hpp>
 #include <villas/exceptions.hpp>
 #include <villas/hist.hpp>
+#include <villas/jansson.hpp>
 #include <villas/table.hpp>
 #include <villas/utils.hpp>
 
@@ -203,15 +204,24 @@ char *Hist::dump() const {
 json_t *Hist::toJson() const {
   json_t *json_buckets, *json_hist;
 
-  json_hist = json_pack("{ s: f, s: f, s: i }", "low", low, "high", high,
-                        "total", total);
+  json_hist = janssonPack("{ s: f, s: f, s: I }", //
+                          "low", low,             //
+                          "high", high,           //
+                          "total", static_cast<json_int_t>(total))
+                  .release();
 
   if (total > 0) {
-    json_object_update(json_hist,
-                       json_pack("{ s: i, s: i, s: f, s: f, s: f, s: f, s: f }",
-                                 "higher", higher, "lower", lower, "highest",
-                                 highest, "lowest", lowest, "mean", getMean(),
-                                 "variance", getVar(), "stddev", getStddev()));
+    json_object_update_new(
+        json_hist,
+        janssonPack("{ s: I, s: I, s: f, s: f, s: f, s: f, s: f }", //
+                    "higher", static_cast<json_int_t>(higher),      //
+                    "lower", static_cast<json_int_t>(lower),        //
+                    "highest", highest,                             //
+                    "lowest", lowest,                               //
+                    "mean", getMean(),                              //
+                    "variance", getVar(),                           //
+                    "stddev", getStddev())
+            .release());
   }
 
   if (total - lower - higher > 0) {
@@ -220,7 +230,7 @@ json_t *Hist::toJson() const {
     for (auto elm : data)
       json_array_append(json_buckets, json_integer(elm));
 
-    json_object_set(json_hist, "buckets", json_buckets);
+    json_object_set_new(json_hist, "buckets", json_buckets);
   }
 
   return json_hist;

common/lib/log.cpp

@@ -6,14 +6,14 @@
  */
 
 #include <algorithm>
-#include <list>
 #include <unordered_map>
 
 #include <fnmatch.h>
 #include <spdlog/sinks/basic_file_sink.h>
 #include <spdlog/sinks/syslog_sink.h>
 
 #include <villas/exceptions.hpp>
+#include <villas/jansson.hpp>
 #include <villas/log.hpp>
 #include <villas/terminal.hpp>
 
@@ -100,17 +100,15 @@ void Log::parse(json_t *json) {
   const char *path = nullptr;
   const char *pattern = nullptr;
 
-  int ret, syslog = 0;
-
-  json_error_t err;
+  int syslog = 0;
   json_t *json_expressions = nullptr;
 
-  ret = json_unpack_ex(json, &err, JSON_STRICT,
-                       "{ s?: s, s?: s, s?: o, s?: b, s?: s }", "level", &level,
-                       "file", &path, "expressions", &json_expressions,
-                       "syslog", &syslog, "pattern", &pattern);
-  if (ret)
-    throw ConfigError(json, err, "node-config-logging");
+  janssonUnpack(json, "{ s?: s, s?: s, s?: o, s?: b, s?: s }", //
+                "level", &level,                               //
+                "file", &path,                                 //
+                "expressions", &json_expressions,              //
+                "syslog", &syslog,                             //
+                "pattern", &pattern);
 
   if (level)
     setLevel(level);
@@ -179,22 +177,16 @@ Log::Level Log::getLevel() const { return level; }
 std::string Log::getLevelName() const {
   auto sv = spdlog::level::to_string_view(level);
 
-  return std::string(sv.data());
+  return std::string(sv.begin(), sv.end());
 }
 
 Log::Expression::Expression(json_t *json) {
-  int ret;
-
   const char *nme;
   const char *lvl;
 
-  json_error_t err;
-
-  ret = json_unpack_ex(json, &err, JSON_STRICT, "{ s: s, s: s }", "name", &nme,
-                       "level", &lvl);
-  if (ret)
-    throw ConfigError(json, err, "node-config-logging-expressions");
-
+  janssonUnpack(json, "{ s: s, s: s }", //
+                "name", &nme,           //
+                "level", &lvl);
   level = spdlog::level::from_str(lvl);
   name = nme;
 }

common/tests/unit/buffer.cpp

@@ -9,9 +9,9 @@
 #include <ctime>
 
 #include <criterion/criterion.h>
-#include <jansson.h>
 
 #include <villas/buffer.hpp>
+#include <villas/jansson.hpp>
 
 using namespace villas;
 
@@ -95,7 +95,7 @@ Test(buffer, multiple) {
   std::srand(std::time(nullptr));
 
   for (int i = 0; i < N; i++) {
-    k[i] = json_pack("{ s: i }", "id", std::rand());
+    k[i] = janssonPack("{ s: i }", "id", std::rand()).release();
     cr_assert_not_null(k[i]);
 
     ret = buf.encode(k[i]);

lib/node_direction.cpp

@@ -30,11 +30,11 @@ int NodeDirection::parse(json_t *json) {
 
   config = json;
 
-  janssonUnpack(json, "{ s?o, s?o, s?i, s?b, s?b }", //
-                "hooks", &json_hooks,                //
-                "signals", &json_signals,            //
-                "vectorize", &vectorize,             //
-                "builtin", &builtin,                 //
+  janssonUnpack(json, "{ s?: o, s?: o, s?: i, s?: b, s?: b }", //
+                "hooks", &json_hooks,                          //
+                "signals", &json_signals,                      //
+                "vectorize", &vectorize,                       //
+                "builtin", &builtin,                           //
                 "enabled", &enabled);
 
   if (node->getFactory()->getFlags() &
@@ -52,7 +52,7 @@ int NodeDirection::parse(json_t *json) {
       json_t *json_name, *json_signal = json_signals;
       int count;
 
-      janssonUnpack(json_signal, "{ s:i }", "count", &count);
+      janssonUnpack(json_signal, "{ s: i }", "count", &count);
 
       json_signals = json_array();
       for (int i = 0; i < count; i++) {

lib/nodes/webrtc.cpp

@@ -63,16 +63,17 @@ int WebRTCNode::parse(json_t *json) {
   json_t *json_format = nullptr;
 
   janssonUnpack(json,
-                "{ s:s, s?s, s?s, s?i, s?i, s?b, s?{ s?o, s?b }, s?o }", //
-                "session", &sess,                                        //
-                "peer", &pr,                                             //
-                "server", &svr,                                          //
-                "wait_seconds", &wait_seconds,                           //
-                "max_retransmits", &rexmit,                              //
-                "ordered", &ord,                                         //
-                "ice",                                                   //
-                /* ice */ "servers", &json_servers,                      //
-                /* ice */ "tcp", &tcp,                                   //
+                "{ s: s, s?: s, s?: s, s?: i, s?: i, s?: b, s?: { s?: o, s?: b "
+                "}, s?: o }",                       //
+                "session", &sess,                   //
+                "peer", &pr,                        //
+                "server", &svr,                     //
+                "wait_seconds", &wait_seconds,      //
+                "max_retransmits", &rexmit,         //
+                "ordered", &ord,                    //
+                "ice",                              //
+                /* ice */ "servers", &json_servers, //
+                /* ice */ "tcp", &tcp,              //
                 "format", &json_format);
 
   session = sess;