X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fstore.c;h=fa72955886bfa04778daa110bc02515b909919b1;hp=e643f457a7e6ba564242e369f8ad7bf64b0ebbd2;hb=9a96acd759c31211aa512e174339a9c178c4eb83;hpb=82f8f7dbf1dcfb18f74f1ca8b58ed823a1225404

diff --git a/src/core/store.c b/src/core/store.c
index e643f45..fa72955 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -43,11 +43,10 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <math.h>
 #include <pthread.h>
 
 /*
- * private variables
+ * private types
  */
 
 struct sdb_store {
@@ -59,9 +58,17 @@ struct sdb_store {
 	pthread_rwlock_t host_lock;
 };
 
-/*
- * private types
- */
+/* internal representation of a to-be-stored object */
+typedef struct {
+	sdb_store_obj_t *parent;
+	sdb_avltree_t *parent_tree;
+	int type;
+	const char *name;
+	sdb_time_t last_update;
+	const char * const *backends;
+	size_t backends_num;
+} store_obj_t;
+#define STORE_OBJ_INIT { NULL, NULL, 0, NULL, 0, NULL, 0 }
 
 static sdb_type_t host_type;
 static sdb_type_t service_type;
@@ -298,66 +305,70 @@ static sdb_type_t attribute_type = {
  */
 
 static int
-record_backend(sdb_store_obj_t *obj)
+record_backends(sdb_store_obj_t *obj,
+		const char * const *backends, size_t backends_num)
 {
-	const sdb_plugin_info_t *info;
 	char **tmp;
 	size_t i;
 
-	info = sdb_plugin_current();
-	if (! info)
-		return 0;
+	for (i = 0; i < backends_num; i++) {
+		bool found = 0;
+		size_t j;
 
-	for (i = 0; i < obj->backends_num; ++i)
-		if (!strcasecmp(obj->backends[i], info->plugin_name))
-			return 0;
+		for (j = 0; j < obj->backends_num; ++j) {
+			if (!strcasecmp(obj->backends[j], backends[i])) {
+				found = 1;
+				break;
+			}
+		}
+		if (found)
+			continue;
 
-	tmp = realloc(obj->backends,
-			(obj->backends_num + 1) * sizeof(*obj->backends));
-	if (! tmp)
-		return -1;
+		tmp = realloc(obj->backends,
+				(obj->backends_num + 1) * sizeof(*obj->backends));
+		if (! tmp)
+			return -1;
 
-	obj->backends = tmp;
-	obj->backends[obj->backends_num] = strdup(info->plugin_name);
-	if (! obj->backends[obj->backends_num])
-		return -1;
+		obj->backends = tmp;
+		obj->backends[obj->backends_num] = strdup(backends[i]);
+		if (! obj->backends[obj->backends_num])
+			return -1;
 
-	++obj->backends_num;
+		++obj->backends_num;
+	}
 	return 0;
-} /* record_backend */
+} /* record_backends */
 
 static int
-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)
+store_obj(store_obj_t *obj, sdb_store_obj_t **updated_obj)
 {
 	sdb_store_obj_t *old, *new;
 	int status = 0;
 
-	assert(parent_tree);
+	assert(obj->parent_tree);
 
-	if (last_update <= 0)
-		last_update = sdb_gettime();
+	if (obj->last_update <= 0)
+		obj->last_update = sdb_gettime();
 
-	old = STORE_OBJ(sdb_avltree_lookup(parent_tree, name));
+	old = STORE_OBJ(sdb_avltree_lookup(obj->parent_tree, obj->name));
 	if (old) {
-		if (old->last_update > last_update) {
+		if (old->last_update > obj->last_update) {
 			sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
 					"value too old (%"PRIsdbTIME" < %"PRIsdbTIME")",
-					SDB_STORE_TYPE_TO_NAME(type), name,
-					last_update, old->last_update);
+					SDB_STORE_TYPE_TO_NAME(obj->type), obj->name,
+					obj->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) {
+		else if (old->last_update == obj->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;
+			sdb_time_t interval = obj->last_update - old->last_update;
+			old->last_update = obj->last_update;
 			if (interval) {
 				if (old->interval)
 					old->interval = (sdb_time_t)((0.9 * (double)old->interval)
@@ -371,23 +382,24 @@ store_obj(sdb_store_obj_t *parent, sdb_avltree_t *parent_tree,
 		sdb_object_deref(SDB_OBJ(old));
 	}
 	else {
-		if (type == SDB_ATTRIBUTE) {
+		if (obj->type == SDB_ATTRIBUTE) {
 			/* the value will be updated by the caller */
-			new = STORE_OBJ(sdb_object_create(name, attribute_type,
-						type, last_update, NULL));
+			new = STORE_OBJ(sdb_object_create(obj->name, attribute_type,
+						obj->type, obj->last_update, NULL));
 		}
 		else {
 			sdb_type_t t;
-			t = type == SDB_HOST
+			t = obj->type == SDB_HOST
 				? host_type
-				: type == SDB_SERVICE
+				: obj->type == SDB_SERVICE
 					? service_type
 					: metric_type;
-			new = STORE_OBJ(sdb_object_create(name, t, type, last_update));
+			new = STORE_OBJ(sdb_object_create(obj->name, t,
+						obj->type, obj->last_update));
 		}
 
 		if (new) {
-			status = sdb_avltree_insert(parent_tree, SDB_OBJ(new));
+			status = sdb_avltree_insert(obj->parent_tree, SDB_OBJ(new));
 
 			/* pass control to the tree or destroy in case of an error */
 			sdb_object_deref(SDB_OBJ(new));
@@ -395,7 +407,7 @@ store_obj(sdb_store_obj_t *parent, sdb_avltree_t *parent_tree,
 		else {
 			char errbuf[1024];
 			sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
-					SDB_STORE_TYPE_TO_NAME(type), name,
+					SDB_STORE_TYPE_TO_NAME(obj->type), obj->name,
 					sdb_strerror(errno, errbuf, sizeof(errbuf)));
 			status = -1;
 		}
@@ -405,18 +417,18 @@ store_obj(sdb_store_obj_t *parent, sdb_avltree_t *parent_tree,
 		return status;
 	assert(new);
 
-	if (new->parent != parent) {
+	if (new->parent != obj->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;
+		//sdb_object_ref(SDB_OBJ(obj->parent));
+		new->parent = obj->parent;
 	}
 
 	if (updated_obj)
 		*updated_obj = new;
 
-	if (record_backend(new))
+	if (record_backends(new, obj->backends, obj->backends_num))
 		return -1;
 	return status;
 } /* store_obj */
@@ -471,62 +483,6 @@ get_host_children(host_t *host, int type)
 		return host->services;
 } /* get_host_children */
 
-/*
- * 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
-ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf)
-{
-	char start_str[64];
-	char end_str[64];
-
-	size_t i;
-
-	/* TODO: make time format configurable */
-	if (! sdb_strftime(start_str, sizeof(start_str), ts->start))
-		snprintf(start_str, sizeof(start_str), "<error>");
-	start_str[sizeof(start_str) - 1] = '\0';
-	if (! sdb_strftime(end_str, sizeof(end_str), 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), 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, ",");
-		}
-
-		if (i < ts->data_names_len - 1)
-			sdb_strbuf_append(buf, "],");
-		else
-			sdb_strbuf_append(buf, "]");
-	}
-	sdb_strbuf_append(buf, "}}");
-} /* ts_tojson */
-
 /*
  * store writer API
  */
@@ -535,13 +491,12 @@ static int
 store_attribute(sdb_store_attribute_t *attr, sdb_object_t *user_data)
 {
 	sdb_store_t *st = SDB_STORE(user_data);
-	sdb_store_obj_t *parent = NULL;
+	store_obj_t obj = STORE_OBJ_INIT;
 	sdb_store_obj_t *new = NULL;
 	const char *hostname;
 	host_t *host;
 
 	sdb_avltree_t *children = NULL;
-	sdb_avltree_t *attributes;
 	int status = 0;
 
 	if ((! attr) || (! attr->parent) || (! attr->key))
@@ -563,8 +518,8 @@ store_attribute(sdb_store_attribute_t *attr, sdb_object_t *user_data)
 
 	switch (attr->parent_type) {
 	case SDB_HOST:
-		parent = STORE_OBJ(host);
-		attributes = get_host_children(host, SDB_ATTRIBUTE);
+		obj.parent = STORE_OBJ(host);
+		obj.parent_tree = get_host_children(host, SDB_ATTRIBUTE);
 		break;
 	case SDB_SERVICE:
 		children = get_host_children(host, SDB_SERVICE);
@@ -578,8 +533,8 @@ store_attribute(sdb_store_attribute_t *attr, sdb_object_t *user_data)
 	}
 
 	if (children) {
-		parent = STORE_OBJ(sdb_avltree_lookup(children, attr->parent));
-		if (! parent) {
+		obj.parent = STORE_OBJ(sdb_avltree_lookup(children, attr->parent));
+		if (! obj.parent) {
 			sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
 					"%s '%s/%s' not found", attr->key,
 					SDB_STORE_TYPE_TO_NAME(attr->parent_type),
@@ -587,14 +542,18 @@ store_attribute(sdb_store_attribute_t *attr, sdb_object_t *user_data)
 			status = -1;
 		}
 		else
-			attributes = attr->parent_type == SDB_SERVICE
-				? SVC(parent)->attributes
-				: METRIC(parent)->attributes;
+			obj.parent_tree = attr->parent_type == SDB_SERVICE
+				? SVC(obj.parent)->attributes
+				: METRIC(obj.parent)->attributes;
 	}
 
+	obj.type = SDB_ATTRIBUTE;
+	obj.name = attr->key;
+	obj.last_update = attr->last_update;
+	obj.backends = attr->backends;
+	obj.backends_num = attr->backends_num;
 	if (! status)
-		status = store_obj(parent, attributes, SDB_ATTRIBUTE,
-				attr->key, attr->last_update, &new);
+		status = store_obj(&obj, &new);
 
 	if (! status) {
 		assert(new);
@@ -604,8 +563,8 @@ store_attribute(sdb_store_attribute_t *attr, sdb_object_t *user_data)
 				status = -1;
 	}
 
-	if (parent != STORE_OBJ(host))
-		sdb_object_deref(SDB_OBJ(parent));
+	if (obj.parent != STORE_OBJ(host))
+		sdb_object_deref(SDB_OBJ(obj.parent));
 	sdb_object_deref(SDB_OBJ(host));
 	pthread_rwlock_unlock(&st->host_lock);
 
@@ -616,14 +575,18 @@ static int
 store_host(sdb_store_host_t *host, sdb_object_t *user_data)
 {
 	sdb_store_t *st = SDB_STORE(user_data);
+	store_obj_t obj = { NULL, st->hosts, SDB_HOST, NULL, 0, NULL, 0 };
 	int status = 0;
 
 	if ((! host) || (! host->name))
 		return -1;
 
+	obj.name = host->name;
+	obj.last_update = host->last_update;
+	obj.backends = host->backends;
+	obj.backends_num = host->backends_num;
 	pthread_rwlock_wrlock(&st->host_lock);
-	status = store_obj(NULL, st->hosts,
-			SDB_HOST, host->name, host->last_update, NULL);
+	status = store_obj(&obj, NULL);
 	pthread_rwlock_unlock(&st->host_lock);
 
 	return status;
@@ -633,9 +596,8 @@ static int
 store_service(sdb_store_service_t *service, sdb_object_t *user_data)
 {
 	sdb_store_t *st = SDB_STORE(user_data);
-
+	store_obj_t obj = STORE_OBJ_INIT;
 	host_t *host;
-	sdb_avltree_t *services;
 
 	int status = 0;
 
@@ -644,16 +606,21 @@ store_service(sdb_store_service_t *service, sdb_object_t *user_data)
 
 	pthread_rwlock_wrlock(&st->host_lock);
 	host = HOST(sdb_avltree_lookup(st->hosts, service->hostname));
-	services = get_host_children(host, SDB_SERVICE);
-	if (! services) {
+	obj.parent = STORE_OBJ(host);
+	obj.parent_tree = get_host_children(host, SDB_SERVICE);
+	obj.type = SDB_SERVICE;
+	if (! obj.parent_tree) {
 		sdb_log(SDB_LOG_ERR, "store: Failed to store service '%s' - "
 				"host '%s' not found", service->name, service->hostname);
 		status = -1;
 	}
 
+	obj.name = service->name;
+	obj.last_update = service->last_update;
+	obj.backends = service->backends;
+	obj.backends_num = service->backends_num;
 	if (! status)
-		status = store_obj(STORE_OBJ(host), services, SDB_SERVICE,
-				service->name, service->last_update, NULL);
+		status = store_obj(&obj, NULL);
 
 	sdb_object_deref(SDB_OBJ(host));
 	pthread_rwlock_unlock(&st->host_lock);
@@ -664,9 +631,8 @@ static int
 store_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
 {
 	sdb_store_t *st = SDB_STORE(user_data);
-
-	sdb_store_obj_t *obj = NULL;
-	sdb_avltree_t *metrics;
+	store_obj_t obj = STORE_OBJ_INIT;
+	sdb_store_obj_t *new = NULL;
 	host_t *host;
 
 	int status = 0;
@@ -679,16 +645,21 @@ store_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
 
 	pthread_rwlock_wrlock(&st->host_lock);
 	host = HOST(sdb_avltree_lookup(st->hosts, metric->hostname));
-	metrics = get_host_children(host, SDB_METRIC);
-	if (! metrics) {
+	obj.parent = STORE_OBJ(host);
+	obj.parent_tree = get_host_children(host, SDB_METRIC);
+	obj.type = SDB_METRIC;
+	if (! obj.parent_tree) {
 		sdb_log(SDB_LOG_ERR, "store: Failed to store metric '%s' - "
 				"host '%s' not found", metric->name, metric->hostname);
 		status = -1;
 	}
 
+	obj.name = metric->name;
+	obj.last_update = metric->last_update;
+	obj.backends = metric->backends;
+	obj.backends_num = metric->backends_num;
 	if (! status)
-		status = store_obj(STORE_OBJ(host), metrics, SDB_METRIC,
-				metric->name, metric->last_update, &obj);
+		status = store_obj(&obj, &new);
 	sdb_object_deref(SDB_OBJ(host));
 
 	if (status) {
@@ -696,9 +667,9 @@ store_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
 		return status;
 	}
 
-	assert(obj);
+	assert(new);
 	if (metric->store.type && metric->store.id)
-		if (store_metric_store(METRIC(obj), metric))
+		if (store_metric_store(METRIC(new), metric))
 			status = -1;
 	pthread_rwlock_unlock(&st->host_lock);
 	return status;
@@ -718,11 +689,11 @@ prepare_query(sdb_ast_node_t *ast,
 
 static int
 execute_query(sdb_object_t *q,
-		sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
+		sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf,
 		sdb_object_t *user_data)
 {
 	return sdb_store_query_execute(SDB_STORE(user_data),
-			QUERY(q), buf, errbuf);
+			QUERY(q), w, wd, errbuf);
 } /* execute_query */
 
 sdb_store_reader_t sdb_store_reader = {
@@ -932,75 +903,6 @@ sdb_store_get_attr(sdb_store_obj_t *obj, const char *name, sdb_data_t *res,
 	return 0;
 } /* sdb_store_get_attr */
 
-/* TODO: sdb_store_fetch_timeseries should move into the plugin module */
-
-int
-sdb_store_fetch_timeseries(sdb_store_t *store,
-		const char *hostname, const char *metric,
-		sdb_timeseries_opts_t *opts, sdb_strbuf_t *buf)
-{
-	sdb_avltree_t *metrics;
-	host_t *host;
-	sdb_metric_t *m;
-
-	sdb_timeseries_t *ts;
-
-	int status = 0;
-
-	if ((! store) || (! hostname) || (! metric) || (! opts) || (! buf))
-		return -1;
-
-	pthread_rwlock_rdlock(&store->host_lock);
-	host = HOST(sdb_avltree_lookup(store->hosts, hostname));
-	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(&store->host_lock);
-		return -1;
-	}
-
-	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(&store->host_lock);
-		return -1;
-	}
-
-	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);
-		sdb_object_deref(SDB_OBJ(m));
-		pthread_rwlock_unlock(&store->host_lock);
-		return -1;
-	}
-
-	{
-		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(&store->host_lock);
-
-		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);
-			status = -1;
-		}
-	}
-
-	ts_tojson(ts, buf);
-	sdb_object_deref(SDB_OBJ(m));
-	sdb_timeseries_destroy(ts);
-	return status;
-} /* sdb_store_fetch_timeseries */
-
 int
 sdb_store_scan(sdb_store_t *store, int type,
 		sdb_store_matcher_t *m, sdb_store_matcher_t *filter,