diff --git a/src/core/store.c b/src/core/store.c
index fd08de9101272dfafa7e7b0e6f8e4dbe1d626675..5a80a3105fb0bc011fb4f4dac527c934193ebc72 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
* private variables
*/
-static sdb_llist_t *obj_list = NULL;
+static sdb_llist_t *host_list = NULL;
static pthread_rwlock_t obj_lock = PTHREAD_RWLOCK_INITIALIZER;
/*
if (ret)
return ret;
- sobj->children = sdb_llist_create();
- if (! sobj->children)
+ sobj->services = sdb_llist_create();
+ if (! sobj->services)
return -1;
sobj->attributes = sdb_llist_create();
if (! sobj->attributes)
store_base_destroy(obj);
- if (sobj->children)
- sdb_llist_destroy(sobj->children);
+ if (sobj->services)
+ sdb_llist_destroy(sobj->services);
if (sobj->attributes)
sdb_llist_destroy(sobj->attributes);
} /* sdb_store_obj_destroy */
if ((type != SDB_HOST) && (STORE_BASE(sobj)->type == SDB_HOST))
continue;
- sobj = store_lookup_in_list(sobj->children, type, name);
+ sobj = store_lookup_in_list(sobj->services, type, name);
if (sobj) {
sdb_llist_iter_destroy(iter);
return sobj;
static sdb_store_obj_t *
store_lookup(int type, const char *name)
{
- return store_lookup_in_list(obj_list, type, name);
+ return store_lookup_in_list(host_list, type, name);
} /* store_lookup */
/* The obj_lock has to be acquired before calling this function. */
static int
-store_obj(int parent_type, const char *parent_name,
- int type, const char *name, sdb_time_t last_update,
- sdb_store_base_t **updated_obj)
+store_obj(const char *hostname, int type, const char *name,
+ sdb_time_t last_update, sdb_store_base_t **updated_obj)
{
- char *parent_cname = NULL, *cname = NULL;
+ char *host_cname = NULL, *cname = NULL;
sdb_llist_t *parent_list;
sdb_store_base_t *old;
if (last_update <= 0)
last_update = sdb_gettime();
- assert((parent_type == 0)
- || (parent_type == SDB_HOST)
- || (parent_type == SDB_SERVICE));
assert((type == 0)
|| (type == SDB_HOST)
|| (type == SDB_SERVICE)
|| (type == SDB_ATTRIBUTE));
- if (parent_type == SDB_HOST) {
- parent_cname = sdb_plugin_cname(strdup(parent_name));
- if (! parent_cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ if (! host_list)
+ if (! (host_list = sdb_llist_create()))
return -1;
- }
- parent_name = parent_cname;
- }
+ parent_list = host_list;
+
if (type == SDB_HOST) {
cname = sdb_plugin_cname(strdup(name));
if (! cname) {
name = cname;
}
- if (! obj_list) {
- if (! (obj_list = sdb_llist_create())) {
- free(parent_cname);
+ if (hostname) {
+ sdb_store_obj_t *parent;
+
+ host_cname = sdb_plugin_cname(strdup(hostname));
+ if (! host_cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
free(cname);
return -1;
}
- }
- parent_list = obj_list;
-
- if (parent_type && parent_name) {
- sdb_store_obj_t *parent;
+ hostname = host_cname;
- parent = store_lookup(parent_type, parent_name);
+ parent = store_lookup(SDB_HOST, hostname);
if (! parent) {
sdb_log(SDB_LOG_ERR, "store: Failed to store %s '%s' - "
- "parent %s '%s' not found", TYPE_TO_NAME(type), name,
- TYPE_TO_NAME(parent_type), parent_name);
- free(parent_cname);
+ "host '%s' not found", SDB_STORE_TYPE_TO_NAME(type),
+ name, hostname);
+ free(host_cname);
free(cname);
return -1;
}
if (type == SDB_ATTRIBUTE)
parent_list = parent->attributes;
else
- parent_list = parent->children;
+ parent_list = parent->services;
}
if (type == SDB_HOST)
/* make sure that each host is unique */
- old = STORE_BASE(store_lookup_in_list(obj_list, type, name));
+ old = STORE_BASE(store_lookup_in_list(host_list, type, name));
else if (type == SDB_ATTRIBUTE)
/* look into attributes of this host */
old = STORE_BASE(sdb_llist_search_by_name(parent_list, name));
if (old->last_update > last_update) {
sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
"value too old (%"PRIscTIME" < %"PRIscTIME")",
- TYPE_TO_NAME(type), name, last_update, old->last_update);
+ SDB_STORE_TYPE_TO_NAME(type), name,
+ last_update, old->last_update);
/* don't report an error; the object may be updated by multiple
* backends */
status = 1;
else {
sdb_time_t interval = last_update - old->last_update;
old->last_update = last_update;
- if (old->interval)
- old->interval = (sdb_time_t)((0.9 * (double)old->interval)
- + (0.1 * (double)interval));
- else
- old->interval = interval;
+ if (interval) {
+ if (old->interval)
+ old->interval = (sdb_time_t)((0.9 * (double)old->interval)
+ + (0.1 * (double)interval));
+ else
+ old->interval = interval;
+ }
}
if (updated_obj)
if (! new) {
char errbuf[1024];
sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
- TYPE_TO_NAME(type), name,
+ SDB_STORE_TYPE_TO_NAME(type), name,
sdb_strerror(errno, errbuf, sizeof(errbuf)));
- free(parent_cname);
+ free(host_cname);
free(cname);
return -1;
}
- /* TODO: insert type-aware; the current version works as long as we
- * don't support to store hierarchical data */
status = sdb_llist_insert_sorted(parent_list, SDB_OBJ(new),
sdb_object_cmp_by_name);
if (updated_obj)
*updated_obj = new;
}
- free(parent_cname);
+ free(host_cname);
free(cname);
return status;
} /* store_obj */
if (! iter) {
char errbuf[1024];
sdb_log(SDB_LOG_ERR, "store: Failed to retrieve %ss: %s\n",
- TYPE_TO_NAME(type),
+ SDB_STORE_TYPE_TO_NAME(type),
sdb_strerror(errno, errbuf, sizeof(errbuf)));
sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve %ss: %s\"}",
- TYPE_TO_NAME(type), errbuf);
+ SDB_STORE_TYPE_TO_NAME(type), errbuf);
}
/* has_next returns false if the iterator is NULL */
void
sdb_store_clear(void)
{
- sdb_llist_destroy(obj_list);
- obj_list = NULL;
+ sdb_llist_destroy(host_list);
+ host_list = NULL;
} /* sdb_store_clear */
int
return -1;
pthread_rwlock_wrlock(&obj_lock);
- status = store_obj(/* parent = */ 0, NULL,
+ status = store_obj(/* hostname = */ NULL,
/* stored object = */ SDB_HOST, name, last_update,
/* updated_obj = */ NULL);
pthread_rwlock_unlock(&obj_lock);
return -1;
pthread_rwlock_wrlock(&obj_lock);
- status = store_obj(/* parent = */ SDB_HOST, hostname,
+ status = store_obj(hostname,
/* stored object = */ SDB_ATTRIBUTE, key, last_update,
&updated_attr);
if (status >= 0) {
assert(updated_attr);
+ sdb_data_free_datum(&SDB_ATTR(updated_attr)->value);
if (sdb_data_copy(&SDB_ATTR(updated_attr)->value, value)) {
sdb_object_deref(SDB_OBJ(updated_attr));
status = -1;
return -1;
pthread_rwlock_wrlock(&obj_lock);
- status = store_obj(/* parent = */ SDB_HOST, hostname,
+ status = store_obj(hostname,
/* stored object = */ SDB_SERVICE, name, last_update,
/* updated obj = */ NULL);
pthread_rwlock_unlock(&obj_lock);
if (! (flags & SDB_SKIP_SERVICES)) {
sdb_strbuf_append(buf, ", \"services\": ");
- store_obj_tojson(host->children, SDB_SERVICE, buf);
+ store_obj_tojson(host->services, SDB_SERVICE, buf);
}
sdb_strbuf_append(buf, "}");
pthread_rwlock_rdlock(&obj_lock);
- host_iter = sdb_llist_get_iter(obj_list);
+ host_iter = sdb_llist_get_iter(host_list);
if (! host_iter) {
pthread_rwlock_unlock(&obj_lock);
return -1;
pthread_rwlock_rdlock(&obj_lock);
- host_iter = sdb_llist_get_iter(obj_list);
+ host_iter = sdb_llist_get_iter(host_list);
if (! host_iter)
status = -1;