X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=ab37e689641ec52b42f844bb5f1f1d3cd6236d63;hp=866661a59ee963758db185ab5f3db8b2d7a54710;hb=da52b4da948c741d20c7a3995ce5d133af377def;hpb=dd55452b789eca1b561ef456013eecf53afc468f

diff --git a/src/core/store.c b/src/core/store.c
index 866661a..ab37e68 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>
 
@@ -43,13 +43,14 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <math.h>
 #include <pthread.h>
 
 /*
  * private variables
  */
 
-static sdb_llist_t *host_list = NULL;
+static sdb_avltree_t *hosts = NULL;
 static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
 
 /*
@@ -58,6 +59,7 @@ static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
 
 static sdb_type_t sdb_host_type;
 static sdb_type_t sdb_service_type;
+static sdb_type_t sdb_metric_type;
 static sdb_type_t sdb_attribute_type;
 
 static int
@@ -87,8 +89,10 @@ store_obj_destroy(sdb_object_t *obj)
 	sobj->backends = NULL;
 	sobj->backends_num = 0;
 
-	if (sobj->parent)
-		sdb_object_deref(SDB_OBJ(sobj->parent));
+	// We don't currently keep an extra reference for parent objects to
+	// avoid circular self-references which are not handled correctly by
+	// the ref-count base management layer.
+	//sdb_object_deref(SDB_OBJ(sobj->parent));
 } /* store_obj_destroy */
 
 static int
@@ -102,10 +106,13 @@ 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->metrics = sdb_avltree_create();
+	if (! sobj->metrics)
+		return -1;
+	sobj->attributes = sdb_avltree_create();
 	if (! sobj->attributes)
 		return -1;
 	return 0;
@@ -120,9 +127,11 @@ 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->metrics)
+		sdb_avltree_destroy(sobj->metrics);
 	if (sobj->attributes)
-		sdb_llist_destroy(sobj->attributes);
+		sdb_avltree_destroy(sobj->attributes);
 } /* sdb_host_destroy */
 
 static int
@@ -136,7 +145,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;
@@ -151,9 +160,45 @@ 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
+sdb_metric_init(sdb_object_t *obj, va_list ap)
+{
+	sdb_metric_t *sobj = METRIC(obj);
+	int ret;
+
+	/* this will consume the first argument (type) of ap */
+	ret = store_obj_init(obj, ap);
+	if (ret)
+		return ret;
+
+	sobj->attributes = sdb_avltree_create();
+	if (! sobj->attributes)
+		return -1;
+
+	sobj->store.type = sobj->store.id = NULL;
+	return 0;
+} /* sdb_metric_init */
+
+static void
+sdb_metric_destroy(sdb_object_t *obj)
+{
+	sdb_metric_t *sobj = METRIC(obj);
+	assert(obj);
+
+	store_obj_destroy(obj);
+
+	if (sobj->attributes)
+		sdb_avltree_destroy(sobj->attributes);
+
+	if (sobj->store.type)
+		free(sobj->store.type);
+	if (sobj->store.id)
+		free(sobj->store.id);
+} /* sdb_metric_destroy */
+
 static int
 sdb_attr_init(sdb_object_t *obj, va_list ap)
 {
@@ -194,6 +239,12 @@ static sdb_type_t sdb_service_type = {
 	sdb_service_destroy
 };
 
+static sdb_type_t sdb_metric_type = {
+	sizeof(sdb_metric_t),
+	sdb_metric_init,
+	sdb_metric_destroy
+};
+
 static sdb_type_t sdb_attribute_type = {
 	sizeof(sdb_attribute_t),
 	sdb_attr_init,
@@ -205,9 +256,25 @@ static sdb_type_t sdb_attribute_type = {
  */
 
 static sdb_host_t *
-lookup_host(const char *name)
+lookup_host(const char *name, bool canonicalize)
 {
-	return HOST(sdb_llist_search_by_name(host_list, name));
+	sdb_host_t *host;
+	char *cname;
+
+	assert(name);
+	if (! canonicalize)
+		return HOST(sdb_avltree_lookup(hosts, name));
+
+	cname = strdup(name);
+	cname = sdb_plugin_cname(cname);
+	if (! cname) {
+		sdb_log(SDB_LOG_ERR, "store: strdup failed");
+		return NULL;
+	}
+
+	host = HOST(sdb_avltree_lookup(hosts, cname));
+	free(cname);
+	return host;
 } /* lookup_host */
 
 static int
@@ -240,25 +307,34 @@ record_backend(sdb_store_obj_t *obj)
 } /* record_backend */
 
 static int
-store_obj(sdb_llist_t *parent_list, int type, const char *name,
-		sdb_time_t last_update, sdb_store_obj_t **updated_obj)
+store_obj(sdb_store_obj_t *parent, 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;
 
-	assert(parent_list);
+	assert(parent_tree);
 
-	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;
@@ -272,6 +348,7 @@ store_obj(sdb_llist_t *parent_list, int type, const char *name,
 		}
 
 		new = old;
+		sdb_object_deref(SDB_OBJ(old));
 	}
 	else {
 		if (type == SDB_ATTRIBUTE) {
@@ -281,15 +358,18 @@ store_obj(sdb_llist_t *parent_list, int type, const char *name,
 		}
 		else {
 			sdb_type_t t;
-			t = type == SDB_HOST ? sdb_host_type : sdb_service_type;
+			t = type == SDB_HOST
+				? sdb_host_type
+				: type == SDB_SERVICE
+					? sdb_service_type
+					: sdb_metric_type;
 			new = STORE_OBJ(sdb_object_create(name, t, type, last_update));
 		}
 
 		if (new) {
-			status = sdb_llist_insert_sorted(parent_list, SDB_OBJ(new),
-					sdb_object_cmp_by_name);
+			status = sdb_avltree_insert(parent_tree, SDB_OBJ(new));
 
-			/* pass control to the list or destroy in case of an error */
+			/* pass control to the tree or destroy in case of an error */
 			sdb_object_deref(SDB_OBJ(new));
 		}
 		else {
@@ -305,6 +385,14 @@ store_obj(sdb_llist_t *parent_list, int type, const char *name,
 		return status;
 	assert(new);
 
+	if (new->parent != parent) {
+		// Avoid circular self-references which are not handled
+		// correctly by the ref-count based management layer.
+		//sdb_object_deref(SDB_OBJ(new->parent));
+		//sdb_object_ref(SDB_OBJ(parent));
+		new->parent = parent;
+	}
+
 	if (updated_obj)
 		*updated_obj = new;
 
@@ -313,136 +401,105 @@ store_obj(sdb_llist_t *parent_list, int type, const char *name,
 	return status;
 } /* store_obj */
 
-/* The host_lock has to be acquired before calling this function. */
 static int
-store_host_obj(const char *hostname, int type, const char *name,
-		sdb_time_t last_update, sdb_store_obj_t **updated_obj)
+store_attr(sdb_store_obj_t *parent, sdb_avltree_t *attributes,
+		const char *key, const sdb_data_t *value, sdb_time_t last_update)
 {
-	char *cname = NULL;
-	sdb_host_t *host;
-	sdb_llist_t *parent_list;
-
-	int status = 0;
+	sdb_store_obj_t *attr = NULL;
+	int status;
 
-	if (last_update <= 0)
-		last_update = sdb_gettime();
+	status = store_obj(parent, attributes, SDB_ATTRIBUTE,
+			key, last_update, &attr);
+	if (status)
+		return status;
 
-	assert(hostname);
-	assert((type == SDB_SERVICE) || (type == SDB_ATTRIBUTE));
+	/* don't update unchanged values */
+	if (! sdb_data_cmp(&ATTR(attr)->value, value))
+		return status;
 
-	if (! host_list)
+	assert(attr);
+	if (sdb_data_copy(&ATTR(attr)->value, value))
 		return -1;
+	return status;
+} /* store_attr */
 
-	cname = sdb_plugin_cname(strdup(hostname));
-	if (! cname) {
-		sdb_log(SDB_LOG_ERR, "store: strdup failed");
-		return -1;
-	}
+/* The host_lock has to be acquired before calling this function. */
+static sdb_avltree_t *
+get_host_children(sdb_host_t *host, int type)
+{
+	if ((type != SDB_SERVICE) && (type != SDB_METRIC)
+			&& (type != SDB_ATTRIBUTE))
+		return NULL;
 
-	host = lookup_host(cname);
-	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(cname);
-		return -1;
-	}
+	if (! host)
+		return NULL;
 
 	if (type == SDB_ATTRIBUTE)
-		parent_list = host->attributes;
+		return host->attributes;
+	else if (type == SDB_METRIC)
+		return host->metrics;
 	else
-		parent_list = host->services;
-
-	status = store_obj(parent_list, type, name,
-			last_update, updated_obj);
-
-	free(cname);
-	return status;
-} /* store_host_obj */
+		return host->services;
+} /* get_host_children */
 
 /*
- * store_common_tojson serializes common object attributes to JSON.
+ * ts_tojson serializes a time-series 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)
+ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf)
 {
-	char time_str[64];
-	char interval_str[64];
-	size_t i;
+	char start_str[64];
+	char end_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\", \"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_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);
-	}
+	size_t i;
 
-	/* 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);
+	/* TODO: make time format configurable */
+	if (! sdb_strftime(start_str, sizeof(start_str),
+				"%F %T %z", ts->start))
+		snprintf(start_str, sizeof(start_str), "<error>");
+	start_str[sizeof(start_str) - 1] = '\0';
+	if (! sdb_strftime(end_str, sizeof(end_str),
+				"%F %T %z", ts->end))
+		snprintf(end_str, sizeof(end_str), "<error>");
+	end_str[sizeof(end_str) - 1] = '\0';
+
+	sdb_strbuf_append(buf, "{\"start\": \"%s\", \"end\": \"%s\", \"data\": {",
+			start_str, end_str);
+
+	for (i = 0; i < ts->data_names_len; ++i) {
+		size_t j;
+		sdb_strbuf_append(buf, "\"%s\": [", ts->data_names[i]);
+
+		for (j = 0; j < ts->data_len; ++j) {
+			char time_str[64];
+
+			if (! sdb_strftime(time_str, sizeof(time_str),
+						"%F %T %z", ts->data[i][j].timestamp))
+				snprintf(time_str, sizeof(time_str), "<error>");
+			time_str[sizeof(time_str) - 1] = '\0';
+
+			/* Some GNU libc versions may print '-nan' which we dont' want */
+			if (isnan(ts->data[i][j].value))
+				sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", "
+						"\"value\": \"nan\"}", time_str);
+			else
+				sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", "
+						"\"value\": \"%f\"}", time_str, ts->data[i][j].value);
+
+			if (j < ts->data_len - 1)
+				sdb_strbuf_append(buf, ",");
 		}
 
-		store_common_tojson(sobj, buf);
-		sdb_strbuf_append(buf, "}");
-
-		if (sdb_llist_iter_has_next(iter))
-			sdb_strbuf_append(buf, ",");
+		if (i < ts->data_names_len - 1)
+			sdb_strbuf_append(buf, "],");
+		else
+			sdb_strbuf_append(buf, "]");
 	}
-
-	sdb_llist_iter_destroy(iter);
-	sdb_strbuf_append(buf, "]");
-} /* store_obj_tojson */
+	sdb_strbuf_append(buf, "}}");
+} /* ts_tojson */
 
 /*
  * public API
@@ -451,8 +508,8 @@ 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
@@ -464,9 +521,6 @@ sdb_store_host(const char *name, sdb_time_t last_update)
 	if (! name)
 		return -1;
 
-	if (last_update <= 0)
-		last_update = sdb_gettime();
-
 	cname = sdb_plugin_cname(strdup(name));
 	if (! cname) {
 		sdb_log(SDB_LOG_ERR, "store: strdup failed");
@@ -474,19 +528,22 @@ sdb_store_host(const char *name, sdb_time_t last_update)
 	}
 
 	pthread_rwlock_wrlock(&host_lock);
-	if (! host_list)
-		if (! (host_list = sdb_llist_create()))
+	if (! hosts)
+		if (! (hosts = sdb_avltree_create()))
 			status = -1;
 
 	if (! status)
-		status = store_obj(host_list, SDB_HOST, cname, last_update, NULL);
+		status = store_obj(NULL, hosts, SDB_HOST, cname, last_update, NULL);
 	pthread_rwlock_unlock(&host_lock);
 
+	if (sdb_plugin_store_host(name, last_update))
+		status = -1;
+
 	free(cname);
 	return status;
 } /* sdb_store_host */
 
-_Bool
+bool
 sdb_store_has_host(const char *name)
 {
 	sdb_host_t *host;
@@ -494,7 +551,8 @@ sdb_store_has_host(const char *name)
 	if (! name)
 		return NULL;
 
-	host = lookup_host(name);
+	host = lookup_host(name, /* canonicalize = */ 0);
+	sdb_object_deref(SDB_OBJ(host));
 	return host != NULL;
 } /* sdb_store_has_host */
 
@@ -506,11 +564,10 @@ sdb_store_get_host(const char *name)
 	if (! name)
 		return NULL;
 
-	host = lookup_host(name);
+	host = lookup_host(name, /* canonicalize = */ 0);
 	if (! host)
 		return NULL;
 
-	sdb_object_ref(SDB_OBJ(host));
 	return STORE_OBJ(host);
 } /* sdb_store_get_host */
 
@@ -519,27 +576,30 @@ 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_host_t *host;
+	sdb_avltree_t *attrs;
+	int status = 0;
 
 	if ((! hostname) || (! key))
 		return -1;
 
 	pthread_rwlock_wrlock(&host_lock);
-	status = store_host_obj(hostname, 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;
-		}
+	host = lookup_host(hostname, /* canonicalize = */ 1);
+	attrs = get_host_children(host, 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(STORE_OBJ(host), attrs, key, value, last_update);
+
+	sdb_object_deref(SDB_OBJ(host));
 	pthread_rwlock_unlock(&host_lock);
+
+	if (sdb_plugin_store_attribute(hostname, key, value, last_update))
+		status = -1;
 	return status;
 } /* sdb_store_attribute */
 
@@ -547,108 +607,426 @@ int
 sdb_store_service(const char *hostname, const char *name,
 		sdb_time_t last_update)
 {
-	int status;
+	sdb_host_t *host;
+	sdb_avltree_t *services;
+
+	int status = 0;
 
 	if ((! hostname) || (! name))
 		return -1;
 
 	pthread_rwlock_wrlock(&host_lock);
-	status = store_host_obj(hostname, SDB_SERVICE, name, last_update, NULL);
+	host = lookup_host(hostname, /* canonicalize = */ 1);
+	services = get_host_children(host, 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(STORE_OBJ(host), services, SDB_SERVICE,
+				name, last_update, NULL);
+
+	sdb_object_deref(SDB_OBJ(host));
 	pthread_rwlock_unlock(&host_lock);
+
+	if (sdb_plugin_store_service(hostname, name, last_update))
+		status = -1;
 	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;
+	sdb_service_t *svc;
+	sdb_avltree_t *services;
+	int status = 0;
+
+	if ((! hostname) || (! service) || (! key))
+		return -1;
+
+	pthread_rwlock_wrlock(&host_lock);
+	host = lookup_host(hostname, /* canonicalize = */ 1);
+	services = get_host_children(host, SDB_SERVICE);
+	sdb_object_deref(SDB_OBJ(host));
+	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;
+	}
+
+	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 (! status)
+		status = store_attr(STORE_OBJ(svc), svc->attributes,
+				key, value, last_update);
+
+	sdb_object_deref(SDB_OBJ(svc));
+	pthread_rwlock_unlock(&host_lock);
+
+	if (sdb_plugin_store_service_attribute(hostname, service,
+				key, value, last_update))
+		status = -1;
+	return status;
+} /* sdb_store_service_attr */
+
+int
+sdb_store_metric(const char *hostname, const char *name,
+		sdb_metric_store_t *store, sdb_time_t last_update)
 {
+	sdb_store_obj_t *obj = NULL;
 	sdb_host_t *host;
+	sdb_metric_t *metric;
 
-	if ((! h) || (h->type != SDB_HOST) || (! buf))
+	sdb_avltree_t *metrics;
+
+	int status = 0;
+
+	if ((! hostname) || (! name))
 		return -1;
 
-	host = HOST(h);
+	if (store) {
+		if ((store->type != NULL) != (store->id != NULL))
+			return -1;
+		else if (! store->type)
+			store = NULL;
+	}
 
-	sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(host)->name);
-	store_common_tojson(h, buf);
+	pthread_rwlock_wrlock(&host_lock);
+	host = lookup_host(hostname, /* canonicalize = */ 1);
+	metrics = get_host_children(host, SDB_METRIC);
+	if (! metrics) {
+		sdb_log(SDB_LOG_ERR, "store: Failed to store metric '%s' - "
+				"host '%s' not found", name, hostname);
+		status = -1;
+	}
 
-	if (! (flags & SDB_SKIP_ATTRIBUTES)) {
-		sdb_strbuf_append(buf, ", \"attributes\": ");
-		store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf);
+	if (! status)
+		status = store_obj(STORE_OBJ(host), metrics, SDB_METRIC,
+				name, last_update, &obj);
+	sdb_object_deref(SDB_OBJ(host));
+
+	if (status || (! store)) {
+		pthread_rwlock_unlock(&host_lock);
+		return status;
 	}
 
-	if (! (flags & SDB_SKIP_SERVICES)) {
-		sdb_strbuf_append(buf, ", \"services\": ");
-		store_obj_tojson(host->services, SDB_SERVICE, buf);
+	assert(obj);
+	metric = METRIC(obj);
+
+	if ((! metric->store.type) || strcasecmp(metric->store.type, store->type)) {
+		if (metric->store.type)
+			free(metric->store.type);
+		metric->store.type = strdup(store->type);
+	}
+	if ((! metric->store.id) || strcasecmp(metric->store.id, store->id)) {
+		if (metric->store.id)
+			free(metric->store.id);
+		metric->store.id = strdup(store->id);
 	}
 
-	sdb_strbuf_append(buf, "}");
-	return 0;
-} /* sdb_store_host_tojson */
+	if ((! metric->store.type) || (! metric->store.id)) {
+		if (metric->store.type)
+			free(metric->store.type);
+		if (metric->store.id)
+			free(metric->store.id);
+		metric->store.type = metric->store.id = NULL;
+		status = -1;
+	}
+	pthread_rwlock_unlock(&host_lock);
+
+	if (sdb_plugin_store_metric(hostname, name, store, last_update))
+		status = -1;
+	return status;
+} /* sdb_store_metric */
 
 int
-sdb_store_tojson(sdb_strbuf_t *buf, int flags)
+sdb_store_metric_attr(const char *hostname, const char *metric,
+		const char *key, const sdb_data_t *value, sdb_time_t last_update)
 {
-	sdb_llist_iter_t *host_iter;
+	sdb_avltree_t *metrics;
+	sdb_host_t *host;
+	sdb_metric_t *m;
+	int status = 0;
 
-	if (! buf)
+	if ((! hostname) || (! metric) || (! key))
+		return -1;
+
+	pthread_rwlock_wrlock(&host_lock);
+	host = lookup_host(hostname, /* canonicalize = */ 1);
+	metrics = get_host_children(host, SDB_METRIC);
+	sdb_object_deref(SDB_OBJ(host));
+	if (! metrics) {
+		sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' "
+				"for metric '%s' - host '%s' not found",
+				key, metric, hostname);
+		pthread_rwlock_unlock(&host_lock);
+		return -1;
+	}
+
+	m = METRIC(sdb_avltree_lookup(metrics, metric));
+	if (! m) {
+		sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
+				"metric '%s/%s' not found", key, hostname, metric);
+		status = -1;
+	}
+
+	if (! status)
+		status = store_attr(STORE_OBJ(m), m->attributes,
+				key, value, last_update);
+
+	sdb_object_deref(SDB_OBJ(m));
+	pthread_rwlock_unlock(&host_lock);
+
+	if (sdb_plugin_store_metric_attribute(hostname, metric,
+				key, value, last_update))
+		status = -1;
+	return status;
+} /* sdb_store_metric_attr */
+
+sdb_store_obj_t *
+sdb_store_get_child(sdb_store_obj_t *host, int type, const char *name)
+{
+	sdb_avltree_t *children;
+
+	if ((! host) || (host->type != SDB_HOST) || (! name))
+		return NULL;
+
+	children = get_host_children(HOST(host), type);
+	if (! children)
+		return NULL;
+	return STORE_OBJ(sdb_avltree_lookup(children, name));
+} /* sdb_store_get_child */
+
+int
+sdb_store_fetch_timeseries(const char *hostname, const char *metric,
+		sdb_timeseries_opts_t *opts, sdb_strbuf_t *buf)
+{
+	sdb_avltree_t *metrics;
+	sdb_host_t *host;
+	sdb_metric_t *m;
+
+	sdb_timeseries_t *ts;
+
+	if ((! hostname) || (! metric) || (! opts) || (! buf))
 		return -1;
 
 	pthread_rwlock_rdlock(&host_lock);
+	host = lookup_host(hostname, /* canonicalize = */ 1);
+	metrics = get_host_children(host, SDB_METRIC);
+	sdb_object_deref(SDB_OBJ(host));
+	if (! metrics) {
+		sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
+				"- host '%s' not found", hostname, metric, hostname);
+		pthread_rwlock_unlock(&host_lock);
+		return -1;
+	}
 
-	host_iter = sdb_llist_get_iter(host_list);
-	if (! host_iter) {
+	m = METRIC(sdb_avltree_lookup(metrics, metric));
+	if (! m) {
+		sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
+				"- metric '%s' not found", hostname, metric, metric);
 		pthread_rwlock_unlock(&host_lock);
 		return -1;
 	}
 
-	sdb_strbuf_append(buf, "{\"hosts\":[");
+	if ((! m->store.type) || (! m->store.id)) {
+		sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
+				"- no data-store configured for the stored metric",
+				hostname, metric);
+		pthread_rwlock_unlock(&host_lock);
+		return -1;
+	}
 
-	while (sdb_llist_iter_has_next(host_iter)) {
-		sdb_store_obj_t *host = STORE_OBJ(sdb_llist_iter_get_next(host_iter));
-		assert(host);
+	{
+		char type[strlen(m->store.type) + 1];
+		char id[strlen(m->store.id) + 1];
+
+		strncpy(type, m->store.type, sizeof(type));
+		strncpy(id, m->store.id, sizeof(id));
+		pthread_rwlock_unlock(&host_lock);
 
-		if (sdb_store_host_tojson(host, buf, flags))
+		ts = sdb_plugin_fetch_timeseries(type, id, opts);
+		if (! ts) {
+			sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
+					"- %s fetcher callback returned no data for '%s'",
+					hostname, metric, type, id);
 			return -1;
+		}
+	}
+
+	ts_tojson(ts, buf);
+	sdb_timeseries_destroy(ts);
+	return 0;
+} /* sdb_store_fetch_timeseries */
+
+int
+sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res)
+{
+	sdb_data_t tmp;
 
-		if (sdb_llist_iter_has_next(host_iter))
-			sdb_strbuf_append(buf, ",");
+	if (! obj)
+		return -1;
+
+	switch (field) {
+		case SDB_FIELD_NAME:
+			tmp.type = SDB_TYPE_STRING;
+			tmp.data.string = strdup(SDB_OBJ(obj)->name);
+			if (! tmp.data.string)
+				return -1;
+			break;
+		case SDB_FIELD_LAST_UPDATE:
+			tmp.type = SDB_TYPE_DATETIME;
+			tmp.data.datetime = obj->last_update;
+			break;
+		case SDB_FIELD_AGE:
+			tmp.type = SDB_TYPE_DATETIME;
+			tmp.data.datetime = sdb_gettime() - obj->last_update;
+			break;
+		case SDB_FIELD_INTERVAL:
+			tmp.type = SDB_TYPE_DATETIME;
+			tmp.data.datetime = obj->interval;
+			break;
+		case SDB_FIELD_BACKEND:
+			if (! res)
+				return 0;
+			tmp.type = SDB_TYPE_ARRAY | SDB_TYPE_STRING;
+			tmp.data.array.length = obj->backends_num;
+			tmp.data.array.values = obj->backends;
+			return sdb_data_copy(res, &tmp);
+		case SDB_FIELD_VALUE:
+			if (obj->type != SDB_ATTRIBUTE)
+				return -1;
+			if (! res)
+				return 0;
+			return sdb_data_copy(res, &ATTR(obj)->value);
+		default:
+			return -1;
 	}
+	if (res)
+		*res = tmp;
+	else
+		sdb_data_free_datum(&tmp);
+	return 0;
+} /* sdb_store_get_field */
+
+int
+sdb_store_get_attr(sdb_store_obj_t *obj, const char *name, sdb_data_t *res,
+		sdb_store_matcher_t *filter)
+{
+	sdb_avltree_t *tree = NULL;
+	sdb_store_obj_t *attr;
+
+	if ((! obj) || (! name))
+		return -1;
 
-	sdb_strbuf_append(buf, "]}");
+	if (obj->type == SDB_HOST)
+		tree = HOST(obj)->attributes;
+	else if (obj->type == SDB_SERVICE)
+		tree = SVC(obj)->attributes;
+	else if (obj->type == SDB_METRIC)
+		tree = METRIC(obj)->attributes;
 
-	sdb_llist_iter_destroy(host_iter);
-	pthread_rwlock_unlock(&host_lock);
+	if (! tree)
+		return -1;
+
+	attr = STORE_OBJ(sdb_avltree_lookup(tree, name));
+	if (! attr)
+		return -1;
+	if (filter && (! sdb_store_matcher_matches(filter, attr, NULL))) {
+		sdb_object_deref(SDB_OBJ(attr));
+		return -1;
+	}
+
+	assert(STORE_OBJ(attr)->type == SDB_ATTRIBUTE);
+	if (res)
+		sdb_data_copy(res, &ATTR(attr)->value);
+	sdb_object_deref(SDB_OBJ(attr));
 	return 0;
-} /* sdb_store_tojson */
+} /* sdb_store_get_attr */
 
-/* TODO: actually support hierarchical data */
 int
-sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
+sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
+		sdb_store_lookup_cb cb, void *user_data)
 {
-	sdb_llist_iter_t *host_iter;
+	sdb_avltree_iter_t *host_iter = NULL;
 	int status = 0;
 
+	if (! cb)
+		return -1;
+
+	if ((type != SDB_HOST) && (type != SDB_SERVICE) && (type != SDB_METRIC)) {
+		sdb_log(SDB_LOG_ERR, "store: Cannot scan objects of type %d", type);
+		return -1;
+	}
+
 	pthread_rwlock_rdlock(&host_lock);
 
-	host_iter = sdb_llist_get_iter(host_list);
-	if (! host_iter)
-		status = -1;
+	if (hosts) {
+		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;
+		sdb_avltree_iter_t *iter = NULL;
+
+		host = STORE_OBJ(sdb_avltree_iter_get_next(host_iter));
 		assert(host);
 
-		if (cb(host, user_data)) {
-			status = -1;
-			break;
+		if (! sdb_store_matcher_matches(filter, host, NULL))
+			continue;
+
+		if (type == SDB_SERVICE)
+			iter = sdb_avltree_get_iter(HOST(host)->services);
+		else if (type == SDB_METRIC)
+			iter = sdb_avltree_get_iter(HOST(host)->metrics);
+
+		if (iter) {
+			while (sdb_avltree_iter_has_next(iter)) {
+				sdb_store_obj_t *obj;
+				obj = STORE_OBJ(sdb_avltree_iter_get_next(iter));
+				assert(obj);
+
+				if (sdb_store_matcher_matches(m, obj, filter)) {
+					if (cb(obj, filter, user_data)) {
+						sdb_log(SDB_LOG_ERR, "store: Callback returned "
+								"an error while scanning");
+						status = -1;
+						break;
+					}
+				}
+			}
 		}
+		else if (sdb_store_matcher_matches(m, host, filter)) {
+			if (cb(host, filter, user_data)) {
+				sdb_log(SDB_LOG_ERR, "store: Callback returned "
+						"an error while scanning");
+				status = -1;
+			}
+		}
+
+		sdb_avltree_iter_destroy(iter);
+		if (status)
+			break;
 	}
 
-	sdb_llist_iter_destroy(host_iter);
+	sdb_avltree_iter_destroy(host_iter);
 	pthread_rwlock_unlock(&host_lock);
 	return status;
-} /* sdb_store_iterate */
+} /* sdb_store_scan */
 
 /* vim: set tw=78 sw=4 ts=4 noexpandtab : */