X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=5a00b6c3cd49a7bba31cb8755bf4bda73f9564f8;hb=6fbccd38ba921b0f08b4a38ef3568bd9ca12fcd5;hp=1b8243b091d4149a98dabea39927b5eb661b122c;hpb=98211ed75b3ce19225cb6d6628b0abfa669823ac;p=sysdb.git

diff --git a/src/core/store.c b/src/core/store.c
index 1b8243b..5a00b6c 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -32,8 +32,8 @@
 #include "sysdb.h"
 #include "core/store-private.h"
 #include "core/plugin.h"
+#include "utils/avltree.h"
 #include "utils/error.h"
-#include "utils/llist.h"
 
 #include <assert.h>
 
@@ -49,7 +49,7 @@
  * private variables
  */
 
-static sdb_llist_t *host_list = NULL;
+static sdb_avltree_t *hosts = NULL;
 static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
 
 /*
@@ -69,6 +69,8 @@ store_obj_init(sdb_object_t *obj, va_list ap)
 
 	sobj->last_update = va_arg(ap, sdb_time_t);
 	sobj->interval = 0;
+	sobj->backends = NULL;
+	sobj->backends_num = 0;
 	sobj->parent = NULL;
 	return 0;
 } /* store_obj_init */
@@ -76,7 +78,14 @@ store_obj_init(sdb_object_t *obj, va_list ap)
 static void
 store_obj_destroy(sdb_object_t *obj)
 {
-	const sdb_store_obj_t *sobj = STORE_CONST_OBJ(obj);
+	sdb_store_obj_t *sobj = STORE_OBJ(obj);
+	size_t i;
+
+	for (i = 0; i < sobj->backends_num; ++i)
+		free(sobj->backends[i]);
+	free(sobj->backends);
+	sobj->backends = NULL;
+	sobj->backends_num = 0;
 
 	if (sobj->parent)
 		sdb_object_deref(SDB_OBJ(sobj->parent));
@@ -93,10 +102,10 @@ sdb_host_init(sdb_object_t *obj, va_list ap)
 	if (ret)
 		return ret;
 
-	sobj->services = sdb_llist_create();
+	sobj->services = sdb_avltree_create();
 	if (! sobj->services)
 		return -1;
-	sobj->attributes = sdb_llist_create();
+	sobj->attributes = sdb_avltree_create();
 	if (! sobj->attributes)
 		return -1;
 	return 0;
@@ -111,9 +120,9 @@ sdb_host_destroy(sdb_object_t *obj)
 	store_obj_destroy(obj);
 
 	if (sobj->services)
-		sdb_llist_destroy(sobj->services);
+		sdb_avltree_destroy(sobj->services);
 	if (sobj->attributes)
-		sdb_llist_destroy(sobj->attributes);
+		sdb_avltree_destroy(sobj->attributes);
 } /* sdb_host_destroy */
 
 static int
@@ -127,7 +136,7 @@ sdb_service_init(sdb_object_t *obj, va_list ap)
 	if (ret)
 		return ret;
 
-	sobj->attributes = sdb_llist_create();
+	sobj->attributes = sdb_avltree_create();
 	if (! sobj->attributes)
 		return -1;
 	return 0;
@@ -142,7 +151,7 @@ sdb_service_destroy(sdb_object_t *obj)
 	store_obj_destroy(obj);
 
 	if (sobj->attributes)
-		sdb_llist_destroy(sobj->attributes);
+		sdb_avltree_destroy(sobj->attributes);
 } /* sdb_service_destroy */
 
 static int
@@ -198,89 +207,66 @@ static sdb_type_t sdb_attribute_type = {
 static sdb_host_t *
 lookup_host(const char *name)
 {
-	return HOST(sdb_llist_search_by_name(host_list, name));
+	return HOST(sdb_avltree_lookup(hosts, name));
 } /* lookup_host */
 
-/* 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)
+record_backend(sdb_store_obj_t *obj)
 {
-	char *host_cname = NULL, *cname = NULL;
-
-	sdb_llist_t *parent_list;
-	sdb_store_obj_t *old;
-	int status = 0;
+	const sdb_plugin_info_t *info;
+	char **tmp;
+	size_t i;
 
-	if (last_update <= 0)
-		last_update = sdb_gettime();
+	info = sdb_plugin_current();
+	if (! info)
+		return 0;
 
-	assert((type == 0)
-			|| (type == SDB_HOST)
-			|| (type == SDB_SERVICE)
-			|| (type == SDB_ATTRIBUTE));
+	for (i = 0; i < obj->backends_num; ++i)
+		if (!strcasecmp(obj->backends[i], info->plugin_name))
+			return 0;
 
-	assert(hostname || (type == SDB_HOST));
-	assert((! hostname)
-			|| (type == SDB_SERVICE)
-			|| (type == SDB_ATTRIBUTE));
-
-	if (! host_list)
-		if (! (host_list = sdb_llist_create()))
-			return -1;
-	parent_list = host_list;
+	tmp = realloc(obj->backends,
+			(obj->backends_num + 1) * sizeof(*obj->backends));
+	if (! tmp)
+		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;
-	}
+	obj->backends = tmp;
+	obj->backends[obj->backends_num] = strdup(info->plugin_name);
+	if (! obj->backends[obj->backends_num])
+		return -1;
 
-	if (hostname) {
-		sdb_host_t *host;
+	++obj->backends_num;
+	return 0;
+} /* record_backend */
 
-		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;
-		}
+static int
+store_obj(sdb_avltree_t *parent_tree, int type, const char *name,
+		sdb_time_t last_update, sdb_store_obj_t **updated_obj)
+{
+	sdb_store_obj_t *old, *new;
+	int status = 0;
 
-		if (type == SDB_ATTRIBUTE)
-			parent_list = host->attributes;
-		else
-			parent_list = host->services;
-	}
+	assert(parent_tree);
 
-	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 (last_update <= 0)
+		last_update = sdb_gettime();
 
+	old = STORE_OBJ(sdb_avltree_lookup(parent_tree, name));
 	if (old) {
 		if (old->last_update > last_update) {
 			sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
-					"value too old (%"PRIscTIME" < %"PRIscTIME")",
+					"value too old (%"PRIsdbTIME" < %"PRIsdbTIME")",
 					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 if (old->last_update == last_update) {
+			/* don't report an error and also don't even log this to avoid
+			 * excessive noise on high sampling frequencies */
+			status = 1;
+		}
 		else {
 			sdb_time_t interval = last_update - old->last_update;
 			old->last_update = last_update;
@@ -293,12 +279,10 @@ store_obj(const char *hostname, int type, const char *name,
 			}
 		}
 
-		if (updated_obj)
-			*updated_obj = old;
+		new = old;
+		sdb_object_deref(SDB_OBJ(old));
 	}
 	else {
-		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,
@@ -310,48 +294,136 @@ store_obj(const char *hostname, int type, const char *name,
 			new = STORE_OBJ(sdb_object_create(name, t, type, last_update));
 		}
 
-		if (! new) {
+		if (new) {
+			status = sdb_avltree_insert(parent_tree, SDB_OBJ(new));
+
+			/* pass control to the tree or destroy in case of an error */
+			sdb_object_deref(SDB_OBJ(new));
+		}
+		else {
 			char errbuf[1024];
 			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)));
-			free(host_cname);
-			free(cname);
-			return -1;
+			status = -1;
 		}
+	}
 
-		status = sdb_llist_insert_sorted(parent_list, SDB_OBJ(new),
-				sdb_object_cmp_by_name);
+	if (status < 0)
+		return status;
+	assert(new);
 
-		/* pass control to the list or destroy in case of an error */
-		sdb_object_deref(SDB_OBJ(new));
+	if (updated_obj)
+		*updated_obj = new;
 
-		if (updated_obj)
-			*updated_obj = new;
-	}
-	free(host_cname);
-	free(cname);
+	if (record_backend(new))
+		return -1;
 	return status;
 } /* store_obj */
 
+static int
+store_attr(sdb_avltree_t *attributes, const char *key, const sdb_data_t *value,
+		sdb_time_t last_update)
+{
+	sdb_store_obj_t *attr = NULL;
+	int status;
+
+	status = store_obj(attributes, SDB_ATTRIBUTE, key, last_update, &attr);
+	if (status)
+		return status;
+
+	/* don't update unchanged values */
+	if (! sdb_data_cmp(&ATTR(attr)->value, value))
+		return status;
+
+	assert(attr);
+	if (sdb_data_copy(&ATTR(attr)->value, value))
+		return -1;
+	return status;
+} /* store_attr */
+
+/* The host_lock has to be acquired before calling this function. */
+static sdb_avltree_t *
+get_host_children(const char *hostname, int type)
+{
+	char *cname = NULL;
+	sdb_host_t *host;
+
+	assert(hostname);
+	assert((type == SDB_SERVICE) || (type == SDB_ATTRIBUTE));
+
+	if (! hosts)
+		return NULL;
+
+	cname = sdb_plugin_cname(strdup(hostname));
+	if (! cname) {
+		sdb_log(SDB_LOG_ERR, "store: strdup failed");
+		return NULL;
+	}
+
+	host = lookup_host(cname);
+	free(cname);
+	if (! host)
+		return NULL;
+
+	sdb_object_deref(SDB_OBJ(host));
+	if (type == SDB_ATTRIBUTE)
+		return host->attributes;
+	else
+		return host->services;
+} /* get_host_children */
+
 /*
- * store_obj_tojson serializes attribute / service objects to JSON.
+ * 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_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
+store_common_tojson(sdb_store_obj_t *obj, sdb_strbuf_t *buf)
 {
-	sdb_llist_iter_t *iter;
 	char time_str[64];
 	char interval_str[64];
+	size_t i;
+
+	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\", \"backends\": [",
+			time_str, interval_str);
+
+	for (i = 0; i < obj->backends_num; ++i) {
+		sdb_strbuf_append(buf, "\"%s\"", obj->backends[i]);
+		if (i < obj->backends_num - 1)
+			sdb_strbuf_append(buf, ",");
+	}
+	sdb_strbuf_append(buf, "]");
+} /* 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_avltree_t *tree, int type, sdb_strbuf_t *buf,
+		sdb_store_matcher_t *filter, int flags)
+{
+	sdb_avltree_iter_t *iter;
 
 	assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
 
 	sdb_strbuf_append(buf, "[");
-
-	iter = sdb_llist_get_iter(list);
+	iter = sdb_avltree_get_iter(tree);
 	if (! iter) {
 		char errbuf[1024];
 		sdb_log(SDB_LOG_ERR, "store: Failed to retrieve %ss: %s\n",
@@ -362,39 +434,36 @@ store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
 	}
 
 	/* 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));
+	while (sdb_avltree_iter_has_next(iter)) {
+		sdb_store_obj_t *sobj = STORE_OBJ(sdb_avltree_iter_get_next(iter));
 		assert(sobj);
 		assert(sobj->type == type);
 
-		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';
-
-		if (! sdb_strfinterval(interval_str, sizeof(interval_str),
-					sobj->interval))
-			snprintf(interval_str, sizeof(interval_str), "<error>");
-		interval_str[sizeof(interval_str) - 1] = '\0';
+		if (filter && (! sdb_store_matcher_matches(filter, sobj, NULL)))
+			continue;
 
 		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, \"last_update\": \"%s\", "
-					"\"update_interval\": \"%s\"}", tmp, time_str,
-					interval_str);
+			sdb_strbuf_append(buf, "\"value\": %s, ", tmp);
 		}
-		else
-			sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
-					"\"update_interval\": \"%s\"}", time_str, interval_str);
+		store_common_tojson(sobj, buf);
 
-		if (sdb_llist_iter_has_next(iter))
+		if ((sobj->type == SDB_SERVICE)
+				&& (! (flags & SDB_SKIP_ATTRIBUTES))) {
+			sdb_strbuf_append(buf, ", \"attributes\": ");
+			store_obj_tojson(SVC(sobj)->attributes, SDB_ATTRIBUTE,
+					buf, filter, flags);
+		}
+		sdb_strbuf_append(buf, "}");
+
+		if (sdb_avltree_iter_has_next(iter))
 			sdb_strbuf_append(buf, ",");
 	}
 
-	sdb_llist_iter_destroy(iter);
+	sdb_avltree_iter_destroy(iter);
 	sdb_strbuf_append(buf, "]");
 } /* store_obj_tojson */
 
@@ -405,23 +474,35 @@ store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
 void
 sdb_store_clear(void)
 {
-	sdb_llist_destroy(host_list);
-	host_list = NULL;
+	sdb_avltree_destroy(hosts);
+	hosts = NULL;
 } /* sdb_store_clear */
 
 int
 sdb_store_host(const char *name, sdb_time_t last_update)
 {
-	int status;
+	char *cname = NULL;
+	int status = 0;
 
 	if (! name)
 		return -1;
 
+	cname = sdb_plugin_cname(strdup(name));
+	if (! cname) {
+		sdb_log(SDB_LOG_ERR, "store: strdup failed");
+		return -1;
+	}
+
 	pthread_rwlock_wrlock(&host_lock);
-	status = store_obj(/* hostname = */ NULL,
-			/* stored object = */ SDB_HOST, name, last_update,
-			/* updated_obj = */ NULL);
+	if (! hosts)
+		if (! (hosts = sdb_avltree_create()))
+			status = -1;
+
+	if (! status)
+		status = store_obj(hosts, SDB_HOST, cname, last_update, NULL);
 	pthread_rwlock_unlock(&host_lock);
+
+	free(cname);
 	return status;
 } /* sdb_store_host */
 
@@ -449,7 +530,6 @@ sdb_store_get_host(const char *name)
 	if (! host)
 		return NULL;
 
-	sdb_object_ref(SDB_OBJ(host));
 	return STORE_OBJ(host);
 } /* sdb_store_get_host */
 
@@ -458,27 +538,23 @@ sdb_store_attribute(const char *hostname,
 		const char *key, const sdb_data_t *value,
 		sdb_time_t last_update)
 {
-	int status;
-
-	sdb_store_obj_t *updated_attr = NULL;
+	sdb_avltree_t *attrs;
+	int status = 0;
 
 	if ((! hostname) || (! key))
 		return -1;
 
 	pthread_rwlock_wrlock(&host_lock);
-	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;
-		}
+	attrs = get_host_children(hostname, SDB_ATTRIBUTE);
+	if (! attrs) {
+		sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
+				"host '%s' not found", key, hostname);
+		status = -1;
 	}
 
+	if (! status)
+		status = store_attr(attrs, key, value, last_update);
+
 	pthread_rwlock_unlock(&host_lock);
 	return status;
 } /* sdb_store_attribute */
@@ -487,53 +563,111 @@ int
 sdb_store_service(const char *hostname, const char *name,
 		sdb_time_t last_update)
 {
-	int status;
+	sdb_avltree_t *services;
+
+	int status = 0;
 
 	if ((! hostname) || (! name))
 		return -1;
 
 	pthread_rwlock_wrlock(&host_lock);
-	status = store_obj(hostname,
-			/* stored object = */ SDB_SERVICE, name, last_update,
-			/* updated obj = */ NULL);
+	services = get_host_children(hostname, SDB_SERVICE);
+	if (! services) {
+		sdb_log(SDB_LOG_ERR, "store: Failed to store service '%s' - "
+				"host '%s' not found", name, hostname);
+		status = -1;
+	}
+
+	if (! status)
+		status = store_obj(services, SDB_SERVICE, name, last_update, NULL);
 	pthread_rwlock_unlock(&host_lock);
 	return status;
 } /* sdb_store_service */
 
 int
-sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf, int flags)
+sdb_store_service_attr(const char *hostname, const char *service,
+		const char *key, const sdb_data_t *value, sdb_time_t last_update)
 {
-	sdb_host_t *host;
-	char time_str[64];
-	char interval_str[64];
+	sdb_avltree_t *services;
+	sdb_service_t *svc;
+	int status = 0;
 
-	if ((! h) || (h->type != SDB_HOST) || (! buf))
+	if ((! hostname) || (! service) || (! key))
 		return -1;
 
-	host = HOST(h);
+	pthread_rwlock_wrlock(&host_lock);
+	services = get_host_children(hostname, SDB_SERVICE);
+	if (! services) {
+		sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' "
+				"for service '%s' - host '%ss' not found",
+				key, service, hostname);
+		pthread_rwlock_unlock(&host_lock);
+		return -1;
+	}
 
-	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';
+	svc = SVC(sdb_avltree_lookup(services, service));
+	if (! svc) {
+		sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
+				"service '%s/%s' not found", key, hostname, service);
+		status = -1;
+	}
 
-	if (! sdb_strfinterval(interval_str, sizeof(interval_str),
-				host->_interval))
-		snprintf(interval_str, sizeof(interval_str), "<error>");
-	interval_str[sizeof(interval_str) - 1] = '\0';
+	if (! status)
+		status = store_attr(svc->attributes, key, value, last_update);
+
+	sdb_object_deref(SDB_OBJ(svc));
+	pthread_rwlock_unlock(&host_lock);
+	return status;
+} /* sdb_store_service_attr */
 
-	sdb_strbuf_append(buf, "{\"name\": \"%s\", "
-			"\"last_update\": \"%s\", \"update_interval\": \"%s\"",
-			SDB_OBJ(host)->name, time_str, interval_str);
+int
+sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res)
+{
+	if ((! obj) || (! res))
+		return -1;
+
+	switch (field) {
+		case SDB_FIELD_LAST_UPDATE:
+			res->type = SDB_TYPE_DATETIME;
+			res->data.datetime = obj->last_update;
+			break;
+		case SDB_FIELD_AGE:
+			res->type = SDB_TYPE_DATETIME;
+			res->data.datetime = sdb_gettime() - obj->last_update;
+			break;
+		case SDB_FIELD_INTERVAL:
+			res->type = SDB_TYPE_DATETIME;
+			res->data.datetime = obj->interval;
+			break;
+		case SDB_FIELD_BACKEND:
+			/* TODO: add support for storing array values in a data object
+			 * for now, fall thru to the error case */
+		default:
+			return -1;
+	}
+	return 0;
+} /* sdb_store_get_field */
+
+int
+sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf,
+		sdb_store_matcher_t *filter, int flags)
+{
+	sdb_host_t *host = HOST(h);
+
+	if ((! h) || (h->type != SDB_HOST) || (! buf))
+		return -1;
+
+	sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(host)->name);
+	store_common_tojson(h, buf);
 
 	if (! (flags & SDB_SKIP_ATTRIBUTES)) {
 		sdb_strbuf_append(buf, ", \"attributes\": ");
-		store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf);
+		store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf, filter, flags);
 	}
 
 	if (! (flags & SDB_SKIP_SERVICES)) {
 		sdb_strbuf_append(buf, ", \"services\": ");
-		store_obj_tojson(host->services, SDB_SERVICE, buf);
+		store_obj_tojson(host->services, SDB_SERVICE, buf, filter, flags);
 	}
 
 	sdb_strbuf_append(buf, "}");
@@ -541,16 +675,17 @@ sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf, int flags)
 } /* sdb_store_host_tojson */
 
 int
-sdb_store_tojson(sdb_strbuf_t *buf, int flags)
+sdb_store_tojson(sdb_strbuf_t *buf, sdb_store_matcher_t *filter, int flags)
 {
-	sdb_llist_iter_t *host_iter;
+	sdb_avltree_iter_t *host_iter;
+	size_t len;
 
 	if (! buf)
 		return -1;
 
 	pthread_rwlock_rdlock(&host_lock);
 
-	host_iter = sdb_llist_get_iter(host_list);
+	host_iter = sdb_avltree_get_iter(hosts);
 	if (! host_iter) {
 		pthread_rwlock_unlock(&host_lock);
 		return -1;
@@ -558,20 +693,27 @@ sdb_store_tojson(sdb_strbuf_t *buf, int flags)
 
 	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));
+	len = sdb_strbuf_len(buf);
+	while (sdb_avltree_iter_has_next(host_iter)) {
+		sdb_store_obj_t *host;
+
+		host = STORE_OBJ(sdb_avltree_iter_get_next(host_iter));
 		assert(host);
 
-		if (sdb_store_host_tojson(host, buf, flags))
-			return -1;
+		if (filter && (! sdb_store_matcher_matches(filter, host, NULL)))
+			continue;
 
-		if (sdb_llist_iter_has_next(host_iter))
+		if (sdb_strbuf_len(buf) > len)
 			sdb_strbuf_append(buf, ",");
+		len = sdb_strbuf_len(buf);
+
+		if (sdb_store_host_tojson(host, buf, filter, flags))
+			return -1;
 	}
 
 	sdb_strbuf_append(buf, "]}");
 
-	sdb_llist_iter_destroy(host_iter);
+	sdb_avltree_iter_destroy(host_iter);
 	pthread_rwlock_unlock(&host_lock);
 	return 0;
 } /* sdb_store_tojson */
@@ -580,18 +722,20 @@ sdb_store_tojson(sdb_strbuf_t *buf, int flags)
 int
 sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
 {
-	sdb_llist_iter_t *host_iter;
+	sdb_avltree_iter_t *host_iter;
 	int status = 0;
 
 	pthread_rwlock_rdlock(&host_lock);
 
-	host_iter = sdb_llist_get_iter(host_list);
+	host_iter = sdb_avltree_get_iter(hosts);
 	if (! host_iter)
 		status = -1;
 
 	/* 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));
+	while (sdb_avltree_iter_has_next(host_iter)) {
+		sdb_store_obj_t *host;
+
+		host = STORE_OBJ(sdb_avltree_iter_get_next(host_iter));
 		assert(host);
 
 		if (cb(host, user_data)) {
@@ -600,7 +744,7 @@ sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
 		}
 	}
 
-	sdb_llist_iter_destroy(host_iter);
+	sdb_avltree_iter_destroy(host_iter);
 	pthread_rwlock_unlock(&host_lock);
 	return status;
 } /* sdb_store_iterate */