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

diff --git a/src/core/store.c b/src/core/store.c
index b206283..ab37e68 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -43,6 +43,7 @@
 #include <stdlib.h>
 #include <string.h>
 
+#include <math.h>
 #include <pthread.h>
 
 /*
@@ -255,7 +256,7 @@ static sdb_type_t sdb_attribute_type = {
  */
 
 static sdb_host_t *
-lookup_host(const char *name, _Bool canonicalize)
+lookup_host(const char *name, bool canonicalize)
 {
 	sdb_host_t *host;
 	char *cname;
@@ -426,8 +427,9 @@ store_attr(sdb_store_obj_t *parent, sdb_avltree_t *attributes,
 static sdb_avltree_t *
 get_host_children(sdb_host_t *host, int type)
 {
-	assert((type == SDB_SERVICE) || (type == SDB_METRIC)
-			|| (type == SDB_ATTRIBUTE));
+	if ((type != SDB_SERVICE) && (type != SDB_METRIC)
+			&& (type != SDB_ATTRIBUTE))
+		return NULL;
 
 	if (! host)
 		return NULL;
@@ -479,8 +481,13 @@ ts_tojson(sdb_timeseries_t *ts, sdb_strbuf_t *buf)
 				snprintf(time_str, sizeof(time_str), "<error>");
 			time_str[sizeof(time_str) - 1] = '\0';
 
-			sdb_strbuf_append(buf, "{\"timestamp\": \"%s\", "
-					"\"value\": \"%f\"}", time_str, ts->data[i][j].value);
+			/* 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, ",");
@@ -529,11 +536,14 @@ sdb_store_host(const char *name, sdb_time_t last_update)
 		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;
@@ -587,6 +597,9 @@ sdb_store_attribute(const char *hostname,
 
 	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 */
 
@@ -617,6 +630,9 @@ sdb_store_service(const char *hostname, const char *name,
 
 	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 */
 
@@ -657,6 +673,10 @@ sdb_store_service_attr(const char *hostname, const char *service,
 
 	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 */
 
@@ -674,8 +694,13 @@ sdb_store_metric(const char *hostname, const char *name,
 
 	if ((! hostname) || (! name))
 		return -1;
-	if (store && ((! store->type) || (! store->id)))
-		return -1;
+
+	if (store) {
+		if ((store->type != NULL) != (store->id != NULL))
+			return -1;
+		else if (! store->type)
+			store = NULL;
+	}
 
 	pthread_rwlock_wrlock(&host_lock);
 	host = lookup_host(hostname, /* canonicalize = */ 1);
@@ -719,6 +744,9 @@ sdb_store_metric(const char *hostname, const char *name,
 		status = -1;
 	}
 	pthread_rwlock_unlock(&host_lock);
+
+	if (sdb_plugin_store_metric(hostname, name, store, last_update))
+		status = -1;
 	return status;
 } /* sdb_store_metric */
 
@@ -759,9 +787,27 @@ sdb_store_metric_attr(const char *hostname, const char *metric,
 
 	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)
@@ -852,13 +898,18 @@ sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res)
 			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);
-			break;
-		}
+		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;
 	}
@@ -908,7 +959,7 @@ int
 sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
 		sdb_store_lookup_cb cb, void *user_data)
 {
-	sdb_avltree_iter_t *host_iter;
+	sdb_avltree_iter_t *host_iter = NULL;
 	int status = 0;
 
 	if (! cb)
@@ -921,9 +972,11 @@ sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
 
 	pthread_rwlock_rdlock(&host_lock);
 
-	host_iter = sdb_avltree_get_iter(hosts);
-	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_avltree_iter_has_next(host_iter)) {