X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=47ba0356933453d4aa0c061daf23a6d3ad4a727c;hp=a0bbf55ce39173c536c4758fce4efefcfeca81cf;hb=39a45905e0b237e458b1826ff9b4fad1c4a59550;hpb=a6bb88e99588be4c62aa7a81bfae643b3c1888fa

diff --git a/src/core/store.c b/src/core/store.c
index a0bbf55..47ba035 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -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
@@ -25,11 +25,15 @@
  * 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/store-private.h"
+#include "core/plugin.h"
 #include "utils/error.h"
 #include "utils/llist.h"
-#include "utils/string.h"
 
 #include <assert.h>
 
@@ -41,98 +45,92 @@
 
 #include <pthread.h>
 
-/*
- * private data types
- */
-
-/* type used for looking up named objects */
-typedef struct {
-	sdb_object_t parent;
-	const char *obj_name;
-} sdb_store_lookup_obj_t;
-#define SDB_STORE_LOOKUP_OBJ_INIT { SDB_OBJECT_INIT, NULL }
-
 /*
  * private variables
  */
 
-static sdb_llist_t *host_list = NULL;
-static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
+static sdb_llist_t *obj_list = NULL;
+static pthread_rwlock_t obj_lock = PTHREAD_RWLOCK_INITIALIZER;
 
 /*
- * private helper functions
+ * private types
  */
 
+static sdb_type_t sdb_store_obj_type;
+static sdb_type_t sdb_attribute_type;
+
 static int
-sdb_store_obj_cmp_by_name(const sdb_object_t *a, const sdb_object_t *b)
+store_base_init(sdb_object_t *obj, va_list ap)
 {
-	const sdb_store_obj_t *h1 = (const sdb_store_obj_t *)a;
-	const sdb_store_obj_t *h2 = (const sdb_store_obj_t *)b;
+	sdb_store_base_t *sobj = STORE_BASE(obj);
 
-	assert(h1 && h2);
-	return strcasecmp(h1->name, h2->name);
-} /* sdb_store_obj_cmp_by_name */
+	sobj->type = va_arg(ap, int);
 
-static int
-sdb_cmp_store_obj_with_name(const sdb_object_t *a, const sdb_object_t *b)
+	sobj->last_update = va_arg(ap, sdb_time_t);
+	sobj->parent = NULL;
+	return 0;
+} /* store_base_init */
+
+static void
+store_base_destroy(sdb_object_t *obj)
 {
-	const sdb_store_obj_t *obj = (const sdb_store_obj_t *)a;
-	const sdb_store_lookup_obj_t *lookup = (const sdb_store_lookup_obj_t *)b;
+	const sdb_store_base_t *sobj = STORE_CONST_BASE(obj);
 
-	assert(obj && lookup);
-	return strcasecmp(obj->name, lookup->obj_name);
-} /* sdb_cmp_store_obj_with_name */
+	if (sobj->parent)
+		sdb_object_deref(SDB_OBJ(sobj->parent));
+} /* store_base_destroy */
 
 static int
-sdb_host_init(sdb_object_t *obj, va_list ap)
+sdb_store_obj_init(sdb_object_t *obj, va_list ap)
 {
-	const char *name = va_arg(ap, const char *);
-
-	SDB_HOST(obj)->host_name = strdup(name);
-	if (! SDB_HOST(obj)->host_name)
-		return -1;
+	sdb_store_obj_t *sobj = SDB_STORE_OBJ(obj);
+	int ret;
 
-	SDB_HOST(obj)->host_last_update = sdb_gettime();
-	/* ignore errors -> last_update will be updated later */
+	/* this will consume the first argument (type) of ap */
+	ret = store_base_init(obj, ap);
+	if (ret)
+		return ret;
 
-	SDB_HOST(obj)->attributes = sdb_llist_create();
-	if (! SDB_HOST(obj)->attributes)
+	sobj->children = sdb_llist_create();
+	if (! sobj->children)
 		return -1;
-	SDB_HOST(obj)->services = sdb_llist_create();
-	if (! SDB_HOST(obj)->services)
+	sobj->attributes = sdb_llist_create();
+	if (! sobj->attributes)
 		return -1;
 	return 0;
-} /* sdb_host_init */
+} /* sdb_store_obj_init */
 
 static void
-sdb_host_destroy(sdb_object_t *obj)
+sdb_store_obj_destroy(sdb_object_t *obj)
 {
+	sdb_store_obj_t *sobj = SDB_STORE_OBJ(obj);
+
 	assert(obj);
 
-	if (SDB_HOST(obj)->host_name)
-		free(SDB_HOST(obj)->host_name);
+	store_base_destroy(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 */
+	if (sobj->children)
+		sdb_llist_destroy(sobj->children);
+	if (sobj->attributes)
+		sdb_llist_destroy(sobj->attributes);
+} /* sdb_store_obj_destroy */
 
 static int
 sdb_attr_init(sdb_object_t *obj, va_list ap)
 {
-	const char *hostname = va_arg(ap, const char *);
-	const char *name = va_arg(ap, const char *);
-	const char *value = va_arg(ap, const char *);
-
-	SDB_ATTR(obj)->hostname = strdup(hostname);
-	SDB_ATTR(obj)->attr_name = strdup(name);
-	SDB_ATTR(obj)->attr_value = strdup(value);
-	if ((! SDB_ATTR(obj)->hostname)
-			|| (! SDB_ATTR(obj)->attr_name) || (! SDB_ATTR(obj)->attr_value))
-		return -1;
-
-	SDB_ATTR(obj)->attr_last_update = sdb_gettime();
+	const sdb_data_t *value;
+	int ret;
+
+	/* this will consume the first two arguments
+	 * (type and last_update) of ap */
+	ret = store_base_init(obj, ap);
+	if (ret)
+		return ret;
+	value = va_arg(ap, const sdb_data_t *);
+
+	if (value)
+		if (sdb_data_copy(&SDB_ATTR(obj)->value, value))
+			return -1;
 	return 0;
 } /* sdb_attr_init */
 
@@ -141,499 +139,428 @@ sdb_attr_destroy(sdb_object_t *obj)
 {
 	assert(obj);
 
-	if (SDB_ATTR(obj)->hostname)
-		free(SDB_ATTR(obj)->hostname);
-	if (SDB_ATTR(obj)->attr_name)
-		free(SDB_ATTR(obj)->attr_name);
-	if (SDB_ATTR(obj)->attr_value)
-		free(SDB_ATTR(obj)->attr_value);
+	store_base_destroy(obj);
+	sdb_data_free_datum(&SDB_ATTR(obj)->value);
 } /* sdb_attr_destroy */
 
-static int
-sdb_svc_init(sdb_object_t *obj, va_list ap)
-{
-	const char *hostname = va_arg(ap, const char *);
-	const char *name = va_arg(ap, const char *);
-
-	SDB_SVC(obj)->hostname = strdup(hostname);
-	SDB_SVC(obj)->svc_name = strdup(name);
-	if ((! SDB_SVC(obj)->hostname) || (! SDB_SVC(obj)->svc_name))
-		return -1;
+static sdb_type_t sdb_store_obj_type = {
+	sizeof(sdb_store_obj_t),
 
-	SDB_SVC(obj)->svc_last_update = sdb_gettime();
-	/* ignore errors -> last_update will be updated later */
-	return 0;
-} /* sdb_svc_init */
+	sdb_store_obj_init,
+	sdb_store_obj_destroy
+};
 
-static void
-sdb_svc_destroy(sdb_object_t *obj)
-{
-	assert(obj);
+static sdb_type_t sdb_attribute_type = {
+	sizeof(sdb_attribute_t),
 
-	if (SDB_SVC(obj)->hostname)
-		free(SDB_SVC(obj)->hostname);
-	if (SDB_SVC(obj)->svc_name)
-		free(SDB_SVC(obj)->svc_name);
-} /* sdb_svc_destroy */
+	sdb_attr_init,
+	sdb_attr_destroy
+};
 
 /*
- * public API
+ * private helper functions
  */
 
-sdb_host_t *
-sdb_host_create(const char *name)
+static sdb_store_obj_t *
+store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
 {
-	sdb_object_t *obj;
+	sdb_llist_iter_t *iter;
 
-	if (! name)
+	if (! l)
 		return NULL;
 
-	obj = sdb_object_create(sizeof(sdb_host_t), sdb_host_init,
-			sdb_host_destroy, name);
-	if (! obj)
+	iter = sdb_llist_get_iter(l);
+	if (! iter)
 		return NULL;
-	return SDB_HOST(obj);
-} /* sdb_host_create */
 
-sdb_host_t *
-sdb_host_clone(const sdb_host_t *host)
-{
-	sdb_host_t *new;
+	while (sdb_llist_iter_has_next(iter)) {
+		sdb_store_obj_t *sobj = SDB_STORE_OBJ(sdb_llist_iter_get_next(iter));
+		assert(sobj);
 
-	new = sdb_host_create(host->host_name);
-	if (! new)
-		return NULL;
+		if ((STORE_BASE(sobj)->type == type)
+				&& (! strcasecmp(SDB_OBJ(sobj)->name, name))) {
+			sdb_llist_iter_destroy(iter);
+			return sobj;
+		}
 
-	/* make sure these are initialized; else sdb_object_deref() might access
-	 * arbitrary memory in case of an error */
-	new->services = new->attributes = NULL;
+		/* don't lookups non-host types from hierarchical hosts */
+		if ((type != SDB_HOST) && (STORE_BASE(sobj)->type == SDB_HOST))
+			continue;
 
-	if (host->attributes) {
-		new->attributes = sdb_llist_clone(host->attributes);
-		if (! new->attributes) {
-			sdb_object_deref(SDB_OBJ(new));
-			return NULL;
+		sobj = store_lookup_in_list(sobj->children, type, name);
+		if (sobj) {
+			sdb_llist_iter_destroy(iter);
+			return sobj;
 		}
 	}
+	sdb_llist_iter_destroy(iter);
+	return NULL;
+} /* store_lookup_in_list */
 
-	new->host_last_update = host->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 new;
-} /* sdb_host_clone */
+static sdb_store_obj_t *
+store_lookup(int type, const char *name)
+{
+	return store_lookup_in_list(obj_list, type, name);
+} /* store_lookup */
 
-int
-sdb_store_host(const sdb_host_t *host)
+/* The obj_lock has to be acquired before calling this function. */
+static int
+store_obj(int parent_type, const char *parent_name,
+		int type, const char *name, sdb_time_t last_update,
+		sdb_store_base_t **updated_obj)
 {
-	sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
-	sdb_time_t last_update;
+	char *parent_cname = NULL, *cname = NULL;
 
-	sdb_host_t *old;
+	sdb_llist_t *parent_list;
+	sdb_store_base_t *old;
 	int status = 0;
 
-	if ((! host) || (! host->host_name))
-		return -1;
-
-	last_update = host->host_last_update;
 	if (last_update <= 0)
 		last_update = sdb_gettime();
 
-	pthread_rwlock_wrlock(&host_lock);
+	assert((parent_type == 0)
+			|| (parent_type == SDB_HOST)
+			|| (parent_type == SDB_SERVICE));
+	assert((type == 0)
+			|| (type == SDB_HOST)
+			|| (type == SDB_SERVICE)
+			|| (type == SDB_ATTRIBUTE));
+
+	if (parent_type == SDB_HOST) {
+		parent_cname = sdb_plugin_cname(strdup(parent_name));
+		if (! parent_cname) {
+			sdb_log(SDB_LOG_ERR, "store: strdup failed");
+			return -1;
+		}
+		parent_name = parent_cname;
+	}
+	if (type == SDB_HOST) {
+		cname = sdb_plugin_cname(strdup(name));
+		if (! cname) {
+			sdb_log(SDB_LOG_ERR, "store: strdup failed");
+			return -1;
+		}
+		name = cname;
+	}
 
-	if (! host_list) {
-		if (! (host_list = sdb_llist_create())) {
-			pthread_rwlock_unlock(&host_lock);
+	if (! obj_list) {
+		if (! (obj_list = sdb_llist_create())) {
+			free(parent_cname);
+			free(cname);
+			return -1;
+		}
+	}
+	parent_list = obj_list;
+
+	if (parent_type && parent_name) {
+		sdb_store_obj_t *parent;
+
+		parent = store_lookup(parent_type, parent_name);
+		if (! parent) {
+			sdb_log(SDB_LOG_ERR, "store: Failed to store %s '%s' - "
+					"parent %s '%s' not found", TYPE_TO_NAME(type), name,
+					TYPE_TO_NAME(parent_type), parent_name);
+			free(parent_cname);
+			free(cname);
 			return -1;
 		}
+
+		if (type == SDB_ATTRIBUTE)
+			parent_list = parent->attributes;
+		else
+			parent_list = parent->children;
 	}
 
-	lookup.obj_name = host->host_name;
-	old = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
+	if (type == SDB_HOST)
+		/* make sure that each host is unique */
+		old = STORE_BASE(store_lookup_in_list(obj_list, type, name));
+	else if (type == SDB_ATTRIBUTE)
+		/* look into attributes of this host */
+		old = STORE_BASE(sdb_llist_search_by_name(parent_list, name));
+	else
+		/* look into services assigned to this host (store_lookup_in_list
+		 * does not look up services from hierarchical hosts) */
+		old = STORE_BASE(store_lookup_in_list(parent_list, type, name));
 
 	if (old) {
-		if (old->host_last_update > last_update) {
-			sdb_error_set(SDB_LOG_DEBUG, "store: Cannot update host '%s' - "
-					"value too old (%"PRIscTIME" < %"PRIscTIME")\n",
-					host->host_name, last_update, old->host_last_update);
-			/* don't report an error; the host may be updated by multiple
+		if (old->last_update > last_update) {
+			sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
+					"value too old (%"PRIscTIME" < %"PRIscTIME")",
+					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->host_last_update = last_update;
+			old->last_update = last_update;
 		}
+
+		if (updated_obj)
+			*updated_obj = old;
 	}
 	else {
-		sdb_host_t *new = sdb_host_clone(host);
+		sdb_store_base_t *new;
+
+		if (type == SDB_ATTRIBUTE)
+			/* the value will be updated by the caller */
+			new = STORE_BASE(sdb_object_create(name, sdb_attribute_type,
+						type, last_update, NULL));
+		else
+			new = STORE_BASE(sdb_object_create(name, sdb_store_obj_type,
+						type, last_update));
+
 		if (! new) {
 			char errbuf[1024];
-			sdb_error_set(SDB_LOG_ERR, "store: Failed to clone host object: "
-					"%s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			pthread_rwlock_unlock(&host_lock);
+			sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
+					TYPE_TO_NAME(type), name,
+					sdb_strerror(errno, errbuf, sizeof(errbuf)));
+			free(parent_cname);
+			free(cname);
 			return -1;
 		}
 
-		if (! new->attributes) {
-			if (! (new->attributes = sdb_llist_create())) {
-				char errbuf[1024];
-				sdb_error_set(SDB_LOG_ERR, "store: Failed to initialize "
-						"host object '%s': %s\n", host->host_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_error_set(SDB_LOG_ERR, "store: Failed to initialize "
-						"host object '%s': %s\n", host->host_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),
-				sdb_store_obj_cmp_by_name);
+		/* TODO: insert type-aware; the current version works as long as we
+		 * don't support to store hierarchical data */
+		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));
-	}
 
-	pthread_rwlock_unlock(&host_lock);
+		if (updated_obj)
+			*updated_obj = new;
+	}
+	free(parent_cname);
+	free(cname);
 	return status;
-} /* sdb_store_host */
+} /* store_obj */
 
-const sdb_host_t *
-sdb_store_get_host(const char *name)
+/*
+ * 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_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
-	sdb_host_t *host;
+	sdb_llist_iter_t *iter;
+	char time_str[64];
 
-	if (! name)
-		return NULL;
+	assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
 
-	lookup.obj_name = name;
-	host = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
+	sdb_strbuf_append(buf, "[");
 
-	if (! host)
-		return NULL;
-	return host;
-} /* sdb_store_get_host */
+	iter = sdb_llist_get_iter(list);
+	if (! iter) {
+		char errbuf[1024];
+		sdb_log(SDB_LOG_ERR, "store: Failed to retrieve %ss: %s\n",
+				TYPE_TO_NAME(type),
+				sdb_strerror(errno, errbuf, sizeof(errbuf)));
+		sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve %ss: %s\"}",
+				TYPE_TO_NAME(type), errbuf);
+	}
 
-sdb_attribute_t *
-sdb_attribute_create(const char *hostname,
-		const char *name, const char *value)
-{
-	sdb_object_t *obj;
+	/* has_next returns false if the iterator is NULL */
+	while (sdb_llist_iter_has_next(iter)) {
+		sdb_store_base_t *sobj = STORE_BASE(sdb_llist_iter_get_next(iter));
+		assert(sobj);
 
-	if ((! hostname) || (! name) || (! value))
-		return NULL;
+		if (! sdb_strftime(time_str, sizeof(time_str),
+					"%F %T %z", sobj->last_update))
+			snprintf(time_str, sizeof(time_str), "<error>");
+		time_str[sizeof(time_str) - 1] = '\0';
 
-	obj = sdb_object_create(sizeof(sdb_attribute_t), sdb_attr_init,
-			sdb_attr_destroy, hostname, name, value);
-	if (! obj)
-		return NULL;
-	return SDB_ATTR(obj);
-} /* sdb_attribute_create */
+		sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
+		if (type == SDB_ATTRIBUTE) {
+			char tmp[sdb_data_strlen(&SDB_ATTR(sobj)->value) + 1];
+			sdb_data_format(&SDB_ATTR(sobj)->value, tmp, sizeof(tmp),
+					SDB_DOUBLE_QUOTED);
+			sdb_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\"}",
+					tmp, time_str);
+		}
+		else
+			sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
 
-sdb_attribute_t *
-sdb_attribute_clone(const sdb_attribute_t *attr)
-{
-	sdb_attribute_t *new;
+		if (sdb_llist_iter_has_next(iter))
+			sdb_strbuf_append(buf, ",");
+	}
 
-	new = sdb_attribute_create(attr->hostname,
-			attr->attr_name, attr->attr_value);
-	if (! new)
-		return NULL;
+	sdb_llist_iter_destroy(iter);
+	sdb_strbuf_append(buf, "]");
+} /* store_obj_tojson */
 
-	new->attr_last_update = attr->attr_last_update;
-	return new;
-} /* sdb_attribute_clone */
+/*
+ * public API
+ */
 
-int
-sdb_store_attribute(const sdb_attribute_t *attr)
+void
+sdb_store_clear(void)
 {
-	sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
-	sdb_host_t *host;
+	sdb_llist_destroy(obj_list);
+	obj_list = NULL;
+} /* sdb_store_clear */
 
-	sdb_attribute_t *old;
-
-	sdb_time_t last_update;
-
-	int status = 0;
-
-	if (! attr)
-		return -1;
-
-	last_update = attr->attr_last_update;
-	if (last_update <= 0)
-		last_update = sdb_gettime();
+int
+sdb_store_host(const char *name, sdb_time_t last_update)
+{
+	int status;
 
-	if (! host_list)
+	if (! name)
 		return -1;
 
-	pthread_rwlock_wrlock(&host_lock);
-
-	lookup.obj_name = attr->hostname;
-	host = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
-
-	if (! host) {
-		pthread_rwlock_unlock(&host_lock);
-		return -1;
-	}
-
-	lookup.obj_name = attr->attr_name;
-	old = SDB_ATTR(sdb_llist_search(host->attributes,
-				(const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
-
-	if (old) {
-		if (old->host_last_update > last_update) {
-			sdb_error_set(SDB_LOG_DEBUG, "store: Cannot update attribute "
-					"'%s/%s' - value too old (%"PRIscTIME" < %"PRIscTIME")\n",
-					attr->hostname, attr->attr_name, last_update,
-					old->host_last_update);
-			status = 1;
-		}
-		else {
-			old->attr_last_update = last_update;
-		}
-	}
-	else {
-		sdb_attribute_t *new = sdb_attribute_clone(attr);
-		if (! new) {
-			char errbuf[1024];
-			sdb_error_set(SDB_LOG_ERR, "store: Failed to clone attribute "
-					"object: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			pthread_rwlock_unlock(&host_lock);
-			return -1;
-		}
-
-		status = sdb_llist_insert_sorted(host->attributes, SDB_OBJ(new),
-				sdb_store_obj_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);
+	pthread_rwlock_wrlock(&obj_lock);
+	status = store_obj(/* parent = */ 0, NULL,
+			/* stored object = */ SDB_HOST, name, last_update,
+			/* updated_obj = */ NULL);
+	pthread_rwlock_unlock(&obj_lock);
 	return status;
-} /* sdb_store_attribute */
+} /* sdb_store_host */
 
-sdb_service_t *
-sdb_service_create(const char *hostname, const char *name)
+_Bool
+sdb_store_has_host(const char *name)
 {
-	sdb_object_t *obj;
+	sdb_store_obj_t *host;
 
-	if ((! hostname) || (! name))
+	if (! name)
 		return NULL;
 
-	obj = sdb_object_create(sizeof(sdb_service_t), sdb_svc_init,
-			sdb_svc_destroy, hostname, name);
-	if (! obj)
-		return NULL;
-	return SDB_SVC(obj);
-} /* sdb_service_create */
+	host = store_lookup(SDB_HOST, name);
+	return host != NULL;
+} /* sdb_store_has_host */
 
-sdb_service_t *
-sdb_service_clone(const sdb_service_t *svc)
+sdb_store_base_t *
+sdb_store_get_host(const char *name)
 {
-	sdb_service_t *new;
+	sdb_store_obj_t *host;
 
-	new = sdb_service_create(svc->hostname, svc->svc_name);
-	if (! new)
+	if (! name)
 		return NULL;
 
-	new->svc_last_update = svc->svc_last_update;
-	return new;
-} /* sdb_service_clone */
+	host = store_lookup(SDB_HOST, name);
+	if (! host)
+		return NULL;
+
+	sdb_object_ref(SDB_OBJ(host));
+	return STORE_BASE(host);
+} /* sdb_store_get_host */
 
 int
-sdb_store_service(const sdb_service_t *svc)
+sdb_store_attribute(const char *hostname,
+		const char *key, const sdb_data_t *value,
+		sdb_time_t last_update)
 {
-	sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
-	sdb_host_t *host;
-
-	sdb_service_t *old;
+	int status;
 
-	sdb_time_t last_update;
+	sdb_store_base_t *updated_attr = NULL;
 
-	int status = 0;
-
-	if (! svc)
+	if ((! hostname) || (! key))
 		return -1;
 
-	last_update = svc->svc_last_update;
-	if (last_update <= 0)
-		last_update = sdb_gettime();
+	pthread_rwlock_wrlock(&obj_lock);
+	status = store_obj(/* parent = */ SDB_HOST, hostname,
+			/* stored object = */ SDB_ATTRIBUTE, key, last_update,
+			&updated_attr);
 
-	if (! host_list)
-		return -1;
+	if (status >= 0) {
+		assert(updated_attr);
+		if (sdb_data_copy(&SDB_ATTR(updated_attr)->value, value)) {
+			sdb_object_deref(SDB_OBJ(updated_attr));
+			status = -1;
+		}
+	}
 
-	pthread_rwlock_wrlock(&host_lock);
+	pthread_rwlock_unlock(&obj_lock);
+	return status;
+} /* sdb_store_attribute */
 
-	lookup.obj_name = svc->hostname;
-	host = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
+int
+sdb_store_service(const char *hostname, const char *name,
+		sdb_time_t last_update)
+{
+	int status;
 
-	if (! host) {
-		pthread_rwlock_unlock(&host_lock);
+	if ((! hostname) || (! name))
 		return -1;
-	}
 
-	lookup.obj_name = svc->svc_name;
-	old = SDB_SVC(sdb_llist_search(host->services, (const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
+	pthread_rwlock_wrlock(&obj_lock);
+	status = store_obj(/* parent = */ SDB_HOST, hostname,
+			/* stored object = */ SDB_SERVICE, name, last_update,
+			/* updated obj = */ NULL);
+	pthread_rwlock_unlock(&obj_lock);
+	return status;
+} /* sdb_store_service */
 
-	if (old) {
-		if (old->host_last_update > last_update) {
-			sdb_error_set(SDB_LOG_DEBUG, "store: Cannot update service "
-					"'%s/%s' - value too old (%"PRIscTIME" < %"PRIscTIME")\n",
-					svc->hostname, svc->svc_name, last_update,
-					old->host_last_update);
-			status = 1;
-		}
-		else {
-			old->svc_last_update = last_update;
-		}
-	}
-	else {
-		sdb_service_t *new = sdb_service_clone(svc);
-		if (! new) {
-			char errbuf[1024];
-			sdb_error_set(SDB_LOG_ERR, "store: Failed to clone service "
-					"object: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			pthread_rwlock_unlock(&host_lock);
-			return -1;
-		}
+int
+sdb_store_host_tojson(sdb_store_base_t *h, sdb_strbuf_t *buf, int flags)
+{
+	sdb_store_obj_t *host;
+	char time_str[64];
 
-		status = sdb_llist_insert_sorted(host->services, SDB_OBJ(new),
-				sdb_store_obj_cmp_by_name);
+	if ((! h) || (h->type != SDB_HOST) || (! buf))
+		return -1;
 
-		/* pass control to the list or destroy in case of an error */
-		sdb_object_deref(SDB_OBJ(new));
-	}
+	host = SDB_STORE_OBJ(h);
 
-	pthread_rwlock_unlock(&host_lock);
-	return status;
-} /* sdb_store_service */
+	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';
 
-const sdb_service_t *
-sdb_store_get_service(const sdb_host_t *host, const char *name)
-{
-	sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
-	sdb_service_t *svc;
+	sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+			"\"last_update\": \"%s\"",
+			SDB_OBJ(host)->name, time_str);
 
-	if ((! host) || (! name))
-		return NULL;
+	if (! (flags & SDB_SKIP_ATTRIBUTES)) {
+		sdb_strbuf_append(buf, ", \"attributes\": ");
+		store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf);
+	}
 
-	lookup.obj_name = name;
-	svc = SDB_SVC(sdb_llist_search(host->services,
-				(const sdb_object_t *)&lookup,
-				sdb_cmp_store_obj_with_name));
+	if (! (flags & SDB_SKIP_SERVICES)) {
+		sdb_strbuf_append(buf, ", \"services\": ");
+		store_obj_tojson(host->children, SDB_SERVICE, buf);
+	}
 
-	if (! svc)
-		return NULL;
-	return svc;
-} /* sdb_store_get_service */
+	sdb_strbuf_append(buf, "}");
+	return 0;
+} /* sdb_store_host_tojson */
 
+/* TODO: actually support hierarchical data */
 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);
+	pthread_rwlock_rdlock(&obj_lock);
 
-	host_iter = sdb_llist_get_iter(host_list);
+	host_iter = sdb_llist_get_iter(obj_list);
 	if (! host_iter) {
-		pthread_rwlock_unlock(&host_lock);
+		pthread_rwlock_unlock(&obj_lock);
 		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_base_t *host = STORE_BASE(sdb_llist_iter_get_next(host_iter));
 		assert(host);
 
-		if (! sdb_strftime(time_str, sizeof(time_str),
-					"%F %T %z", host->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",
-				host->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;
-		}
-
-		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_strftime(time_str, sizeof(time_str),
-						"%F %T %z", attr->attr_last_update))
-				snprintf(time_str, sizeof(time_str), "<error>");
-			time_str[sizeof(time_str) - 1] = '\0';
-
-			fprintf(fh, "\tAttribute '%s' -> '%s' (last updated: %s)\n",
-					attr->attr_name, attr->attr_value, time_str);
-		}
-
-		sdb_llist_iter_destroy(attr_iter);
-
-		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;
-		}
-
-		while (sdb_llist_iter_has_next(svc_iter)) {
-			sdb_service_t *svc = SDB_SVC(sdb_llist_iter_get_next(svc_iter));
-			assert(svc);
-
-			if (! sdb_strftime(time_str, sizeof(time_str),
-						"%F %T %z", svc->svc_last_update))
-				snprintf(time_str, sizeof(time_str), "<error>");
-			time_str[sizeof(time_str) - 1] = '\0';
-
-			fprintf(fh, "\tService '%s' (last updated: %s)\n",
-					svc->svc_name, time_str);
-		}
+		if (sdb_store_host_tojson(host, buf, flags))
+			return -1;
 
-		sdb_llist_iter_destroy(svc_iter);
+		if (sdb_llist_iter_has_next(host_iter))
+			sdb_strbuf_append(buf, ",");
 	}
 
+	sdb_strbuf_append(buf, "]}");
+
 	sdb_llist_iter_destroy(host_iter);
-	pthread_rwlock_unlock(&host_lock);
+	pthread_rwlock_unlock(&obj_lock);
 	return 0;
-} /* sdb_store_dump */
+} /* sdb_store_tojson */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */