X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;ds=inline;f=src%2Fcore%2Fstore.c;h=cb3189d72245690941c6d010a41dfa6d5da7f927;hb=e39a0c24a894f9e04cbf7698429dc23293c7ced9;hp=e6aeaf63e86f3c8a6d56e7682f065801396e481d;hpb=af74f327da5e6ebe01d5e5e6f8fa19646e203eed;p=sysdb.git

diff --git a/src/core/store.c b/src/core/store.c
index e6aeaf6..cb3189d 100644
--- a/src/core/store.c
+++ b/src/core/store.c
@@ -423,6 +423,37 @@ store_attr(sdb_store_obj_t *parent, sdb_avltree_t *attributes,
 	return status;
 } /* store_attr */
 
+static int
+store_metric_store(sdb_metric_t *metric, sdb_metric_store_t *store)
+{
+	char *type = metric->store.type;
+	char *id = metric->store.id;
+
+	if ((! metric->store.type) || strcasecmp(metric->store.type, store->type)) {
+		if (! (type = strdup(store->type)))
+			return -1;
+	}
+	if ((! metric->store.id) || strcasecmp(metric->store.id, store->id)) {
+		if (! (id = strdup(store->id))) {
+			if (type != metric->store.type)
+				free(type);
+			return -1;
+		}
+	}
+
+	if (type != metric->store.type) {
+		if (metric->store.type)
+			free(metric->store.type);
+		metric->store.type = type;
+	}
+	if (id != metric->store.id) {
+		if (metric->store.id)
+			free(metric->store.id);
+		metric->store.id = id;
+	}
+	return 0;
+} /* store_metric_store */
+
 /* The host_lock has to be acquired before calling this function. */
 static sdb_avltree_t *
 get_host_children(sdb_host_t *host, int type)
@@ -631,6 +662,9 @@ sdb_store_service(const char *hostname, const char *name,
 	sdb_object_deref(SDB_OBJ(host));
 	pthread_rwlock_unlock(&host_lock);
 
+	if (status)
+		return status;
+
 	if (sdb_plugin_store_service(hostname, name, last_update))
 		status = -1;
 	return status;
@@ -716,7 +750,7 @@ sdb_store_metric(const char *hostname, const char *name,
 				name, last_update, &obj);
 	sdb_object_deref(SDB_OBJ(host));
 
-	if (status || (! store)) {
+	if (status) {
 		pthread_rwlock_unlock(&host_lock);
 		return status;
 	}
@@ -724,25 +758,9 @@ sdb_store_metric(const char *hostname, const char *name,
 	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);
-	}
-
-	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;
-	}
+	if (store)
+		if (store_metric_store(metric, store))
+			status = -1;
 	pthread_rwlock_unlock(&host_lock);
 
 	if (sdb_plugin_store_metric(hostname, name, store, last_update))
@@ -898,12 +916,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);
-		}
+		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;
 	}
@@ -953,7 +977,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)
@@ -966,9 +990,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)) {