sysdb: Use a custom output format instead of pretty-printed JSON.

[sysdb.git] / src / utils / proto.c

diff --git a/src/utils/proto.c b/src/utils/proto.c
index af47cdf11d51673684808bc206af14524dbec370..61676266ead9cc14a49049cc85a5f5dbe1a96031 100644 (file)
--- a/src/utils/proto.c
+++ b/src/utils/proto.c
@@ -80,6 +80,30 @@ memdup(const unsigned char *d, size_t length)
  * return the number of bytes that would have been written if enough space had
  * been available. */
 
+static ssize_t
+marshal_bool(char *buf, size_t buf_len, bool v)
+{
+       uint8_t t;
+       if (buf_len >= sizeof(t)) {
+               t = v ? 1 : 0;
+               memcpy(buf, &t, sizeof(t));
+       }
+       return sizeof(t);
+} /* marshal_bool */
+
+static ssize_t
+unmarshal_bool(const char *buf, size_t len, bool *v)
+{
+       uint8_t t;
+       if (len < sizeof(t))
+               return -1;
+       if (v) {
+               memcpy(&t, buf, sizeof(t));
+               *v = t != 0;
+       }
+       return sizeof(t);
+} /* unmarshal_bool */
+
 static ssize_t
 marshal_int64(char *buf, size_t buf_len, int64_t v)
 {
@@ -298,7 +322,9 @@ sdb_proto_marshal_data(char *buf, size_t buf_len, const sdb_data_t *datum)
        if (datum->type == SDB_TYPE_NULL)
                return len;
 
-       if (datum->type == SDB_TYPE_INTEGER)
+       if (datum->type == SDB_TYPE_BOOLEAN)
+               n = marshal_bool(buf, buf_len, datum->data.boolean);
+       else if (datum->type == SDB_TYPE_INTEGER)
                n = marshal_int64(buf, buf_len, datum->data.integer);
        else if (datum->type == SDB_TYPE_DECIMAL)
                n = marshal_double(buf, buf_len, datum->data.decimal);
@@ -335,7 +361,11 @@ sdb_proto_marshal_data(char *buf, size_t buf_len, const sdb_data_t *datum)
 
        type = datum->type & 0xff;
        for (i = 0; i < datum->data.array.length; ++i) {
-               if (type == SDB_TYPE_INTEGER) {
+               if (type == SDB_TYPE_BOOLEAN) {
+                       bool *v = datum->data.array.values;
+                       n = marshal_bool(buf, buf_len, v[i]);
+               }
+               else if (type == SDB_TYPE_INTEGER) {
                        int64_t *v = datum->data.array.values;
                        n = marshal_int64(buf, buf_len, v[i]);
                }
@@ -436,8 +466,11 @@ sdb_proto_marshal_metric(char *buf, size_t buf_len,
                return -1;
 
        len = OBJ_HEADER_LEN + strlen(metric->hostname) + strlen(metric->name) + 2;
-       if (metric->store_type && metric->store_id)
+       if (metric->store_type && metric->store_id) {
                len += strlen(metric->store_type) + strlen(metric->store_id) + 2;
+               if (metric->store_last_update > 0)
+                       len += sizeof(sdb_time_t);
+       }
        if (buf_len < len)
                return len;
 
@@ -450,7 +483,12 @@ sdb_proto_marshal_metric(char *buf, size_t buf_len,
        if (metric->store_type && metric->store_id) {
                n = marshal_string(buf, buf_len, metric->store_type);
                buf += n; buf_len -= n;
-               marshal_string(buf, buf_len, metric->store_id);
+               n = marshal_string(buf, buf_len, metric->store_id);
+               buf += n; buf_len -= n;
+               if (metric->store_last_update > 0) {
+                       n = marshal_datetime(buf, buf_len, metric->store_last_update);
+                       buf += n; buf_len -= n;
+               }
        }
        return len;
 } /* sdb_proto_marshal_metric */
@@ -547,7 +585,9 @@ sdb_proto_unmarshal_data(const char *buf, size_t len, sdb_data_t *datum)
 
 /* Don't populate 'd' if 'datum' is NULL. */
 #define D(field) (datum ? &d.data.field : NULL)
-       if (d.type == SDB_TYPE_INTEGER)
+       if (d.type == SDB_TYPE_BOOLEAN)
+               n = unmarshal_bool(buf, len, D(boolean));
+       else if (d.type == SDB_TYPE_INTEGER)
                n = unmarshal_int64(buf, len, D(integer));
        else if (d.type == SDB_TYPE_DECIMAL)
                n = unmarshal_double(buf, len, D(decimal));
@@ -605,7 +645,11 @@ sdb_proto_unmarshal_data(const char *buf, size_t len, sdb_data_t *datum)
                d.data.array.values = calloc(d.data.array.length,
                                sdb_data_sizeof(d.type & 0xff));
        for (i = 0; i < d.data.array.length; ++i) {
-               if ((d.type & 0xff) == SDB_TYPE_INTEGER) {
+               if ((d.type & 0xff) == SDB_TYPE_BOOLEAN) {
+                       bool *v = d.data.array.values;
+                       n = unmarshal_bool(buf, len, V());
+               }
+               else if ((d.type & 0xff) == SDB_TYPE_INTEGER) {
                        int64_t *v = d.data.array.values;
                        n = unmarshal_int64(buf, len, V());
                }
@@ -735,6 +779,8 @@ sdb_proto_unmarshal_metric(const char *buf, size_t len,
        buf += n; len -= n; l += n;
        if ((n = unmarshal_string(buf, len, metric ? &metric->name : NULL)) < 0)
                return n;
+
+       metric->store_last_update = 0;
        if (len > (size_t)n) {
                buf += n; len -= n; l += n;
                if ((n = unmarshal_string(buf, len,
@@ -744,6 +790,12 @@ sdb_proto_unmarshal_metric(const char *buf, size_t len,
                if ((n = unmarshal_string(buf, len,
                                                metric ? &metric->store_id : NULL)) < 0)
                        return n;
+               if (len >= sizeof(sdb_time_t)) {
+                       buf += n; len -= n; l += n;
+                       if ((n = unmarshal_datetime(buf, len,
+                                                       metric ? &metric->store_last_update : NULL)) < 0)
+                               return n;
+               }
        }
        else if (metric) {
                metric->store_type = NULL;