![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index e8d14a079679a12d5a76ef58735b44920065755d..5a80a3105fb0bc011fb4f4dac527c934193ebc72 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include "sysdb.h"
-#include "core/store.h"
+#include "core/store-private.h"
#include "core/plugin.h"
#include "utils/error.h"
#include "utils/llist.h"
* 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;
/*
static sdb_type_t sdb_store_obj_type;
static sdb_type_t sdb_attribute_type;
-struct sdb_store_base {
- sdb_object_t super;
-
- /* object type */
- int type;
-
- /* common meta information */
- sdb_time_t last_update;
- sdb_store_base_t *parent;
-};
-#define STORE_BASE(obj) ((sdb_store_base_t *)(obj))
-#define STORE_CONST_BASE(obj) ((const sdb_store_base_t *)(obj))
-
-typedef struct {
- sdb_store_base_t super;
-
- char *value;
-} sdb_attribute_t;
-#define SDB_ATTR(obj) ((sdb_attribute_t *)(obj))
-#define SDB_CONST_ATTR(obj) ((const sdb_attribute_t *)(obj))
-
-typedef struct {
- sdb_store_base_t super;
-
- sdb_llist_t *children;
- sdb_llist_t *attributes;
-} sdb_store_obj_t;
-#define SDB_STORE_OBJ(obj) ((sdb_store_obj_t *)(obj))
-#define SDB_CONST_STORE_OBJ(obj) ((const sdb_store_obj_t *)(obj))
-
-enum {
- SDB_HOST = 1,
- SDB_SERVICE,
- SDB_ATTRIBUTE,
-};
-#define TYPE_TO_NAME(t) \
- (((t) == SDB_HOST) ? "host" \
- : ((t) == SDB_SERVICE) ? "service" \
- : ((t) == SDB_ATTRIBUTE) ? "attribute" : "unknown")
-
-/* shortcuts for accessing the sdb_store_obj_t attributes
- * of inheriting objects */
-#define _last_update super.last_update
-
static int
store_base_init(sdb_object_t *obj, va_list ap)
{
sobj->type = va_arg(ap, int);
sobj->last_update = va_arg(ap, sdb_time_t);
+ sobj->interval = 0;
sobj->parent = NULL;
return 0;
} /* store_base_init */
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 */
static int
sdb_attr_init(sdb_object_t *obj, va_list ap)
{
- const char *value;
+ const sdb_data_t *value;
int ret;
- /* this will consume the first argument (type) of ap */
+ /* this will consume the first two arguments
+ * (type and last_update) of ap */
ret = store_base_init(obj, ap);
if (ret)
return ret;
- value = va_arg(ap, const char *);
+ value = va_arg(ap, const sdb_data_t *);
- if (value) {
- SDB_ATTR(obj)->value = strdup(value);
- if (! SDB_ATTR(obj)->value)
+ if (value)
+ if (sdb_data_copy(&SDB_ATTR(obj)->value, value))
return -1;
- }
return 0;
} /* sdb_attr_init */
assert(obj);
store_base_destroy(obj);
-
- if (SDB_ATTR(obj)->value)
- free(SDB_ATTR(obj)->value);
+ sdb_data_free_datum(&SDB_ATTR(obj)->value);
} /* sdb_attr_destroy */
static sdb_type_t sdb_store_obj_type = {
*/
static sdb_store_obj_t *
-sdb_store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
+store_lookup_in_list(sdb_llist_t *l, int type, const char *name)
{
sdb_llist_iter_t *iter;
if ((type != SDB_HOST) && (STORE_BASE(sobj)->type == SDB_HOST))
continue;
- sobj = sdb_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;
}
sdb_llist_iter_destroy(iter);
return NULL;
-} /* sdb_store_lookup_in_list */
+} /* store_lookup_in_list */
static sdb_store_obj_t *
-sdb_store_lookup(int type, const char *name)
+store_lookup(int type, const char *name)
{
- return sdb_store_lookup_in_list(obj_list, type, name);
-} /* sdb_store_lookup */
+ 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 = sdb_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(sdb_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));
else
- /* look into services assigned to this host (sdb_store_lookup_in_list
+ /* look into services assigned to this host (store_lookup_in_list
* does not look up services from hierarchical hosts) */
- old = STORE_BASE(sdb_store_lookup_in_list(parent_list, type, name));
+ old = STORE_BASE(store_lookup_in_list(parent_list, type, name));
if (old) {
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 (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 */
{
sdb_llist_iter_t *iter;
char time_str[64];
+ char interval_str[64];
assert((type == SDB_ATTRIBUTE) || (type == SDB_SERVICE));
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 */
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';
+
sdb_strbuf_append(buf, "{\"name\": \"%s\", ", SDB_OBJ(sobj)->name);
- if (type == SDB_ATTRIBUTE)
- sdb_strbuf_append(buf, "\"value\": \"%s\", ",
- SDB_ATTR(sobj)->value);
- sdb_strbuf_append(buf, "\"last_update\": \"%s\"}", time_str);
+ if (type == SDB_ATTRIBUTE) {
+ char tmp[sdb_data_strlen(&SDB_ATTR(sobj)->value) + 1];
+ sdb_data_format(&SDB_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);
+ }
+ else
+ sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
+ "\"update_interval\": \"%s\"}", time_str, interval_str);
if (sdb_llist_iter_has_next(iter))
sdb_strbuf_append(buf, ",");
* public API
*/
+void
+sdb_store_clear(void)
+{
+ sdb_llist_destroy(host_list);
+ host_list = NULL;
+} /* sdb_store_clear */
+
int
sdb_store_host(const char *name, sdb_time_t last_update)
{
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);
if (! name)
return NULL;
- host = sdb_store_lookup(SDB_HOST, name);
+ host = store_lookup(SDB_HOST, name);
return host != NULL;
} /* sdb_store_has_host */
if (! name)
return NULL;
- host = sdb_store_lookup(SDB_HOST, name);
+ host = store_lookup(SDB_HOST, name);
if (! host)
return NULL;
} /* sdb_store_get_host */
int
-sdb_store_attribute(const char *hostname, const char *key, const char *value,
+sdb_store_attribute(const char *hostname,
+ const char *key, const sdb_data_t *value,
sdb_time_t last_update)
{
int status;
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_ATTR(updated_attr)->value = strdup(value);
- if (! SDB_ATTR(updated_attr)->value) {
+ 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);
{
sdb_store_obj_t *host;
char time_str[64];
+ char interval_str[64];
if ((! h) || (h->type != SDB_HOST) || (! buf))
return -1;
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\"",
- SDB_OBJ(host)->name, time_str);
+ "\"last_update\": \"%s\", \"update_interval\": \"%s\"",
+ SDB_OBJ(host)->name, time_str, interval_str);
if (! (flags & SDB_SKIP_ATTRIBUTES)) {
sdb_strbuf_append(buf, ", \"attributes\": ");
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, "}");
return 0;
} /* sdb_store_host_tojson */
-/* TODO: actually support hierarchical data */
int
sdb_store_tojson(sdb_strbuf_t *buf, int flags)
{
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;
return 0;
} /* sdb_store_tojson */
+/* TODO: actually support hierarchical data */
+int
+sdb_store_iterate(sdb_store_iter_cb cb, void *user_data)
+{
+ sdb_llist_iter_t *host_iter;
+ int status = 0;
+
+ pthread_rwlock_rdlock(&obj_lock);
+
+ host_iter = sdb_llist_get_iter(host_list);
+ if (! host_iter)
+ status = -1;
+
+ /* 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));
+ assert(host);
+
+ if (cb(host, user_data)) {
+ status = -1;
+ break;
+ }
+ }
+
+ sdb_llist_iter_destroy(host_iter);
+ pthread_rwlock_unlock(&obj_lock);
+ return status;
+} /* sdb_store_iterate */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */