diff --git a/src/core/store.c b/src/core/store.c
index e6aeaf63e86f3c8a6d56e7682f065801396e481d..cb3189d72245690941c6d010a41dfa6d5da7f927 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
return status;
} /* store_attr */
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)
/* The host_lock has to be acquired before calling this function. */
static sdb_avltree_t *
get_host_children(sdb_host_t *host, int type)
sdb_object_deref(SDB_OBJ(host));
pthread_rwlock_unlock(&host_lock);
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;
if (sdb_plugin_store_service(hostname, name, last_update))
status = -1;
return status;
name, last_update, &obj);
sdb_object_deref(SDB_OBJ(host));
name, last_update, &obj);
sdb_object_deref(SDB_OBJ(host));
- if (status || (! store)) {
+ if (status) {
pthread_rwlock_unlock(&host_lock);
return status;
}
pthread_rwlock_unlock(&host_lock);
return status;
}
assert(obj);
metric = METRIC(obj);
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))
pthread_rwlock_unlock(&host_lock);
if (sdb_plugin_store_metric(hostname, name, store, last_update))
tmp.data.datetime = obj->interval;
break;
case SDB_FIELD_BACKEND:
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);
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;
}
default:
return -1;
}
sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
sdb_store_lookup_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_avltree_iter_t *host_iter;
+ sdb_avltree_iter_t *host_iter = NULL;
int status = 0;
if (! cb)
int status = 0;
if (! cb)
pthread_rwlock_rdlock(&host_lock);
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)) {
/* has_next returns false if the iterator is NULL */
while (sdb_avltree_iter_has_next(host_iter)) {