![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index d185431f976de168213aa769ceee8bd2a7f16482..bb6cb96a45bb4b91d934705324e06b179b4742b4 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
#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>
* private variables
*/
-static sdb_llist_t *host_list = NULL;
+static sdb_avltree_t *hosts = NULL;
static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
/*
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->attributes = sdb_avltree_create();
if (! sobj->attributes)
return -1;
return 0;
store_obj_destroy(obj);
if (sobj->services)
- sdb_llist_destroy(sobj->services);
+ sdb_avltree_destroy(sobj->services);
if (sobj->attributes)
- sdb_llist_destroy(sobj->attributes);
+ sdb_avltree_destroy(sobj->attributes);
} /* sdb_host_destroy */
static int
if (ret)
return ret;
- sobj->attributes = sdb_llist_create();
+ sobj->attributes = sdb_avltree_create();
if (! sobj->attributes)
return -1;
return 0;
store_obj_destroy(obj);
if (sobj->attributes)
- sdb_llist_destroy(sobj->attributes);
+ sdb_avltree_destroy(sobj->attributes);
} /* sdb_service_destroy */
static int
static sdb_host_t *
lookup_host(const char *name)
{
- return HOST(sdb_llist_search_by_name(host_list, name));
+ return HOST(sdb_avltree_lookup(hosts, name));
} /* lookup_host */
-/* The host_lock has to be acquired before calling this function. */
static int
-store_obj(const char *hostname, int type, const char *name,
- sdb_time_t last_update, sdb_store_obj_t **updated_obj)
+record_backend(sdb_store_obj_t *obj)
{
- char *host_cname = NULL, *cname = NULL;
- char **tmp;
-
- sdb_llist_t *parent_list;
- sdb_store_obj_t *old, *new;
const sdb_plugin_info_t *info;
-
- int status = 0;
+ char **tmp;
size_t i;
- if (last_update <= 0)
- last_update = sdb_gettime();
-
- assert((type == 0)
- || (type == SDB_HOST)
- || (type == SDB_SERVICE)
- || (type == SDB_ATTRIBUTE));
+ info = sdb_plugin_current();
+ if (! info)
+ return 0;
- assert(hostname || (type == SDB_HOST));
- assert((! hostname)
- || (type == SDB_SERVICE)
- || (type == SDB_ATTRIBUTE));
+ for (i = 0; i < obj->backends_num; ++i)
+ if (!strcasecmp(obj->backends[i], info->plugin_name))
+ return 0;
- if (! host_list)
- if (! (host_list = sdb_llist_create()))
- return -1;
- parent_list = host_list;
+ tmp = realloc(obj->backends,
+ (obj->backends_num + 1) * sizeof(*obj->backends));
+ if (! tmp)
+ return -1;
- if (type == SDB_HOST) {
- cname = sdb_plugin_cname(strdup(name));
- if (! cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
- return -1;
- }
- name = cname;
- }
+ obj->backends = tmp;
+ obj->backends[obj->backends_num] = strdup(info->plugin_name);
+ if (! obj->backends[obj->backends_num])
+ return -1;
- if (hostname) {
- sdb_host_t *host;
+ ++obj->backends_num;
+ return 0;
+} /* record_backend */
- host_cname = sdb_plugin_cname(strdup(hostname));
- if (! host_cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
- free(cname);
- return -1;
- }
- hostname = host_cname;
-
- host = lookup_host(hostname);
- 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(host_cname);
- free(cname);
- return -1;
- }
+static int
+store_obj(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;
- if (type == SDB_ATTRIBUTE)
- parent_list = host->attributes;
- else
- parent_list = host->services;
- }
+ assert(parent_tree);
- if (type == SDB_HOST)
- old = STORE_OBJ(sdb_llist_search_by_name(host_list, name));
- else
- 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' - "
* 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;
}
new = old;
+ sdb_object_deref(SDB_OBJ(old));
}
else {
if (type == SDB_ATTRIBUTE) {
}
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 {
}
}
- free(host_cname);
- free(cname);
-
if (status < 0)
return status;
assert(new);
if (updated_obj)
*updated_obj = new;
- info = sdb_plugin_current();
- if (! info)
+ if (record_backend(new))
+ return -1;
+ return status;
+} /* store_obj */
+
+static int
+store_attr(sdb_avltree_t *attributes, const char *key, const sdb_data_t *value,
+ sdb_time_t last_update)
+{
+ sdb_store_obj_t *attr = NULL;
+ int status;
+
+ status = store_obj(attributes, SDB_ATTRIBUTE, key, last_update, &attr);
+ if (status)
return status;
- for (i = 0; i < new->backends_num; ++i)
- if (!strcasecmp(new->backends[i], info->plugin_name))
- return status;
+ /* don't update unchanged values */
+ if (! sdb_data_cmp(&ATTR(attr)->value, value))
+ return status;
- tmp = realloc(new->backends,
- (new->backends_num + 1) * sizeof(*new->backends));
- if (! tmp)
+ assert(attr);
+ if (sdb_data_copy(&ATTR(attr)->value, value))
return -1;
+ return status;
+} /* store_attr */
- new->backends = tmp;
- new->backends[new->backends_num] = strdup(info->plugin_name);
- if (! new->backends[new->backends_num])
- return -1;
+/* The host_lock has to be acquired before calling this function. */
+static sdb_avltree_t *
+get_host_children(const char *hostname, int type)
+{
+ char *cname = NULL;
+ sdb_host_t *host;
- ++new->backends_num;
- return status;
-} /* store_obj */
+ assert(hostname);
+ assert((type == SDB_SERVICE) || (type == SDB_ATTRIBUTE));
+
+ if (! hosts)
+ return NULL;
+
+ cname = sdb_plugin_cname(strdup(hostname));
+ if (! cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ return NULL;
+ }
+
+ host = lookup_host(cname);
+ free(cname);
+ if (! host)
+ return NULL;
+
+ sdb_object_deref(SDB_OBJ(host));
+ if (type == SDB_ATTRIBUTE)
+ return host->attributes;
+ else
+ return host->services;
+} /* get_host_children */
/*
* store_common_tojson serializes common object attributes to JSON.
* of the serialized data.
*/
static void
-store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
+store_obj_tojson(sdb_avltree_t *tree, int type, sdb_strbuf_t *buf,
+ sdb_store_matcher_t *filter, int flags)
{
- sdb_llist_iter_t *iter;
+ sdb_avltree_iter_t *iter;
assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
sdb_strbuf_append(buf, "[");
- iter = sdb_llist_get_iter(list);
+ iter = sdb_avltree_get_iter(tree);
if (! iter) {
char errbuf[1024];
sdb_log(SDB_LOG_ERR, "store: Failed to retrieve %ss: %s\n",
}
/* 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));
+ while (sdb_avltree_iter_has_next(iter)) {
+ sdb_store_obj_t *sobj = STORE_OBJ(sdb_avltree_iter_get_next(iter));
assert(sobj);
assert(sobj->type == type);
+ if (filter && (! sdb_store_matcher_matches(filter, sobj, NULL)))
+ continue;
+
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_DOUBLE_QUOTED);
sdb_strbuf_append(buf, "\"value\": %s, ", tmp);
}
-
store_common_tojson(sobj, buf);
+
+ if ((sobj->type == SDB_SERVICE)
+ && (! (flags & SDB_SKIP_ATTRIBUTES))) {
+ sdb_strbuf_append(buf, ", \"attributes\": ");
+ store_obj_tojson(SVC(sobj)->attributes, SDB_ATTRIBUTE,
+ buf, filter, flags);
+ }
sdb_strbuf_append(buf, "}");
- if (sdb_llist_iter_has_next(iter))
+ if (sdb_avltree_iter_has_next(iter))
sdb_strbuf_append(buf, ",");
}
- sdb_llist_iter_destroy(iter);
+ sdb_avltree_iter_destroy(iter);
sdb_strbuf_append(buf, "]");
} /* store_obj_tojson */
void
sdb_store_clear(void)
{
- sdb_llist_destroy(host_list);
- host_list = NULL;
+ sdb_avltree_destroy(hosts);
+ hosts = NULL;
} /* sdb_store_clear */
int
sdb_store_host(const char *name, sdb_time_t last_update)
{
- int status;
+ char *cname = NULL;
+ int status = 0;
if (! name)
return -1;
+ cname = sdb_plugin_cname(strdup(name));
+ if (! cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ return -1;
+ }
+
pthread_rwlock_wrlock(&host_lock);
- status = store_obj(/* hostname = */ NULL,
- /* stored object = */ SDB_HOST, name, last_update,
- /* updated_obj = */ NULL);
+ if (! hosts)
+ if (! (hosts = sdb_avltree_create()))
+ status = -1;
+
+ if (! status)
+ status = store_obj(hosts, SDB_HOST, cname, last_update, NULL);
pthread_rwlock_unlock(&host_lock);
+
+ free(cname);
return status;
} /* sdb_store_host */
if (! host)
return NULL;
- sdb_object_ref(SDB_OBJ(host));
return STORE_OBJ(host);
} /* sdb_store_get_host */
const char *key, const sdb_data_t *value,
sdb_time_t last_update)
{
- int status;
-
- sdb_store_obj_t *updated_attr = NULL;
+ sdb_avltree_t *attrs;
+ int status = 0;
if ((! hostname) || (! key))
return -1;
pthread_rwlock_wrlock(&host_lock);
- status = store_obj(hostname,
- /* stored object = */ 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;
- }
+ attrs = get_host_children(hostname, 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(attrs, key, value, last_update);
+
pthread_rwlock_unlock(&host_lock);
return status;
} /* sdb_store_attribute */
sdb_store_service(const char *hostname, const char *name,
sdb_time_t last_update)
{
- int status;
+ sdb_avltree_t *services;
+
+ int status = 0;
if ((! hostname) || (! name))
return -1;
pthread_rwlock_wrlock(&host_lock);
- status = store_obj(hostname,
- /* stored object = */ SDB_SERVICE, name, last_update,
- /* updated obj = */ NULL);
+ services = get_host_children(hostname, 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(services, SDB_SERVICE, name, last_update, NULL);
pthread_rwlock_unlock(&host_lock);
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_avltree_t *services;
+ sdb_service_t *svc;
+ int status = 0;
+
+ if ((! hostname) || (! service) || (! key))
+ return -1;
+
+ pthread_rwlock_wrlock(&host_lock);
+ services = get_host_children(hostname, SDB_SERVICE);
+ 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(svc->attributes, key, value, last_update);
+
+ sdb_object_deref(SDB_OBJ(svc));
+ pthread_rwlock_unlock(&host_lock);
+ return status;
+} /* sdb_store_service_attr */
+
+int
+sdb_store_host_tojson(sdb_store_obj_t *h, sdb_strbuf_t *buf,
+ sdb_store_matcher_t *filter, int flags)
+{
+ sdb_host_t *host = HOST(h);
if ((! h) || (h->type != SDB_HOST) || (! buf))
return -1;
- host = HOST(h);
+ if (filter && (! sdb_store_matcher_matches(filter, h, NULL)))
+ return 0;
sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(host)->name);
store_common_tojson(h, buf);
if (! (flags & SDB_SKIP_ATTRIBUTES)) {
sdb_strbuf_append(buf, ", \"attributes\": ");
- store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf);
+ store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf, filter, flags);
}
if (! (flags & SDB_SKIP_SERVICES)) {
sdb_strbuf_append(buf, ", \"services\": ");
- store_obj_tojson(host->services, SDB_SERVICE, buf);
+ store_obj_tojson(host->services, SDB_SERVICE, buf, filter, flags);
}
sdb_strbuf_append(buf, "}");
} /* sdb_store_host_tojson */
int
-sdb_store_tojson(sdb_strbuf_t *buf, int flags)
+sdb_store_tojson(sdb_strbuf_t *buf, sdb_store_matcher_t *filter, int flags)
{
- sdb_llist_iter_t *host_iter;
+ sdb_avltree_iter_t *host_iter;
if (! buf)
return -1;
pthread_rwlock_rdlock(&host_lock);
- host_iter = sdb_llist_get_iter(host_list);
+ host_iter = sdb_avltree_get_iter(hosts);
if (! host_iter) {
pthread_rwlock_unlock(&host_lock);
return -1;
sdb_strbuf_append(buf, "{\"hosts\":[");
- 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;
+ size_t len = sdb_strbuf_len(buf);
+
+ host = STORE_OBJ(sdb_avltree_iter_get_next(host_iter));
assert(host);
- if (sdb_store_host_tojson(host, buf, flags))
+ if (sdb_store_host_tojson(host, buf, filter, flags))
return -1;
- if (sdb_llist_iter_has_next(host_iter))
+ /* sdb_store_host_tojson may leave the buffer unmodified */
+ if ((sdb_avltree_iter_has_next(host_iter))
+ && (sdb_strbuf_len(buf) != len))
sdb_strbuf_append(buf, ",");
}
sdb_strbuf_append(buf, "]}");
- sdb_llist_iter_destroy(host_iter);
+ sdb_avltree_iter_destroy(host_iter);
pthread_rwlock_unlock(&host_lock);
return 0;
} /* sdb_store_tojson */
int
sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
{
- sdb_llist_iter_t *host_iter;
+ sdb_avltree_iter_t *host_iter;
int status = 0;
pthread_rwlock_rdlock(&host_lock);
- host_iter = sdb_llist_get_iter(host_list);
+ 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;
+
+ host = STORE_OBJ(sdb_avltree_iter_get_next(host_iter));
assert(host);
if (cb(host, user_data)) {
}
}
- sdb_llist_iter_destroy(host_iter);
+ sdb_avltree_iter_destroy(host_iter);
pthread_rwlock_unlock(&host_lock);
return status;
} /* sdb_store_iterate */