X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=e9e0979e72e4db10ec99d34f2596f178c5d19317;hp=8e41186f18fbbf4bd2d8d0d48cd80ace520b398a;hb=ddb7ffc175e49abfa69c82777b88d73e1f1103fb;hpb=30a857cf51e15b453348ea95a13007e60a4f3812

diff --git a/src/core/store.c b/src/core/store.c
index 8e41186..e9e0979 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -27,8 +27,8 @@
 
 #include "sysdb.h"
 #include "core/store.h"
-#include "core/error.h"
 #include "core/plugin.h"
+#include "utils/error.h"
 #include "utils/llist.h"
 
 #include <assert.h>
@@ -45,440 +45,430 @@
  * 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;
 
 /*
- * public types
+ * private types
  */
 
-static int
-sdb_host_init(sdb_object_t *obj, va_list __attribute__((unused)) ap)
-{
-	SDB_HOST(obj)->_last_update = sdb_gettime();
-	/* ignore errors -> last_update will be updated later */
+static sdb_type_t sdb_store_obj_type;
+static sdb_type_t sdb_attribute_type;
 
-	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;
-	return 0;
-} /* sdb_host_init */
+struct store_obj;
+typedef struct store_obj store_obj_t;
 
-static void
-sdb_host_destroy(sdb_object_t *obj)
-{
-	assert(obj);
+struct store_obj {
+	sdb_object_t super;
+	sdb_time_t last_update;
+	store_obj_t *parent;
+};
+#define STORE_OBJ(obj) ((store_obj_t *)(obj))
+#define STORE_CONST_OBJ(obj) ((const store_obj_t *)(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 */
+typedef struct {
+	store_obj_t super;
 
-static sdb_object_t *
-sdb_host_do_clone(const sdb_object_t *obj)
-{
-	const sdb_host_t *host = (const sdb_host_t *)obj;
-	sdb_host_t *new;
+	char *value;
+} sdb_attribute_t;
+#define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
+#define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
 
-	new = SDB_HOST(sdb_object_create(obj->name, sdb_host_type));
-	if (! new)
-		return NULL;
+typedef struct {
+	store_obj_t super;
 
-	/* make sure these are initialized; else sdb_object_deref() might access
-	 * arbitrary memory in case of an error */
-	new->services = new->attributes = NULL;
+	int type;
+	sdb_llist_t *children;
 
-	if (host->attributes) {
-		new->attributes = sdb_llist_clone(host->attributes);
-		if (! new->attributes) {
-			sdb_object_deref(SDB_OBJ(new));
-			return NULL;
-		}
-	}
+	sdb_llist_t *attributes;
+} sdb_store_obj_t;
+#define SDB_STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
+#define SDB_CONST_STORE_OBJ(obj) ((const sdb_store_obj_t *)(obj))
 
-	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 */
+enum {
+	SDB_HOST = 1,
+	SDB_SERVICE,
+	SDB_ATTRIBUTE,
+};
+#define TYPE_TO_NAME(t) \
+	(((t) == SDB_HOST) ? "host" \
+		: ((t) == SDB_SERVICE) ? "service" \
+		: ((t) == SDB_ATTRIBUTE) ? "attribute" : "unknown")
+
+/* shortcuts for accessing the sdb_store_obj_t attributes
+ * of inheriting objects */
+#define _last_update super.last_update
 
 static int
-sdb_attr_init(sdb_object_t *obj, va_list ap)
+store_obj_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_ATTR(obj)->hostname = strdup(hostname);
-	SDB_ATTR(obj)->attr_value = strdup(value);
-	if ((! SDB_ATTR(obj)->hostname) || (! SDB_ATTR(obj)->attr_value))
-		return -1;
+	store_obj_t *sobj = STORE_OBJ(obj);
+	sobj->last_update = va_arg(ap, sdb_time_t);
 
-	SDB_ATTR(obj)->_last_update = sdb_gettime();
+	sobj->parent = NULL;
 	return 0;
-} /* sdb_attr_init */
+} /* store_obj_init */
 
 static void
-sdb_attr_destroy(sdb_object_t *obj)
+store_obj_destroy(sdb_object_t *obj)
 {
-	assert(obj);
+	const store_obj_t *sobj = STORE_OBJ(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 */
+	if (sobj->parent)
+		sdb_object_deref(SDB_OBJ(sobj->parent));
+} /* store_obj_destroy */
 
-static sdb_object_t *
-sdb_attr_clone(const sdb_object_t *obj)
+static int
+sdb_store_obj_init(sdb_object_t *obj, va_list ap)
 {
-	const sdb_attribute_t *attr = (const sdb_attribute_t *)obj;
-	sdb_attribute_t *new;
+	sdb_store_obj_t *sobj = SDB_STORE_OBJ(obj);
+	int ret;
 
-	new = SDB_ATTR(sdb_object_create(obj->name, sdb_attribute_type,
-				attr->hostname, attr->attr_value));
-	if (! new)
-		return NULL;
+	ret = store_obj_init(obj, ap);
+	if (ret)
+		return ret;
 
-	new->_last_update = attr->_last_update;
-	return SDB_OBJ(new);
-} /* sdb_attr_clone */
+	sobj->type = va_arg(ap, int);
 
-static int
-sdb_svc_init(sdb_object_t *obj, va_list ap)
-{
-	const char *hostname = va_arg(ap, const char *);
-
-	SDB_SVC(obj)->hostname = strdup(hostname);
-	if (! SDB_SVC(obj)->hostname)
+	sobj->children = sdb_llist_create();
+	if (! sobj->children)
+		return -1;
+	sobj->attributes = sdb_llist_create();
+	if (! sobj->attributes)
 		return -1;
-
-	SDB_SVC(obj)->_last_update = sdb_gettime();
-	/* ignore errors -> last_update will be updated later */
 	return 0;
-} /* sdb_svc_init */
+} /* sdb_store_obj_init */
 
 static void
-sdb_svc_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_SVC(obj)->hostname)
-		free(SDB_SVC(obj)->hostname);
-} /* sdb_svc_destroy */
+	store_obj_destroy(obj);
+
+	if (sobj->children)
+		sdb_llist_destroy(sobj->children);
+	if (sobj->attributes)
+		sdb_llist_destroy(sobj->attributes);
+} /* sdb_store_obj_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 char *value;
+	int ret;
 
-	new = SDB_SVC(sdb_object_create(obj->name, sdb_service_type,
-				svc->hostname));
-	if (! new)
-		return NULL;
+	ret = store_obj_init(obj, ap);
+	if (ret)
+		return ret;
+	value = va_arg(ap, const char *);
 
-	new->_last_update = svc->_last_update;
-	return SDB_OBJ(new);
-} /* sdb_svc_clone */
+	if (value) {
+		SDB_ATTR(obj)->value = strdup(value);
+		if (! SDB_ATTR(obj)->value)
+			return -1;
+	}
+	return 0;
+} /* sdb_attr_init */
 
-const sdb_type_t sdb_host_type = {
-	sizeof(sdb_host_t),
+static void
+sdb_attr_destroy(sdb_object_t *obj)
+{
+	assert(obj);
 
-	sdb_host_init,
-	sdb_host_destroy,
-	sdb_host_do_clone
-};
+	store_obj_destroy(obj);
 
-const sdb_type_t sdb_attribute_type = {
-	sizeof(sdb_attribute_t),
+	if (SDB_ATTR(obj)->value)
+		free(SDB_ATTR(obj)->value);
+} /* sdb_attr_destroy */
 
-	sdb_attr_init,
-	sdb_attr_destroy,
-	sdb_attr_clone
+static sdb_type_t sdb_store_obj_type = {
+	sizeof(sdb_store_obj_t),
+
+	sdb_store_obj_init,
+	sdb_store_obj_destroy
 };
 
-const sdb_type_t sdb_service_type = {
-	sizeof(sdb_service_t),
+static sdb_type_t sdb_attribute_type = {
+	sizeof(sdb_attribute_t),
 
-	sdb_svc_init,
-	sdb_svc_destroy,
-	sdb_svc_clone
+	sdb_attr_init,
+	sdb_attr_destroy
 };
 
 /*
- * public API
+ * private helper functions
  */
 
-int
-sdb_store_host(const char *name, sdb_time_t last_update)
+static sdb_store_obj_t *
+sdb_store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
 {
-	sdb_host_t *old;
+	sdb_llist_iter_t *iter;
 
-	char *cname;
-	int status = 0;
+	if (! l)
+		return NULL;
 
-	if (! name)
-		return -1;
+	iter = sdb_llist_get_iter(l);
+	if (! iter)
+		return NULL;
 
-	cname = sdb_plugin_cname(strdup(name));
-	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "store: strdup failed");
-		return -1;
+	while (sdb_llist_iter_has_next(iter)) {
+		sdb_store_obj_t *sobj = SDB_STORE_OBJ(sdb_llist_iter_get_next(iter));
+		assert(sobj);
+
+		if ((sobj->type == type)
+				&& (! strcasecmp(SDB_OBJ(sobj)->name, name))) {
+			sdb_llist_iter_destroy(iter);
+			return sobj;
+		}
+
+		sobj = sdb_store_lookup_in_list(sobj->children, type, name);
+		if (sobj) {
+			sdb_llist_iter_destroy(iter);
+			return sobj;
+		}
 	}
+	sdb_llist_iter_destroy(iter);
+	return NULL;
+} /* sdb_store_lookup_in_list */
+
+static sdb_store_obj_t *
+sdb_store_lookup(int type, const char *name)
+{
+	return sdb_store_lookup_in_list(obj_list, type, name);
+} /* sdb_store_lookup */
+
+/* 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,
+		store_obj_t **updated_obj)
+{
+	char *parent_cname = NULL, *cname = NULL;
+
+	sdb_llist_t *parent_list;
+	store_obj_t *old;
+	int status = 0;
 
-	last_update = 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 = sdb_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;
+		}
 
-	old = SDB_HOST(sdb_llist_search_by_name(host_list, cname));
+		if (type == SDB_ATTRIBUTE)
+			parent_list = parent->attributes;
+		else
+			parent_list = parent->children;
+	}
+
+	/* TODO: only look into direct children? */
+	if (type == SDB_HOST)
+		/* make sure that each host is unique */
+		old = STORE_OBJ(sdb_store_lookup_in_list(obj_list, type, name));
+	else if (type == SDB_ATTRIBUTE)
+		old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
+	else
+		old = STORE_OBJ(sdb_store_lookup_in_list(parent_list, type, 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
+					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;
+			old->last_update = last_update;
 		}
+
+		if (updated_obj)
+			*updated_obj = old;
 	}
 	else {
-		sdb_host_t *new = SDB_HOST(sdb_object_create(name, sdb_host_type));
+		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,
+						last_update, NULL));
+		else
+			new = STORE_OBJ(sdb_object_create(name, sdb_store_obj_type,
+						last_update, type));
+
 		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",
+					TYPE_TO_NAME(type), name,
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			pthread_rwlock_unlock(&host_lock);
+			free(parent_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),
+		/* 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));
+
+		if (updated_obj)
+			*updated_obj = new;
 	}
+	free(parent_cname);
+	free(cname);
+	return status;
+} /* sdb_store_obj */
 
-	pthread_rwlock_unlock(&host_lock);
+/*
+ * public API
+ */
+
+int
+sdb_store_host(const char *name, sdb_time_t last_update)
+{
+	int status;
+
+	if (! name)
+		return -1;
+
+	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_host */
 
 _Bool
 sdb_store_has_host(const char *name)
 {
-	sdb_host_t *host;
+	sdb_store_obj_t *host;
 
 	if (! name)
 		return NULL;
 
-	host = SDB_HOST(sdb_llist_search_by_name(host_list, name));
+	host = sdb_store_lookup(SDB_HOST, name);
 	return host != NULL;
 } /* sdb_store_has_host */
 
 int
-sdb_store_attribute(const sdb_attribute_t *attr)
+sdb_store_attribute(const char *hostname, const char *key, const char *value,
+		sdb_time_t last_update)
 {
-	sdb_host_t *host;
-	sdb_attribute_t *old;
-	sdb_time_t last_update;
-
-	int status = 0;
-
-	if (! attr)
-		return -1;
+	int status;
 
-	last_update = attr->_last_update;
-	if (last_update <= 0)
-		last_update = sdb_gettime();
+	store_obj_t *updated_attr = NULL;
 
-	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;
+	pthread_rwlock_wrlock(&obj_lock);
+	status = store_obj(/* parent = */ SDB_HOST, hostname,
+			/* stored object = */ SDB_ATTRIBUTE, key, last_update,
+			&updated_attr);
+
+	if (status >= 0) {
+		assert(updated_attr);
+		SDB_ATTR(updated_attr)->value = strdup(value);
+		if (! SDB_ATTR(updated_attr)->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);
+	pthread_rwlock_unlock(&obj_lock);
 	return status;
 } /* sdb_store_attribute */
 
 int
-sdb_store_service(const sdb_service_t *svc)
+sdb_store_service(const char *hostname, const char *name,
+		sdb_time_t last_update)
 {
-	sdb_host_t *host;
-	sdb_service_t *old;
-	sdb_time_t last_update;
-
-	int status = 0;
-
-	if (! svc)
-		return -1;
-
-	last_update = svc->_last_update;
-	if (last_update <= 0)
-		last_update = sdb_gettime();
+	int status;
 
-	if (! host_list)
+	if ((! hostname) || (! name))
 		return -1;
 
-	pthread_rwlock_wrlock(&host_lock);
-
-	host = SDB_HOST(sdb_llist_search_by_name(host_list, svc->hostname));
-	if (! host) {
-		pthread_rwlock_unlock(&host_lock);
-		return -1;
-	}
-
-	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));
-	}
-
-	pthread_rwlock_unlock(&host_lock);
+	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 */
 
-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 */
-
+/* TODO: actually support hierarchical data */
 int
-sdb_store_dump(FILE *fh)
+sdb_store_tojson(sdb_strbuf_t *buf)
 {
 	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;
 	}
 
+	sdb_strbuf_append(buf, "{\"hosts\":[");
+
 	while (sdb_llist_iter_has_next(host_iter)) {
-		sdb_host_t *host = SDB_HOST(sdb_llist_iter_get_next(host_iter));
+		sdb_store_obj_t *host = SDB_STORE_OBJ(sdb_llist_iter_get_next(host_iter));
 		sdb_llist_iter_t *svc_iter;
 		sdb_llist_iter_t *attr_iter;
 
@@ -491,17 +481,21 @@ sdb_store_dump(FILE *fh)
 			snprintf(time_str, sizeof(time_str), "<error>");
 		time_str[sizeof(time_str) - 1] = '\0';
 
-		fprintf(fh, "Host '%s' (last updated: %s):\n",
+		sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+				"\"last_update\": \"%s\", "
+				"\"attributes\": [",
 				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_log(SDB_LOG_ERR, "store: Failed to retrieve attributes: %s\n",
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			continue;
+			sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve "
+					"attributes: %s\"}", errbuf);
 		}
 
+		/* has_next returns false if the iterator is NULL */
 		while (sdb_llist_iter_has_next(attr_iter)) {
 			sdb_attribute_t *attr = SDB_ATTR(sdb_llist_iter_get_next(attr_iter));
 			assert(attr);
@@ -511,22 +505,25 @@ sdb_store_dump(FILE *fh)
 				snprintf(time_str, sizeof(time_str), "<error>");
 			time_str[sizeof(time_str) - 1] = '\0';
 
-			fprintf(fh, "\tAttribute '%s' -> '%s' (last updated: %s)\n",
-					SDB_OBJ(attr)->name, attr->attr_value, time_str);
+			sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+					"\"value\": \"%s\", \"last_update\": \"%s\"},",
+					SDB_OBJ(attr)->name, attr->value, time_str);
 		}
 
 		sdb_llist_iter_destroy(attr_iter);
+		sdb_strbuf_append(buf, "], \"services\": [");
 
-		svc_iter = sdb_llist_get_iter(host->services);
+		svc_iter = sdb_llist_get_iter(host->children);
 		if (! svc_iter) {
 			char errbuf[1024];
-			fprintf(fh, "Failed to retrieve services: %s\n",
+			sdb_log(SDB_LOG_ERR, "store: Failed to retrieve services: %s\n",
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
-			continue;
+			sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve "
+					"services: %s\"}", errbuf);
 		}
 
 		while (sdb_llist_iter_has_next(svc_iter)) {
-			sdb_service_t *svc = SDB_SVC(sdb_llist_iter_get_next(svc_iter));
+			sdb_store_obj_t *svc = SDB_STORE_OBJ(sdb_llist_iter_get_next(svc_iter));
 			assert(svc);
 
 			if (! sdb_strftime(time_str, sizeof(time_str),
@@ -534,17 +531,21 @@ sdb_store_dump(FILE *fh)
 				snprintf(time_str, sizeof(time_str), "<error>");
 			time_str[sizeof(time_str) - 1] = '\0';
 
-			fprintf(fh, "\tService '%s' (last updated: %s)\n",
+			sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+					"\"last_update\": \"%s\"},",
 					SDB_OBJ(svc)->name, time_str);
 		}
 
 		sdb_llist_iter_destroy(svc_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 : */