![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index ccb5f0a954d97e0f867bc2bb2067573245e30133..1c04a77cb6a6c1ce252380211ee8bdb9de188309 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
*/
static sdb_llist_t *host_list = NULL;
-static pthread_rwlock_t obj_lock = PTHREAD_RWLOCK_INITIALIZER;
+static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
/*
* private types
static sdb_type_t sdb_attribute_type;
static int
-store_base_init(sdb_object_t *obj, va_list ap)
+store_obj_init(sdb_object_t *obj, va_list ap)
{
- sdb_store_base_t *sobj = STORE_BASE(obj);
+ sdb_store_obj_t *sobj = STORE_OBJ(obj);
sobj->type = va_arg(ap, int);
sobj->last_update = va_arg(ap, sdb_time_t);
sobj->interval = 0;
+ sobj->backends = NULL;
+ sobj->backends_num = 0;
sobj->parent = NULL;
return 0;
-} /* store_base_init */
+} /* store_obj_init */
static void
-store_base_destroy(sdb_object_t *obj)
+store_obj_destroy(sdb_object_t *obj)
{
- const sdb_store_base_t *sobj = STORE_CONST_BASE(obj);
+ sdb_store_obj_t *sobj = STORE_OBJ(obj);
+ size_t i;
+
+ for (i = 0; i < sobj->backends_num; ++i)
+ free(sobj->backends[i]);
+ free(sobj->backends);
+ sobj->backends = NULL;
+ sobj->backends_num = 0;
if (sobj->parent)
sdb_object_deref(SDB_OBJ(sobj->parent));
-} /* store_base_destroy */
+} /* store_obj_destroy */
static int
sdb_host_init(sdb_object_t *obj, va_list ap)
int ret;
/* this will consume the first argument (type) of ap */
- ret = store_base_init(obj, ap);
+ ret = store_obj_init(obj, ap);
if (ret)
return ret;
sdb_host_t *sobj = HOST(obj);
assert(obj);
- store_base_destroy(obj);
+ store_obj_destroy(obj);
if (sobj->services)
sdb_llist_destroy(sobj->services);
int ret;
/* this will consume the first argument (type) of ap */
- ret = store_base_init(obj, ap);
+ ret = store_obj_init(obj, ap);
if (ret)
return ret;
sdb_service_t *sobj = SVC(obj);
assert(obj);
- store_base_destroy(obj);
+ store_obj_destroy(obj);
if (sobj->attributes)
sdb_llist_destroy(sobj->attributes);
/* this will consume the first two arguments
* (type and last_update) of ap */
- ret = store_base_init(obj, ap);
+ ret = store_obj_init(obj, ap);
if (ret)
return ret;
value = va_arg(ap, const sdb_data_t *);
{
assert(obj);
- store_base_destroy(obj);
+ store_obj_destroy(obj);
sdb_data_free_datum(&ATTR(obj)->value);
} /* sdb_attr_destroy */
return HOST(sdb_llist_search_by_name(host_list, name));
} /* lookup_host */
-/* The obj_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_base_t **updated_obj)
+record_backend(sdb_store_obj_t *obj)
{
- char *host_cname = NULL, *cname = NULL;
-
- sdb_llist_t *parent_list;
- sdb_store_base_t *old;
- int status = 0;
+ const sdb_plugin_info_t *info;
+ char **tmp;
+ size_t i;
- if (last_update <= 0)
- last_update = sdb_gettime();
+ info = sdb_plugin_current();
+ if (! info)
+ return 0;
- assert((type == 0)
- || (type == SDB_HOST)
- || (type == SDB_SERVICE)
- || (type == SDB_ATTRIBUTE));
+ for (i = 0; i < obj->backends_num; ++i)
+ if (!strcasecmp(obj->backends[i], info->plugin_name))
+ return 0;
- assert(hostname || (type == SDB_HOST));
- assert((! hostname)
- || (type == SDB_SERVICE)
- || (type == SDB_ATTRIBUTE));
-
- 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_llist_t *parent_list, 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_list);
- if (type == SDB_HOST)
- old = STORE_BASE(sdb_llist_search_by_name(host_list, name));
- else
- old = STORE_BASE(sdb_llist_search_by_name(parent_list, name));
+ if (last_update <= 0)
+ last_update = sdb_gettime();
+ old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
if (old) {
- if (old->last_update > last_update) {
+ if (old->last_update >= last_update) {
sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
"value too old (%"PRIscTIME" < %"PRIscTIME")",
SDB_STORE_TYPE_TO_NAME(type), name,
}
}
- if (updated_obj)
- *updated_obj = old;
+ new = old;
}
else {
- sdb_store_base_t *new;
-
if (type == SDB_ATTRIBUTE) {
/* the value will be updated by the caller */
- new = STORE_BASE(sdb_object_create(name, sdb_attribute_type,
+ new = STORE_OBJ(sdb_object_create(name, sdb_attribute_type,
type, last_update, NULL));
}
else {
sdb_type_t t;
t = type == SDB_HOST ? sdb_host_type : sdb_service_type;
- new = STORE_BASE(sdb_object_create(name, t, type, last_update));
+ new = STORE_OBJ(sdb_object_create(name, t, type, last_update));
}
- if (! new) {
+ if (new) {
+ status = sdb_llist_insert_sorted(parent_list, SDB_OBJ(new),
+ sdb_object_cmp_by_name);
+
+ /* pass control to the list or destroy in case of an error */
+ sdb_object_deref(SDB_OBJ(new));
+ }
+ else {
char errbuf[1024];
sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
SDB_STORE_TYPE_TO_NAME(type), name,
sdb_strerror(errno, errbuf, sizeof(errbuf)));
- free(host_cname);
- free(cname);
- return -1;
+ status = -1;
}
+ }
- status = sdb_llist_insert_sorted(parent_list, SDB_OBJ(new),
- sdb_object_cmp_by_name);
+ if (status < 0)
+ return status;
+ assert(new);
- /* pass control to the list or destroy in case of an error */
- sdb_object_deref(SDB_OBJ(new));
+ if (updated_obj)
+ *updated_obj = new;
- if (updated_obj)
- *updated_obj = new;
- }
- free(host_cname);
- free(cname);
+ if (record_backend(new))
+ return -1;
return status;
} /* store_obj */
+static int
+store_attr(sdb_llist_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;
+
+ /* don't update unchanged values */
+ if (! sdb_data_cmp(&ATTR(attr)->value, value))
+ return status;
+
+ assert(attr);
+ if (sdb_data_copy(&ATTR(attr)->value, value))
+ return -1;
+ return status;
+} /* store_attr */
+
+/* The host_lock has to be acquired before calling this function. */
+static sdb_llist_t *
+get_host_children(const char *hostname, int type)
+{
+ char *cname = NULL;
+ sdb_host_t *host;
+
+ assert(hostname);
+ assert((type == SDB_SERVICE) || (type == SDB_ATTRIBUTE));
+
+ if (! host_list)
+ 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;
+
+ if (type == SDB_ATTRIBUTE)
+ return host->attributes;
+ else
+ return host->services;
+} /* get_host_children */
+
+/*
+ * store_common_tojson serializes common object attributes to JSON.
+ *
+ * The function never returns an error. Rather, an error message will be part
+ * of the serialized data.
+ */
+static void
+store_common_tojson(sdb_store_obj_t *obj, sdb_strbuf_t *buf)
+{
+ char time_str[64];
+ char interval_str[64];
+ size_t i;
+
+ if (! sdb_strftime(time_str, sizeof(time_str),
+ "%F %T %z", obj->last_update))
+ snprintf(time_str, sizeof(time_str), "<error>");
+ time_str[sizeof(time_str) - 1] = '\0';
+
+ if (! sdb_strfinterval(interval_str, sizeof(interval_str),
+ obj->interval))
+ snprintf(interval_str, sizeof(interval_str), "<error>");
+ interval_str[sizeof(interval_str) - 1] = '\0';
+
+ sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
+ "\"update_interval\": \"%s\", \"backends\": [",
+ time_str, interval_str);
+
+ for (i = 0; i < obj->backends_num; ++i) {
+ sdb_strbuf_append(buf, "\"%s\"", obj->backends[i]);
+ if (i < obj->backends_num - 1)
+ sdb_strbuf_append(buf, ",");
+ }
+ sdb_strbuf_append(buf, "]");
+} /* store_common_tojson */
+
/*
* store_obj_tojson serializes attribute / service objects to JSON.
*
store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
{
sdb_llist_iter_t *iter;
- char time_str[64];
- char interval_str[64];
assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
sdb_strbuf_append(buf, "[");
-
iter = sdb_llist_get_iter(list);
if (! iter) {
char errbuf[1024];
/* has_next returns false if the iterator is NULL */
while (sdb_llist_iter_has_next(iter)) {
- sdb_store_base_t *sobj = STORE_BASE(sdb_llist_iter_get_next(iter));
+ sdb_store_obj_t *sobj = STORE_OBJ(sdb_llist_iter_get_next(iter));
assert(sobj);
-
- if (! sdb_strftime(time_str, sizeof(time_str),
- "%F %T %z", sobj->last_update))
- snprintf(time_str, sizeof(time_str), "<error>");
- time_str[sizeof(time_str) - 1] = '\0';
-
- if (! sdb_strfinterval(interval_str, sizeof(interval_str),
- sobj->interval))
- snprintf(interval_str, sizeof(interval_str), "<error>");
- interval_str[sizeof(interval_str) - 1] = '\0';
+ assert(sobj->type == type);
sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
- if (type == SDB_ATTRIBUTE) {
+ if (sobj->type == SDB_ATTRIBUTE) {
char tmp[sdb_data_strlen(&ATTR(sobj)->value) + 1];
sdb_data_format(&ATTR(sobj)->value, tmp, sizeof(tmp),
SDB_DOUBLE_QUOTED);
- sdb_strbuf_append(buf, "\"value\": %s, \"last_update\": \"%s\", "
- "\"update_interval\": \"%s\"}", tmp, time_str,
- interval_str);
+ sdb_strbuf_append(buf, "\"value\": %s, ", tmp);
}
- else
- sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
- "\"update_interval\": \"%s\"}", time_str, interval_str);
+
+ store_common_tojson(sobj, buf);
+ sdb_strbuf_append(buf, "}");
if (sdb_llist_iter_has_next(iter))
sdb_strbuf_append(buf, ",");
int
sdb_store_host(const char *name, sdb_time_t last_update)
{
- int status;
+ char *cname = NULL;
+ int status = 0;
if (! name)
return -1;
- pthread_rwlock_wrlock(&obj_lock);
- status = store_obj(/* hostname = */ NULL,
- /* stored object = */ SDB_HOST, name, last_update,
- /* updated_obj = */ NULL);
- pthread_rwlock_unlock(&obj_lock);
+ cname = sdb_plugin_cname(strdup(name));
+ if (! cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ return -1;
+ }
+
+ pthread_rwlock_wrlock(&host_lock);
+ if (! host_list)
+ if (! (host_list = sdb_llist_create()))
+ status = -1;
+
+ if (! status)
+ status = store_obj(host_list, SDB_HOST, cname, last_update, NULL);
+ pthread_rwlock_unlock(&host_lock);
+
+ free(cname);
return status;
} /* sdb_store_host */
return host != NULL;
} /* sdb_store_has_host */
-sdb_store_base_t *
+sdb_store_obj_t *
sdb_store_get_host(const char *name)
{
sdb_host_t *host;
return NULL;
sdb_object_ref(SDB_OBJ(host));
- return STORE_BASE(host);
+ return STORE_OBJ(host);
} /* sdb_store_get_host */
int
const char *key, const sdb_data_t *value,
sdb_time_t last_update)
{
- int status;
-
- sdb_store_base_t *updated_attr = NULL;
+ sdb_llist_t *attrs;
+ int status = 0;
if ((! hostname) || (! key))
return -1;
- pthread_rwlock_wrlock(&obj_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;
- }
+ pthread_rwlock_wrlock(&host_lock);
+ 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;
}
- pthread_rwlock_unlock(&obj_lock);
+ 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_llist_t *services;
+
+ int status = 0;
if ((! hostname) || (! name))
return -1;
- pthread_rwlock_wrlock(&obj_lock);
- status = store_obj(hostname,
- /* stored object = */ SDB_SERVICE, name, last_update,
- /* updated obj = */ NULL);
- pthread_rwlock_unlock(&obj_lock);
+ pthread_rwlock_wrlock(&host_lock);
+ 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_base_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_llist_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_llist_search_by_name(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);
+
+ 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, int flags)
{
sdb_host_t *host;
- char time_str[64];
- char interval_str[64];
if ((! h) || (h->type != SDB_HOST) || (! buf))
return -1;
host = HOST(h);
- if (! sdb_strftime(time_str, sizeof(time_str),
- "%F %T %z", host->_last_update))
- snprintf(time_str, sizeof(time_str), "<error>");
- time_str[sizeof(time_str) - 1] = '\0';
-
- if (! sdb_strfinterval(interval_str, sizeof(interval_str),
- host->_interval))
- snprintf(interval_str, sizeof(interval_str), "<error>");
- interval_str[sizeof(interval_str) - 1] = '\0';
-
- sdb_strbuf_append(buf, "{\"name\": \"%s\", "
- "\"last_update\": \"%s\", \"update_interval\": \"%s\"",
- SDB_OBJ(host)->name, time_str, interval_str);
+ 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\": ");
if (! buf)
return -1;
- pthread_rwlock_rdlock(&obj_lock);
+ pthread_rwlock_rdlock(&host_lock);
host_iter = sdb_llist_get_iter(host_list);
if (! host_iter) {
- pthread_rwlock_unlock(&obj_lock);
+ pthread_rwlock_unlock(&host_lock);
return -1;
}
sdb_strbuf_append(buf, "{\"hosts\":[");
while (sdb_llist_iter_has_next(host_iter)) {
- sdb_store_base_t *host = STORE_BASE(sdb_llist_iter_get_next(host_iter));
+ sdb_store_obj_t *host = STORE_OBJ(sdb_llist_iter_get_next(host_iter));
assert(host);
if (sdb_store_host_tojson(host, buf, flags))
sdb_strbuf_append(buf, "]}");
sdb_llist_iter_destroy(host_iter);
- pthread_rwlock_unlock(&obj_lock);
+ pthread_rwlock_unlock(&host_lock);
return 0;
} /* sdb_store_tojson */
sdb_llist_iter_t *host_iter;
int status = 0;
- pthread_rwlock_rdlock(&obj_lock);
+ pthread_rwlock_rdlock(&host_lock);
host_iter = sdb_llist_get_iter(host_list);
if (! host_iter)
/* has_next returns false if the iterator is NULL */
while (sdb_llist_iter_has_next(host_iter)) {
- sdb_store_base_t *host = STORE_BASE(sdb_llist_iter_get_next(host_iter));
+ sdb_store_obj_t *host = STORE_OBJ(sdb_llist_iter_get_next(host_iter));
assert(host);
if (cb(host, user_data)) {
}
sdb_llist_iter_destroy(host_iter);
- pthread_rwlock_unlock(&obj_lock);
+ pthread_rwlock_unlock(&host_lock);
return status;
} /* sdb_store_iterate */