Code

store: Split out common JSON code into a separate helper function.
[sysdb.git] / src / core / store.c
index 64e9f64064c50956b6afe56ed4dc35f5d9e5b72b..df5105794ad8f2827323dd81f239f0cdddd818a5 100644 (file)
@@ -1,6 +1,6 @@
 /*
  * SysDB - src/core/store.c
- * Copyright (C) 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
+ * Copyright (C) 2012-2013 Sebastian 'tokkee' Harl <sh@tokkee.org>
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+#if HAVE_CONFIG_H
+#      include "config.h"
+#endif /* HAVE_CONFIG_H */
+
 #include "sysdb.h"
-#include "core/store.h"
-#include "core/error.h"
+#include "core/store-private.h"
 #include "core/plugin.h"
+#include "utils/error.h"
 #include "utils/llist.h"
 
 #include <assert.h>
@@ -49,470 +53,497 @@ static sdb_llist_t *host_list = NULL;
 static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
 
 /*
- * public types
+ * private types
  */
 
+static sdb_type_t sdb_host_type;
+static sdb_type_t sdb_service_type;
+static sdb_type_t sdb_attribute_type;
+
 static int
-sdb_host_init(sdb_object_t *obj, va_list __attribute__((unused)) ap)
+store_obj_init(sdb_object_t *obj, va_list ap)
 {
-       SDB_HOST(obj)->_last_update = sdb_gettime();
-       /* ignore errors -> last_update will be updated later */
+       sdb_store_obj_t *sobj = STORE_OBJ(obj);
 
-       SDB_HOST(obj)->attributes = sdb_llist_create();
-       if (! SDB_HOST(obj)->attributes)
-               return -1;
-       SDB_HOST(obj)->services = sdb_llist_create();
-       if (! SDB_HOST(obj)->services)
-               return -1;
+       sobj->type = va_arg(ap, int);
+
+       sobj->last_update = va_arg(ap, sdb_time_t);
+       sobj->interval = 0;
+       sobj->parent = NULL;
        return 0;
-} /* sdb_host_init */
+} /* store_obj_init */
 
 static void
-sdb_host_destroy(sdb_object_t *obj)
-{
-       assert(obj);
-
-       if (SDB_HOST(obj)->attributes)
-               sdb_llist_destroy(SDB_HOST(obj)->attributes);
-       if (SDB_HOST(obj)->services)
-               sdb_llist_destroy(SDB_HOST(obj)->services);
-} /* sdb_host_destroy */
-
-static sdb_object_t *
-sdb_host_do_clone(const sdb_object_t *obj)
+store_obj_destroy(sdb_object_t *obj)
 {
-       const sdb_host_t *host = (const sdb_host_t *)obj;
-       sdb_host_t *new;
+       const sdb_store_obj_t *sobj = STORE_CONST_OBJ(obj);
 
-       new = sdb_host_create(obj->name);
-       if (! new)
-               return NULL;
-
-       /* make sure these are initialized; else sdb_object_deref() might access
-        * arbitrary memory in case of an error */
-       new->services = new->attributes = NULL;
-
-       if (host->attributes) {
-               new->attributes = sdb_llist_clone(host->attributes);
-               if (! new->attributes) {
-                       sdb_object_deref(SDB_OBJ(new));
-                       return NULL;
-               }
-       }
-
-       new->_last_update = host->_last_update;
-       if (host->services) {
-               new->services = sdb_llist_clone(host->services);
-               if (! new->services) {
-                       sdb_object_deref(SDB_OBJ(new));
-                       return NULL;
-               }
-       }
-       return SDB_OBJ(new);
-} /* sdb_host_do_clone */
+       if (sobj->parent)
+               sdb_object_deref(SDB_OBJ(sobj->parent));
+} /* store_obj_destroy */
 
 static int
-sdb_attr_init(sdb_object_t *obj, va_list ap)
+sdb_host_init(sdb_object_t *obj, va_list ap)
 {
-       const char *hostname = va_arg(ap, const char *);
-       const char *value = va_arg(ap, const char *);
+       sdb_host_t *sobj = HOST(obj);
+       int ret;
 
-       SDB_ATTR(obj)->hostname = strdup(hostname);
-       SDB_ATTR(obj)->attr_value = strdup(value);
-       if ((! SDB_ATTR(obj)->hostname) || (! SDB_ATTR(obj)->attr_value))
-               return -1;
+       /* this will consume the first argument (type) of ap */
+       ret = store_obj_init(obj, ap);
+       if (ret)
+               return ret;
 
-       SDB_ATTR(obj)->_last_update = sdb_gettime();
+       sobj->services = sdb_llist_create();
+       if (! sobj->services)
+               return -1;
+       sobj->attributes = sdb_llist_create();
+       if (! sobj->attributes)
+               return -1;
        return 0;
-} /* sdb_attr_init */
+} /* sdb_host_init */
 
 static void
-sdb_attr_destroy(sdb_object_t *obj)
+sdb_host_destroy(sdb_object_t *obj)
 {
+       sdb_host_t *sobj = HOST(obj);
        assert(obj);
 
-       if (SDB_ATTR(obj)->hostname)
-               free(SDB_ATTR(obj)->hostname);
-       if (SDB_ATTR(obj)->attr_value)
-               free(SDB_ATTR(obj)->attr_value);
-} /* sdb_attr_destroy */
-
-static sdb_object_t *
-sdb_attr_clone(const sdb_object_t *obj)
-{
-       const sdb_attribute_t *attr = (const sdb_attribute_t *)obj;
-       sdb_attribute_t *new;
+       store_obj_destroy(obj);
 
-       new = sdb_attribute_create(attr->hostname,
-                       obj->name, attr->attr_value);
-       if (! new)
-               return NULL;
-
-       new->_last_update = attr->_last_update;
-       return SDB_OBJ(new);
-} /* sdb_attr_clone */
+       if (sobj->services)
+               sdb_llist_destroy(sobj->services);
+       if (sobj->attributes)
+               sdb_llist_destroy(sobj->attributes);
+} /* sdb_host_destroy */
 
 static int
-sdb_svc_init(sdb_object_t *obj, va_list ap)
+sdb_service_init(sdb_object_t *obj, va_list ap)
 {
-       const char *hostname = va_arg(ap, const char *);
+       sdb_service_t *sobj = SVC(obj);
+       int ret;
 
-       SDB_SVC(obj)->hostname = strdup(hostname);
-       if (! SDB_SVC(obj)->hostname)
-               return -1;
+       /* this will consume the first argument (type) of ap */
+       ret = store_obj_init(obj, ap);
+       if (ret)
+               return ret;
 
-       SDB_SVC(obj)->_last_update = sdb_gettime();
-       /* ignore errors -> last_update will be updated later */
+       sobj->attributes = sdb_llist_create();
+       if (! sobj->attributes)
+               return -1;
        return 0;
-} /* sdb_svc_init */
+} /* sdb_service_init */
 
 static void
-sdb_svc_destroy(sdb_object_t *obj)
+sdb_service_destroy(sdb_object_t *obj)
 {
+       sdb_service_t *sobj = SVC(obj);
        assert(obj);
 
-       if (SDB_SVC(obj)->hostname)
-               free(SDB_SVC(obj)->hostname);
-} /* sdb_svc_destroy */
+       store_obj_destroy(obj);
+
+       if (sobj->attributes)
+               sdb_llist_destroy(sobj->attributes);
+} /* sdb_service_destroy */
 
-static sdb_object_t *
-sdb_svc_clone(const sdb_object_t *obj)
+static int
+sdb_attr_init(sdb_object_t *obj, va_list ap)
 {
-       const sdb_service_t *svc = (const sdb_service_t *)obj;
-       sdb_service_t *new;
+       const sdb_data_t *value;
+       int ret;
+
+       /* this will consume the first two arguments
+        * (type and last_update) of ap */
+       ret = store_obj_init(obj, ap);
+       if (ret)
+               return ret;
+       value = va_arg(ap, const sdb_data_t *);
+
+       if (value)
+               if (sdb_data_copy(&ATTR(obj)->value, value))
+                       return -1;
+       return 0;
+} /* sdb_attr_init */
 
-       new = sdb_service_create(svc->hostname, obj->name);
-       if (! new)
-               return NULL;
+static void
+sdb_attr_destroy(sdb_object_t *obj)
+{
+       assert(obj);
 
-       new->_last_update = svc->_last_update;
-       return SDB_OBJ(new);
-} /* sdb_svc_clone */
+       store_obj_destroy(obj);
+       sdb_data_free_datum(&ATTR(obj)->value);
+} /* sdb_attr_destroy */
 
-const sdb_type_t sdb_host_type = {
+static sdb_type_t sdb_host_type = {
        sizeof(sdb_host_t),
-
        sdb_host_init,
-       sdb_host_destroy,
-       sdb_host_do_clone
-};
-
-const sdb_type_t sdb_attribute_type = {
-       sizeof(sdb_attribute_t),
-
-       sdb_attr_init,
-       sdb_attr_destroy,
-       sdb_attr_clone
+       sdb_host_destroy
 };
 
-const sdb_type_t sdb_service_type = {
+static sdb_type_t sdb_service_type = {
        sizeof(sdb_service_t),
+       sdb_service_init,
+       sdb_service_destroy
+};
 
-       sdb_svc_init,
-       sdb_svc_destroy,
-       sdb_svc_clone
+static sdb_type_t sdb_attribute_type = {
+       sizeof(sdb_attribute_t),
+       sdb_attr_init,
+       sdb_attr_destroy
 };
 
 /*
- * public API
+ * private helper functions
  */
 
-sdb_host_t *
-sdb_host_create(const char *name)
+static sdb_host_t *
+lookup_host(const char *name)
 {
-       sdb_object_t *obj;
+       return HOST(sdb_llist_search_by_name(host_list, name));
+} /* lookup_host */
 
-       if (! name)
-               return NULL;
+/* The host_lock has to be acquired before calling this function. */
+static int
+store_obj(const char *hostname, int type, const char *name,
+               sdb_time_t last_update, sdb_store_obj_t **updated_obj)
+{
+       char *host_cname = NULL, *cname = NULL;
 
-       obj = sdb_object_create(name, sdb_host_type);
-       if (! obj)
-               return NULL;
-       return SDB_HOST(obj);
-} /* sdb_host_create */
+       sdb_llist_t *parent_list;
+       sdb_store_obj_t *old;
+       int status = 0;
 
-int
-sdb_store_host(const sdb_host_t *host)
-{
-       char *cname;
+       if (last_update <= 0)
+               last_update = sdb_gettime();
 
-       sdb_time_t last_update;
-       sdb_host_t *old;
+       assert((type == 0)
+                       || (type == SDB_HOST)
+                       || (type == SDB_SERVICE)
+                       || (type == SDB_ATTRIBUTE));
 
-       int status = 0;
+       assert(hostname || (type == SDB_HOST));
+       assert((! hostname)
+                       || (type == SDB_SERVICE)
+                       || (type == SDB_ATTRIBUTE));
 
-       if ((! host) || (! SDB_CONST_OBJ(host)->name))
-               return -1;
+       if (! host_list)
+               if (! (host_list = sdb_llist_create()))
+                       return -1;
+       parent_list = host_list;
 
-       cname = sdb_plugin_cname(strdup(SDB_CONST_OBJ(host)->name));
-       if (! cname) {
-               sdb_log(SDB_LOG_ERR, "store: strdup failed");
-               return -1;
+       if (type == SDB_HOST) {
+               cname = sdb_plugin_cname(strdup(name));
+               if (! cname) {
+                       sdb_log(SDB_LOG_ERR, "store: strdup failed");
+                       return -1;
+               }
+               name = cname;
        }
 
-       last_update = host->_last_update;
-       if (last_update <= 0)
-               last_update = sdb_gettime();
-
-       pthread_rwlock_wrlock(&host_lock);
+       if (hostname) {
+               sdb_host_t *host;
 
-       if (! host_list) {
-               if (! (host_list = sdb_llist_create())) {
-                       pthread_rwlock_unlock(&host_lock);
+               host_cname = sdb_plugin_cname(strdup(hostname));
+               if (! host_cname) {
+                       sdb_log(SDB_LOG_ERR, "store: strdup failed");
+                       free(cname);
+                       return -1;
+               }
+               hostname = host_cname;
+
+               host = lookup_host(hostname);
+               if (! host) {
+                       sdb_log(SDB_LOG_ERR, "store: Failed to store %s '%s' - "
+                                       "host '%s' not found", SDB_STORE_TYPE_TO_NAME(type),
+                                       name, hostname);
+                       free(host_cname);
+                       free(cname);
                        return -1;
                }
+
+               if (type == SDB_ATTRIBUTE)
+                       parent_list = host->attributes;
+               else
+                       parent_list = host->services;
        }
 
-       old = SDB_HOST(sdb_llist_search_by_name(host_list, cname));
+       if (type == SDB_HOST)
+               old = STORE_OBJ(sdb_llist_search_by_name(host_list, name));
+       else
+               old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
 
        if (old) {
-               if (old->_last_update > last_update) {
-                       sdb_log(SDB_LOG_DEBUG, "store: Cannot update host '%s' - "
+               if (old->last_update > last_update) {
+                       sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
                                        "value too old (%"PRIscTIME" < %"PRIscTIME")",
-                                       cname, last_update, old->_last_update);
-                       /* don't report an error; the host may be updated by multiple
+                                       SDB_STORE_TYPE_TO_NAME(type), name,
+                                       last_update, old->last_update);
+                       /* don't report an error; the object may be updated by multiple
                         * backends */
                        status = 1;
                }
                else {
-                       old->_last_update = last_update;
+                       sdb_time_t interval = last_update - old->last_update;
+                       old->last_update = last_update;
+                       if (interval) {
+                               if (old->interval)
+                                       old->interval = (sdb_time_t)((0.9 * (double)old->interval)
+                                                       + (0.1 * (double)interval));
+                               else
+                                       old->interval = interval;
+                       }
                }
+
+               if (updated_obj)
+                       *updated_obj = old;
        }
        else {
-               sdb_host_t *new = SDB_HOST(sdb_object_clone(SDB_CONST_OBJ(host)));
+               sdb_store_obj_t *new;
+
+               if (type == SDB_ATTRIBUTE) {
+                       /* the value will be updated by the caller */
+                       new = STORE_OBJ(sdb_object_create(name, sdb_attribute_type,
+                                               type, last_update, NULL));
+               }
+               else {
+                       sdb_type_t t;
+                       t = type == SDB_HOST ? sdb_host_type : sdb_service_type;
+                       new = STORE_OBJ(sdb_object_create(name, t, type, last_update));
+               }
+
                if (! new) {
                        char errbuf[1024];
-                       sdb_log(SDB_LOG_ERR, "store: Failed to clone host object: %s",
+                       sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
+                                       SDB_STORE_TYPE_TO_NAME(type), name,
                                        sdb_strerror(errno, errbuf, sizeof(errbuf)));
-                       pthread_rwlock_unlock(&host_lock);
+                       free(host_cname);
+                       free(cname);
                        return -1;
                }
 
-               free(SDB_OBJ(new)->name);
-               SDB_OBJ(new)->name = cname;
-
-               if (! new->attributes) {
-                       if (! (new->attributes = sdb_llist_create())) {
-                               char errbuf[1024];
-                               sdb_log(SDB_LOG_ERR, "store: Failed to initialize "
-                                               "host object '%s': %s", SDB_OBJ(new)->name,
-                                               sdb_strerror(errno, errbuf, sizeof(errbuf)));
-                               sdb_object_deref(SDB_OBJ(new));
-                               pthread_rwlock_unlock(&host_lock);
-                               return -1;
-                       }
-               }
-
-               if (! new->services) {
-                       if (! (new->services = sdb_llist_create())) {
-                               char errbuf[1024];
-                               sdb_log(SDB_LOG_ERR, "store: Failed to initialize "
-                                               "host object '%s': %s", SDB_OBJ(new)->name,
-                                               sdb_strerror(errno, errbuf, sizeof(errbuf)));
-                               sdb_object_deref(SDB_OBJ(new));
-                               pthread_rwlock_unlock(&host_lock);
-                               return -1;
-                       }
-               }
-
-               status = sdb_llist_insert_sorted(host_list, SDB_OBJ(new),
+               status = sdb_llist_insert_sorted(parent_list, SDB_OBJ(new),
                                sdb_object_cmp_by_name);
 
                /* pass control to the list or destroy in case of an error */
                sdb_object_deref(SDB_OBJ(new));
+
+               if (updated_obj)
+                       *updated_obj = new;
+       }
+       free(host_cname);
+       free(cname);
+       return status;
+} /* store_obj */
+
+/*
+ * store_common_tojson serializes common object attributes to JSON.
+ *
+ * The function never returns an error. Rather, an error message will be part
+ * of the serialized data.
+ */
+static void
+store_common_tojson(sdb_store_obj_t *obj, sdb_strbuf_t *buf)
+{
+       char time_str[64];
+       char interval_str[64];
+
+       if (! sdb_strftime(time_str, sizeof(time_str),
+                               "%F %T %z", obj->last_update))
+               snprintf(time_str, sizeof(time_str), "<error>");
+       time_str[sizeof(time_str) - 1] = '\0';
+
+       if (! sdb_strfinterval(interval_str, sizeof(interval_str),
+                               obj->interval))
+               snprintf(interval_str, sizeof(interval_str), "<error>");
+       interval_str[sizeof(interval_str) - 1] = '\0';
+
+       sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
+                       "\"update_interval\": \"%s\"", time_str, interval_str);
+} /* store_common_tojson */
+
+/*
+ * store_obj_tojson serializes attribute / service objects to JSON.
+ *
+ * The function never returns an error. Rather, an error message will be part
+ * of the serialized data.
+ */
+static void
+store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
+{
+       sdb_llist_iter_t *iter;
+
+       assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
+
+       sdb_strbuf_append(buf, "[");
+       iter = sdb_llist_get_iter(list);
+       if (! iter) {
+               char errbuf[1024];
+               sdb_log(SDB_LOG_ERR, "store: Failed to retrieve %ss: %s\n",
+                               SDB_STORE_TYPE_TO_NAME(type),
+                               sdb_strerror(errno, errbuf, sizeof(errbuf)));
+               sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve %ss: %s\"}",
+                               SDB_STORE_TYPE_TO_NAME(type), errbuf);
        }
 
+       /* has_next returns false if the iterator is NULL */
+       while (sdb_llist_iter_has_next(iter)) {
+               sdb_store_obj_t *sobj = STORE_OBJ(sdb_llist_iter_get_next(iter));
+               assert(sobj);
+               assert(sobj->type == type);
+
+               sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
+               if (sobj->type == SDB_ATTRIBUTE) {
+                       char tmp[sdb_data_strlen(&ATTR(sobj)->value) + 1];
+                       sdb_data_format(&ATTR(sobj)->value, tmp, sizeof(tmp),
+                                       SDB_DOUBLE_QUOTED);
+                       sdb_strbuf_append(buf, "\"value\": %s, ", tmp);
+               }
+
+               store_common_tojson(sobj, buf);
+               sdb_strbuf_append(buf, "}");
+
+               if (sdb_llist_iter_has_next(iter))
+                       sdb_strbuf_append(buf, ",");
+       }
+
+       sdb_llist_iter_destroy(iter);
+       sdb_strbuf_append(buf, "]");
+} /* store_obj_tojson */
+
+/*
+ * public API
+ */
+
+void
+sdb_store_clear(void)
+{
+       sdb_llist_destroy(host_list);
+       host_list = NULL;
+} /* sdb_store_clear */
+
+int
+sdb_store_host(const char *name, sdb_time_t last_update)
+{
+       int status;
+
+       if (! name)
+               return -1;
+
+       pthread_rwlock_wrlock(&host_lock);
+       status = store_obj(/* hostname = */ NULL,
+                       /* stored object = */ SDB_HOST, name, last_update,
+                       /* updated_obj = */ NULL);
        pthread_rwlock_unlock(&host_lock);
        return status;
 } /* sdb_store_host */
 
-const sdb_host_t *
-sdb_store_get_host(const char *name)
+_Bool
+sdb_store_has_host(const char *name)
 {
        sdb_host_t *host;
 
        if (! name)
                return NULL;
 
-       host = SDB_HOST(sdb_llist_search_by_name(host_list, name));
-       if (! host)
-               return NULL;
-       return host;
-} /* sdb_store_get_host */
+       host = lookup_host(name);
+       return host != NULL;
+} /* sdb_store_has_host */
 
-sdb_attribute_t *
-sdb_attribute_create(const char *hostname,
-               const char *name, const char *value)
+sdb_store_obj_t *
+sdb_store_get_host(const char *name)
 {
-       sdb_object_t *obj;
+       sdb_host_t *host;
 
-       if ((! hostname) || (! name) || (! value))
+       if (! name)
                return NULL;
 
-       obj = sdb_object_create(name, sdb_attribute_type, hostname, value);
-       if (! obj)
+       host = lookup_host(name);
+       if (! host)
                return NULL;
-       return SDB_ATTR(obj);
-} /* sdb_attribute_create */
+
+       sdb_object_ref(SDB_OBJ(host));
+       return STORE_OBJ(host);
+} /* sdb_store_get_host */
 
 int
-sdb_store_attribute(const sdb_attribute_t *attr)
+sdb_store_attribute(const char *hostname,
+               const char *key, const sdb_data_t *value,
+               sdb_time_t last_update)
 {
-       sdb_host_t *host;
-       sdb_attribute_t *old;
-       sdb_time_t last_update;
+       int status;
 
-       int status = 0;
+       sdb_store_obj_t *updated_attr = NULL;
 
-       if (! attr)
-               return -1;
-
-       last_update = attr->_last_update;
-       if (last_update <= 0)
-               last_update = sdb_gettime();
-
-       if (! host_list)
+       if ((! hostname) || (! key))
                return -1;
 
        pthread_rwlock_wrlock(&host_lock);
-
-       host = SDB_HOST(sdb_llist_search_by_name(host_list, attr->hostname));
-       if (! host) {
-               pthread_rwlock_unlock(&host_lock);
-               return -1;
-       }
-
-       old = SDB_ATTR(sdb_llist_search_by_name(host->attributes,
-                               SDB_CONST_OBJ(attr)->name));
-       if (old) {
-               if (old->_last_update > last_update) {
-                       sdb_log(SDB_LOG_DEBUG, "store: Cannot update attribute "
-                                       "'%s/%s' - value too old (%"PRIscTIME" < %"PRIscTIME")",
-                                       attr->hostname, SDB_CONST_OBJ(attr)->name, last_update,
-                                       old->_last_update);
-                       status = 1;
-               }
-               else {
-                       old->_last_update = last_update;
+       status = store_obj(hostname,
+                       /* stored object = */ SDB_ATTRIBUTE, key, last_update,
+                       &updated_attr);
+
+       if (status >= 0) {
+               assert(updated_attr);
+               sdb_data_free_datum(&ATTR(updated_attr)->value);
+               if (sdb_data_copy(&ATTR(updated_attr)->value, value)) {
+                       sdb_object_deref(SDB_OBJ(updated_attr));
+                       status = -1;
                }
        }
-       else {
-               sdb_attribute_t *new = SDB_ATTR(sdb_object_clone(SDB_CONST_OBJ(attr)));
-               if (! new) {
-                       char errbuf[1024];
-                       sdb_log(SDB_LOG_ERR, "store: Failed to clone attribute "
-                                       "object: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
-                       pthread_rwlock_unlock(&host_lock);
-                       return -1;
-               }
-
-               status = sdb_llist_insert_sorted(host->attributes, SDB_OBJ(new),
-                               sdb_object_cmp_by_name);
-
-               /* pass control to the list or destroy in case of an error */
-               sdb_object_deref(SDB_OBJ(new));
-       }
 
        pthread_rwlock_unlock(&host_lock);
        return status;
 } /* sdb_store_attribute */
 
-sdb_service_t *
-sdb_service_create(const char *hostname, const char *name)
+int
+sdb_store_service(const char *hostname, const char *name,
+               sdb_time_t last_update)
 {
-       sdb_object_t *obj;
+       int status;
 
        if ((! hostname) || (! name))
-               return NULL;
+               return -1;
 
-       obj = sdb_object_create(name, sdb_service_type, hostname);
-       if (! obj)
-               return NULL;
-       return SDB_SVC(obj);
-} /* sdb_service_create */
+       pthread_rwlock_wrlock(&host_lock);
+       status = store_obj(hostname,
+                       /* stored object = */ SDB_SERVICE, name, last_update,
+                       /* updated obj = */ NULL);
+       pthread_rwlock_unlock(&host_lock);
+       return status;
+} /* sdb_store_service */
 
 int
-sdb_store_service(const sdb_service_t *svc)
+sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf, int flags)
 {
        sdb_host_t *host;
-       sdb_service_t *old;
-       sdb_time_t last_update;
 
-       int status = 0;
-
-       if (! svc)
+       if ((! h) || (h->type != SDB_HOST) || (! buf))
                return -1;
 
-       last_update = svc->_last_update;
-       if (last_update <= 0)
-               last_update = sdb_gettime();
+       host = HOST(h);
 
-       if (! host_list)
-               return -1;
-
-       pthread_rwlock_wrlock(&host_lock);
+       sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(host)->name);
+       store_common_tojson(h, buf);
 
-       host = SDB_HOST(sdb_llist_search_by_name(host_list, svc->hostname));
-       if (! host) {
-               pthread_rwlock_unlock(&host_lock);
-               return -1;
+       if (! (flags & SDB_SKIP_ATTRIBUTES)) {
+               sdb_strbuf_append(buf, ", \"attributes\": ");
+               store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf);
        }
 
-       old = SDB_SVC(sdb_llist_search_by_name(host->services,
-                               SDB_CONST_OBJ(svc)->name));
-       if (old) {
-               if (old->_last_update > last_update) {
-                       sdb_log(SDB_LOG_DEBUG, "store: Cannot update service "
-                                       "'%s/%s' - value too old (%"PRIscTIME" < %"PRIscTIME")",
-                                       svc->hostname, SDB_CONST_OBJ(svc)->name, last_update,
-                                       old->_last_update);
-                       status = 1;
-               }
-               else {
-                       old->_last_update = last_update;
-               }
-       }
-       else {
-               sdb_service_t *new = SDB_SVC(sdb_object_clone(SDB_CONST_OBJ(svc)));
-               if (! new) {
-                       char errbuf[1024];
-                       sdb_log(SDB_LOG_ERR, "store: Failed to clone service "
-                                       "object: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
-                       pthread_rwlock_unlock(&host_lock);
-                       return -1;
-               }
-
-               status = sdb_llist_insert_sorted(host->services, SDB_OBJ(new),
-                               sdb_object_cmp_by_name);
-
-               /* pass control to the list or destroy in case of an error */
-               sdb_object_deref(SDB_OBJ(new));
+       if (! (flags & SDB_SKIP_SERVICES)) {
+               sdb_strbuf_append(buf, ", \"services\": ");
+               store_obj_tojson(host->services, SDB_SERVICE, buf);
        }
 
-       pthread_rwlock_unlock(&host_lock);
-       return status;
-} /* sdb_store_service */
-
-const sdb_service_t *
-sdb_store_get_service(const sdb_host_t *host, const char *name)
-{
-       sdb_service_t *svc;
-
-       if ((! host) || (! name))
-               return NULL;
-
-       svc = SDB_SVC(sdb_llist_search_by_name(host->services, name));
-       if (! svc)
-               return NULL;
-       return svc;
-} /* sdb_store_get_service */
+       sdb_strbuf_append(buf, "}");
+       return 0;
+} /* sdb_store_host_tojson */
 
 int
-sdb_store_dump(FILE *fh)
+sdb_store_tojson(sdb_strbuf_t *buf, int flags)
 {
        sdb_llist_iter_t *host_iter;
 
-       if (! fh)
+       if (! buf)
                return -1;
 
        pthread_rwlock_rdlock(&host_lock);
@@ -523,74 +554,54 @@ sdb_store_dump(FILE *fh)
                return -1;
        }
 
-       while (sdb_llist_iter_has_next(host_iter)) {
-               sdb_host_t *host = SDB_HOST(sdb_llist_iter_get_next(host_iter));
-               sdb_llist_iter_t *svc_iter;
-               sdb_llist_iter_t *attr_iter;
-
-               char time_str[64];
+       sdb_strbuf_append(buf, "{\"hosts\":[");
 
+       while (sdb_llist_iter_has_next(host_iter)) {
+               sdb_store_obj_t *host = STORE_OBJ(sdb_llist_iter_get_next(host_iter));
                assert(host);
 
-               if (! sdb_strftime(time_str, sizeof(time_str),
-                                       "%F %T %z", host->_last_update))
-                       snprintf(time_str, sizeof(time_str), "<error>");
-               time_str[sizeof(time_str) - 1] = '\0';
-
-               fprintf(fh, "Host '%s' (last updated: %s):\n",
-                               SDB_OBJ(host)->name, time_str);
-
-               attr_iter = sdb_llist_get_iter(host->attributes);
-               if (! attr_iter) {
-                       char errbuf[1024];
-                       fprintf(fh, "Failed to retrieve attributes: %s\n",
-                                       sdb_strerror(errno, errbuf, sizeof(errbuf)));
-                       continue;
-               }
+               if (sdb_store_host_tojson(host, buf, flags))
+                       return -1;
 
-               while (sdb_llist_iter_has_next(attr_iter)) {
-                       sdb_attribute_t *attr = SDB_ATTR(sdb_llist_iter_get_next(attr_iter));
-                       assert(attr);
+               if (sdb_llist_iter_has_next(host_iter))
+                       sdb_strbuf_append(buf, ",");
+       }
 
-                       if (! sdb_strftime(time_str, sizeof(time_str),
-                                               "%F %T %z", attr->_last_update))
-                               snprintf(time_str, sizeof(time_str), "<error>");
-                       time_str[sizeof(time_str) - 1] = '\0';
+       sdb_strbuf_append(buf, "]}");
 
-                       fprintf(fh, "\tAttribute '%s' -> '%s' (last updated: %s)\n",
-                                       SDB_OBJ(attr)->name, attr->attr_value, time_str);
-               }
+       sdb_llist_iter_destroy(host_iter);
+       pthread_rwlock_unlock(&host_lock);
+       return 0;
+} /* sdb_store_tojson */
 
-               sdb_llist_iter_destroy(attr_iter);
+/* TODO: actually support hierarchical data */
+int
+sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
+{
+       sdb_llist_iter_t *host_iter;
+       int status = 0;
 
-               svc_iter = sdb_llist_get_iter(host->services);
-               if (! svc_iter) {
-                       char errbuf[1024];
-                       fprintf(fh, "Failed to retrieve services: %s\n",
-                                       sdb_strerror(errno, errbuf, sizeof(errbuf)));
-                       continue;
-               }
+       pthread_rwlock_rdlock(&host_lock);
 
-               while (sdb_llist_iter_has_next(svc_iter)) {
-                       sdb_service_t *svc = SDB_SVC(sdb_llist_iter_get_next(svc_iter));
-                       assert(svc);
+       host_iter = sdb_llist_get_iter(host_list);
+       if (! host_iter)
+               status = -1;
 
-                       if (! sdb_strftime(time_str, sizeof(time_str),
-                                               "%F %T %z", svc->_last_update))
-                               snprintf(time_str, sizeof(time_str), "<error>");
-                       time_str[sizeof(time_str) - 1] = '\0';
+       /* has_next returns false if the iterator is NULL */
+       while (sdb_llist_iter_has_next(host_iter)) {
+               sdb_store_obj_t *host = STORE_OBJ(sdb_llist_iter_get_next(host_iter));
+               assert(host);
 
-                       fprintf(fh, "\tService '%s' (last updated: %s)\n",
-                                       SDB_OBJ(svc)->name, time_str);
+               if (cb(host, user_data)) {
+                       status = -1;
+                       break;
                }
-
-               sdb_llist_iter_destroy(svc_iter);
        }
 
        sdb_llist_iter_destroy(host_iter);
        pthread_rwlock_unlock(&host_lock);
-       return 0;
-} /* sdb_store_dump */
+       return status;
+} /* sdb_store_iterate */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */