![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store_json.c b/src/core/store_json.c
index b4b7b6a8af4b1becfb02431e43188325355f29b4..a2c117b1f10d07308e7db9afd698c32933342e49 100644 (file)
--- a/src/core/store_json.c
+++ b/src/core/store_json.c
/*
* SysDB - src/core/store_json.c
- * Copyright (C) 2013-2014 Sebastian 'tokkee' Harl <sh@tokkee.org>
+ * Copyright (C) 2013-2015 Sebastian 'tokkee' Harl <sh@tokkee.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#include <assert.h>
+#include <ctype.h>
#include <stdlib.h>
+#include <string.h>
/*
* private data types
*/
struct sdb_store_json_formatter {
+ sdb_object_t super;
+
+ /* The string buffer to write to */
sdb_strbuf_t *buf;
/* The context describes the state of the formatter through
int context[8];
size_t current;
+ int type;
int flags;
};
+#define F(obj) ((sdb_store_json_formatter_t *)(obj))
+
+static int
+formatter_init(sdb_object_t *obj, va_list ap)
+{
+ sdb_store_json_formatter_t *f = F(obj);
+
+ f->buf = va_arg(ap, sdb_strbuf_t *);
+ if (! f->buf)
+ return -1;
+
+ f->type = va_arg(ap, int);
+ if ((f->type != SDB_HOST) && (f->type != SDB_SERVICE) && (f->type != SDB_METRIC))
+ return -1;
+
+ f->flags = va_arg(ap, int);
+
+ f->context[0] = 0;
+ f->current = 0;
+ return 0;
+} /* formatter_init */
+
+static sdb_type_t formatter_type = {
+ /* size = */ sizeof(sdb_store_json_formatter_t),
+ /* init = */ formatter_init,
+ /* destroy = */ NULL,
+};
/*
* private helper functions
*/
+static void
+escape_string(const char *src, char *dest)
+{
+ size_t i = 1;
+ dest[0] = '"';
+ for ( ; *src; ++src) {
+ char c = *src;
+ if ((c == '"') || (c == '\\') || iscntrl((int)c)) {
+ dest[i] = '\\';
+ ++i;
+ }
+ switch (c) {
+ case '\a': dest[i] = 'a'; break;
+ case '\b': dest[i] = 'b'; break;
+ case '\t': dest[i] = 't'; break;
+ case '\n': dest[i] = 'n'; break;
+ case '\v': dest[i] = 'v'; break;
+ case '\f': dest[i] = 'f'; break;
+ case '\r': dest[i] = 'r'; break;
+ default: dest[i] = c; break;
+ }
+ ++i;
+ }
+ dest[i] = '"';
+ dest[i + 1] = '\0';
+} /* escape_string */
+
+/* handle_new_object takes care of all maintenance logic related to adding a
+ * new object. That is, it manages context information and emit the prefix and
+ * suffix of an object. */
+static int
+handle_new_object(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj)
+{
+ /* first top-level object */
+ if (! f->context[0]) {
+ if ((obj->type != f->type) && (obj->type != SDB_HOST)) {
+ sdb_log(SDB_LOG_ERR, "store: Unexpected object of type %s "
+ "as the first element during %s JSON serialization",
+ SDB_STORE_TYPE_TO_NAME(obj->type),
+ SDB_STORE_TYPE_TO_NAME(f->type));
+ return -1;
+ }
+ if (f->flags & SDB_WANT_ARRAY)
+ sdb_strbuf_append(f->buf, "[");
+ assert(f->current == 0);
+ f->context[f->current] = obj->type;
+ return 0;
+ }
+
+ if ((f->context[f->current] != SDB_HOST)
+ && (obj->type != SDB_ATTRIBUTE)) {
+ /* new entry of the same type or a parent object;
+ * rewind to the right state */
+ while ((f->current > 0)
+ && (f->context[f->current] != obj->type)) {
+ sdb_strbuf_append(f->buf, "}]");
+ --f->current;
+ }
+ }
+
+ if (obj->type == f->context[f->current]) {
+ /* new entry of the same type */
+ sdb_strbuf_append(f->buf, "},");
+ }
+ else if ((f->context[f->current] == SDB_HOST)
+ || (obj->type == SDB_ATTRIBUTE)) {
+ assert(obj->type != SDB_HOST);
+ /* all object types may be children of a host;
+ * attributes may be children of any type */
+ sdb_strbuf_append(f->buf, ", \"%ss\": [",
+ SDB_STORE_TYPE_TO_NAME(obj->type));
+ ++f->current;
+ }
+ else {
+ sdb_log(SDB_LOG_ERR, "store: Unexpected object of type %s "
+ "on level %zu during JSON serialization",
+ SDB_STORE_TYPE_TO_NAME(obj->type), f->current);
+ return -1;
+ }
+
+ assert(f->current < SDB_STATIC_ARRAY_LEN(f->context));
+ f->context[f->current] = obj->type;
+ return 0;
+} /* handle_new_object */
+
static int
json_emit(sdb_store_json_formatter_t *f, sdb_store_obj_t *obj)
{
char time_str[64];
char interval_str[64];
+ char name[2 * strlen(SDB_OBJ(obj)->name) + 3];
size_t i;
assert(f && obj);
- sdb_strbuf_append(f->buf, "{\"name\": \"%s\", ", SDB_OBJ(obj)->name);
+ handle_new_object(f, obj);
+
+ escape_string(SDB_OBJ(obj)->name, name);
+ sdb_strbuf_append(f->buf, "{\"name\": %s, ", name);
if (obj->type == SDB_ATTRIBUTE) {
char tmp[sdb_data_strlen(&ATTR(obj)->value) + 1];
- if (sdb_data_format(&ATTR(obj)->value, tmp, sizeof(tmp),
- SDB_DOUBLE_QUOTED) < 0)
+ char val[2 * sizeof(tmp) + 3];
+ if (! sdb_data_format(&ATTR(obj)->value, tmp, sizeof(tmp),
+ SDB_DOUBLE_QUOTED))
snprintf(tmp, sizeof(tmp), "<error>");
- sdb_strbuf_append(f->buf, "\"value\": %s, ", tmp);
+
+ if (tmp[0] == '"') {
+ /* a string; escape_string handles quoting */
+ tmp[strlen(tmp) - 1] = '\0';
+ escape_string(tmp + 1, val);
+ sdb_strbuf_append(f->buf, "\"value\": %s, ", val);
+ }
+ else
+ sdb_strbuf_append(f->buf, "\"value\": %s, ", tmp);
+ }
+ else if (obj->type == SDB_METRIC) {
+ if (METRIC(obj)->store.type != NULL)
+ sdb_strbuf_append(f->buf, "\"timeseries\": true, ");
+ else
+ sdb_strbuf_append(f->buf, "\"timeseries\": false, ");
}
/* TODO: make time and interval formats configurable */
- if (! sdb_strftime(time_str, sizeof(time_str),
- "%F %T %z", obj->last_update))
+ if (! sdb_strftime(time_str, sizeof(time_str), obj->last_update))
snprintf(time_str, sizeof(time_str), "<error>");
time_str[sizeof(time_str) - 1] = '\0';
*/
sdb_store_json_formatter_t *
-sdb_store_json_formatter(sdb_strbuf_t *buf, int flags)
+sdb_store_json_formatter(sdb_strbuf_t *buf, int type, int flags)
{
- sdb_store_json_formatter_t *f;
-
- if (! buf)
- return NULL;
-
- f = calloc(1, sizeof(*f));
- if (! f)
- return NULL;
-
- f->buf = buf;
- f->context[0] = 0;
- f->current = 0;
- f->flags = flags;
- return f;
+ return F(sdb_object_create("json-formatter", formatter_type,
+ buf, type, flags));
} /* sdb_store_json_formatter */
int
{
if ((! f) || (! obj))
return -1;
-
- /* first host */
- if (! f->context[0]) {
- if (f->flags & SDB_WANT_ARRAY)
- sdb_strbuf_append(f->buf, "[");
- assert(f->current == 0);
- f->context[0] = SDB_HOST;
- return json_emit(f, obj);
- }
-
- if (obj->type == f->context[f->current]) {
- /* new entry of the same type */
- sdb_strbuf_append(f->buf, "},");
- }
- else if ((f->context[f->current] == SDB_HOST)
- || (obj->type == SDB_ATTRIBUTE)) {
- assert(obj->type != SDB_HOST);
- /* all object types may be children of a host;
- * attributes may be children of any type */
- sdb_strbuf_append(f->buf, ", \"%ss\": [",
- SDB_STORE_TYPE_TO_NAME(obj->type));
- ++f->current;
- }
- else if (f->current >= 1) {
- /* new entry of a previous type or a new type on the same level
- * -> rewind to the right state and then handle the new object */
- assert(obj->type != SDB_ATTRIBUTE);
- while (f->current > 0) {
- if (f->context[f->current] == obj->type)
- break;
- assert(f->context[f->current] != SDB_HOST);
- sdb_strbuf_append(f->buf, "}]");
- --f->current;
- }
- return sdb_store_json_emit(f, obj);
- }
- else {
- sdb_log(SDB_LOG_ERR, "store: Unexpected object of type %s "
- "on level %zu during JSON serialization",
- SDB_STORE_TYPE_TO_NAME(obj->type), f->current);
- return -1;
- }
-
- json_emit(f, obj);
- assert(f->current < SDB_STATIC_ARRAY_LEN(f->context));
- f->context[f->current] = obj->type;
- return 0;
+ return json_emit(f, obj);
} /* sdb_store_json_emit */
int
sdb_strbuf_append(f->buf, "}]");
--f->current;
}
-
sdb_strbuf_append(f->buf, "}");
+
if (f->flags & SDB_WANT_ARRAY)
sdb_strbuf_append(f->buf, "]");
return 0;