![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index 80beffbb2b15b5f389da7f435e4606b43fd6c742..e9e0979e72e4db10ec99d34f2596f178c5d19317 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
#include "sysdb.h"
#include "core/store.h"
-#include "core/error.h"
#include "core/plugin.h"
+#include "utils/error.h"
#include "utils/llist.h"
#include <assert.h>
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_obj_init(sdb_object_t *obj, va_list __attribute__((unused)) ap)
+store_obj_init(sdb_object_t *obj, va_list ap)
{
store_obj_t *sobj = STORE_OBJ(obj);
- sobj->last_update = sdb_gettime();
- /* ignore errors -> last_update will be updated later */
+ sobj->last_update = va_arg(ap, sdb_time_t);
sobj->parent = NULL;
return 0;
sdb_object_deref(SDB_OBJ(sobj->parent));
} /* store_obj_destroy */
-static sdb_object_t *
-store_obj_clone(const sdb_object_t *obj)
-{
- const store_obj_t *sobj = STORE_CONST_OBJ(obj);
- store_obj_t *new;
-
- new = STORE_OBJ(sdb_object_create(obj->name, obj->type));
- if (! new)
- return NULL;
-
- new->last_update = sobj->last_update;
- sdb_object_ref(SDB_OBJ(sobj->parent));
- new->parent = sobj->parent;
- return SDB_OBJ(new);
-} /* store_obj_clone */
-
static int
sdb_store_obj_init(sdb_object_t *obj, va_list ap)
{
sdb_llist_destroy(sobj->attributes);
} /* sdb_store_obj_destroy */
-static sdb_object_t *
-sdb_store_obj_clone(const sdb_object_t *obj)
-{
- const sdb_store_obj_t *sobj = SDB_CONST_STORE_OBJ(obj);
- sdb_store_obj_t *new;
-
- new = SDB_STORE_OBJ(store_obj_clone(obj));
- if (! new)
- return NULL;
-
- new->type = sobj->type;
-
- /* make sure these are initialized; else sdb_object_deref() might access
- * arbitrary memory in case of an error */
- new->children = new->attributes = NULL;
-
- if (sobj->children) {
- new->children = sdb_llist_clone(sobj->children);
- if (! new->children) {
- sdb_object_deref(SDB_OBJ(new));
- return NULL;
- }
- }
- if (sobj->attributes) {
- new->attributes = sdb_llist_clone(sobj->attributes);
- if (! new->attributes) {
- sdb_object_deref(SDB_OBJ(new));
- return NULL;
- }
- }
-
- new->_last_update = sobj->_last_update;
- return SDB_OBJ(new);
-} /* sdb_store_obj_clone */
-
static int
sdb_attr_init(sdb_object_t *obj, va_list ap)
{
- const char *value = va_arg(ap, const char *);
+ const char *value;
int ret;
ret = store_obj_init(obj, ap);
if (ret)
return ret;
+ value = va_arg(ap, const char *);
- SDB_ATTR(obj)->value = strdup(value);
- if (! SDB_ATTR(obj)->value)
- return -1;
+ if (value) {
+ SDB_ATTR(obj)->value = strdup(value);
+ if (! SDB_ATTR(obj)->value)
+ return -1;
+ }
return 0;
} /* sdb_attr_init */
free(SDB_ATTR(obj)->value);
} /* sdb_attr_destroy */
-static sdb_object_t *
-sdb_attr_clone(const sdb_object_t *obj)
-{
- const sdb_attribute_t *attr = (const sdb_attribute_t *)obj;
- sdb_attribute_t *new;
-
- new = SDB_ATTR(store_obj_clone(obj));
- if (! new)
- return NULL;
-
- if (attr->value)
- new->value = strdup(attr->value);
- if (! new->value) {
- sdb_object_deref(SDB_OBJ(new));
- return NULL;
- }
- return SDB_OBJ(new);
-} /* sdb_attr_clone */
-
static sdb_type_t sdb_store_obj_type = {
sizeof(sdb_store_obj_t),
sdb_store_obj_init,
- sdb_store_obj_destroy,
- sdb_store_obj_clone
+ sdb_store_obj_destroy
};
static sdb_type_t sdb_attribute_type = {
sizeof(sdb_attribute_t),
sdb_attr_init,
- sdb_attr_destroy,
- sdb_attr_clone
+ sdb_attr_destroy
};
/*
return sdb_store_lookup_in_list(obj_list, type, name);
} /* sdb_store_lookup */
-/*
- * public API
- */
-
-int
-sdb_store_host(const char *name, sdb_time_t last_update)
+/* 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,
+ store_obj_t **updated_obj)
{
- sdb_store_obj_t *old;
+ char *parent_cname = NULL, *cname = NULL;
- char *cname;
+ sdb_llist_t *parent_list;
+ store_obj_t *old;
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;
- }
-
if (last_update <= 0)
last_update = sdb_gettime();
- pthread_rwlock_wrlock(&obj_lock);
+ 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");
+ return -1;
+ }
+ parent_name = parent_cname;
+ }
+ if (type == SDB_HOST) {
+ cname = sdb_plugin_cname(strdup(name));
+ if (! cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ return -1;
+ }
+ name = cname;
+ }
if (! obj_list) {
if (! (obj_list = sdb_llist_create())) {
- pthread_rwlock_unlock(&obj_lock);
+ free(parent_cname);
+ free(cname);
+ return -1;
+ }
+ }
+ parent_list = obj_list;
+
+ if (parent_type && parent_name) {
+ sdb_store_obj_t *parent;
+
+ parent = sdb_store_lookup(parent_type, parent_name);
+ 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);
+ free(cname);
return -1;
}
+
+ if (type == SDB_ATTRIBUTE)
+ parent_list = parent->attributes;
+ else
+ parent_list = parent->children;
}
- old = sdb_store_lookup(SDB_HOST, cname);
+ /* TODO: only look into direct children? */
+ if (type == SDB_HOST)
+ /* make sure that each host is unique */
+ old = STORE_OBJ(sdb_store_lookup_in_list(obj_list, type, name));
+ else if (type == SDB_ATTRIBUTE)
+ old = STORE_OBJ(sdb_llist_search_by_name(parent_list, name));
+ else
+ old = STORE_OBJ(sdb_store_lookup_in_list(parent_list, type, name));
if (old) {
- if (old->_last_update > last_update) {
- sdb_log(SDB_LOG_DEBUG, "store: Cannot update host '%s' - "
+ if (old->last_update > last_update) {
+ sdb_log(SDB_LOG_DEBUG, "store: Cannot update %s '%s' - "
"value too old (%"PRIscTIME" < %"PRIscTIME")",
- cname, last_update, old->_last_update);
- /* don't report an error; the host may be updated by multiple
+ 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 {
- old->_last_update = last_update;
+ old->last_update = last_update;
}
- free(cname);
+
+ if (updated_obj)
+ *updated_obj = old;
}
else {
- sdb_store_obj_t *new = SDB_STORE_OBJ(sdb_object_create(cname,
- sdb_store_obj_type, SDB_HOST));
+ store_obj_t *new;
+
+ if (type == SDB_ATTRIBUTE)
+ /* the value will be updated by the caller */
+ new = STORE_OBJ(sdb_object_create(name, sdb_attribute_type,
+ last_update, NULL));
+ else
+ new = STORE_OBJ(sdb_object_create(name, sdb_store_obj_type,
+ last_update, type));
+
if (! new) {
char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "store: Failed to create host %s: %s",
- cname, sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ sdb_log(SDB_LOG_ERR, "store: Failed to create %s '%s': %s",
+ TYPE_TO_NAME(type), name,
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ free(parent_cname);
free(cname);
- pthread_rwlock_unlock(&obj_lock);
return -1;
}
- free(cname);
- /* TODO: add support for hierarchical inserts */
- status = sdb_llist_insert_sorted(obj_list, SDB_OBJ(new),
+ /* 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);
/* pass control to the list or destroy in case of an error */
sdb_object_deref(SDB_OBJ(new));
+
+ if (updated_obj)
+ *updated_obj = new;
}
+ free(parent_cname);
+ free(cname);
+ return status;
+} /* sdb_store_obj */
+
+/*
+ * public API
+ */
+int
+sdb_store_host(const char *name, sdb_time_t last_update)
+{
+ int status;
+
+ if (! name)
+ return -1;
+
+ pthread_rwlock_wrlock(&obj_lock);
+ status = store_obj(/* parent = */ 0, NULL,
+ /* stored object = */ SDB_HOST, name, last_update,
+ /* updated_obj = */ NULL);
pthread_rwlock_unlock(&obj_lock);
return status;
} /* sdb_store_host */
sdb_store_attribute(const char *hostname, const char *key, const char *value,
sdb_time_t last_update)
{
- sdb_store_obj_t *sobj;
- sdb_attribute_t *old;
+ int status;
- int status = 0;
+ store_obj_t *updated_attr = NULL;
if ((! hostname) || (! key))
return -1;
- if (last_update <= 0)
- last_update = sdb_gettime();
-
- if (! obj_list)
- return -1;
-
pthread_rwlock_wrlock(&obj_lock);
-
- sobj = sdb_store_lookup(SDB_HOST, hostname);
- if (! sobj) {
- pthread_rwlock_unlock(&obj_lock);
- return -1;
- }
-
- old = SDB_ATTR(sdb_llist_search_by_name(sobj->attributes, key));
- if (old) {
- if (old->_last_update > last_update) {
- sdb_log(SDB_LOG_DEBUG, "store: Cannot update attribute "
- "'%s/%s' - value too old (%"PRIscTIME" < %"PRIscTIME")",
- hostname, key, last_update, old->_last_update);
- status = 1;
- }
- else {
- old->_last_update = last_update;
+ status = store_obj(/* parent = */ SDB_HOST, 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_object_deref(SDB_OBJ(updated_attr));
+ status = -1;
}
}
- else {
- sdb_attribute_t *new = SDB_ATTR(sdb_object_create(key,
- sdb_attribute_type, value));
- if (! new) {
- char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "store: Failed to clone attribute "
- "object: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
- pthread_rwlock_unlock(&obj_lock);
- return -1;
- }
-
- status = sdb_llist_insert_sorted(sobj->attributes, 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));
- }
pthread_rwlock_unlock(&obj_lock);
return status;
sdb_store_service(const char *hostname, const char *name,
sdb_time_t last_update)
{
- sdb_store_obj_t *host;
- sdb_store_obj_t *old;
-
- int status = 0;
+ int status;
if ((! hostname) || (! name))
return -1;
- if (last_update <= 0)
- last_update = sdb_gettime();
-
- if (! obj_list)
- return -1;
-
pthread_rwlock_wrlock(&obj_lock);
-
- host = sdb_store_lookup(SDB_HOST, hostname);
- if (! host) {
- pthread_rwlock_unlock(&obj_lock);
- return -1;
- }
-
- /* TODO: only look into direct children? */
- old = sdb_store_lookup_in_list(host->children, SDB_SERVICE, name);
- if (old) {
- if (old->_last_update > last_update) {
- sdb_log(SDB_LOG_DEBUG, "store: Cannot update service "
- "'%s/%s' - value too old (%"PRIscTIME" < %"PRIscTIME")",
- hostname, name, last_update, old->_last_update);
- status = 1;
- }
- else {
- old->_last_update = last_update;
- }
- }
- else {
- sdb_store_obj_t *new = SDB_STORE_OBJ(sdb_object_create(name,
- sdb_store_obj_type, SDB_SERVICE));
- if (! new) {
- char errbuf[1024];
- sdb_log(SDB_LOG_ERR, "store: Failed to clone service "
- "object: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
- pthread_rwlock_unlock(&obj_lock);
- return -1;
- }
-
- status = sdb_llist_insert_sorted(host->children, 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));
- }
-
+ status = store_obj(/* parent = */ SDB_HOST, hostname,
+ /* stored object = */ SDB_SERVICE, name, last_update,
+ /* updated obj = */ NULL);
pthread_rwlock_unlock(&obj_lock);
return status;
} /* sdb_store_service */
/* TODO: actually support hierarchical data */
int
-sdb_store_dump(FILE *fh)
+sdb_store_tojson(sdb_strbuf_t *buf)
{
sdb_llist_iter_t *host_iter;
- if (! fh)
+ if (! buf)
return -1;
pthread_rwlock_rdlock(&obj_lock);
return -1;
}
+ sdb_strbuf_append(buf, "{\"hosts\":[");
+
while (sdb_llist_iter_has_next(host_iter)) {
sdb_store_obj_t *host = SDB_STORE_OBJ(sdb_llist_iter_get_next(host_iter));
sdb_llist_iter_t *svc_iter;
snprintf(time_str, sizeof(time_str), "<error>");
time_str[sizeof(time_str) - 1] = '\0';
- fprintf(fh, "Host '%s' (last updated: %s):\n",
+ sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+ "\"last_update\": \"%s\", "
+ "\"attributes\": [",
SDB_OBJ(host)->name, time_str);
attr_iter = sdb_llist_get_iter(host->attributes);
if (! attr_iter) {
char errbuf[1024];
- fprintf(fh, "Failed to retrieve attributes: %s\n",
+ sdb_log(SDB_LOG_ERR, "store: Failed to retrieve attributes: %s\n",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
- continue;
+ sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve "
+ "attributes: %s\"}", errbuf);
}
+ /* has_next returns false if the iterator is NULL */
while (sdb_llist_iter_has_next(attr_iter)) {
sdb_attribute_t *attr = SDB_ATTR(sdb_llist_iter_get_next(attr_iter));
assert(attr);
snprintf(time_str, sizeof(time_str), "<error>");
time_str[sizeof(time_str) - 1] = '\0';
- fprintf(fh, "\tAttribute '%s' -> '%s' (last updated: %s)\n",
+ sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+ "\"value\": \"%s\", \"last_update\": \"%s\"},",
SDB_OBJ(attr)->name, attr->value, time_str);
}
sdb_llist_iter_destroy(attr_iter);
+ sdb_strbuf_append(buf, "], \"services\": [");
svc_iter = sdb_llist_get_iter(host->children);
if (! svc_iter) {
char errbuf[1024];
- fprintf(fh, "Failed to retrieve services: %s\n",
+ sdb_log(SDB_LOG_ERR, "store: Failed to retrieve services: %s\n",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
- continue;
+ sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve "
+ "services: %s\"}", errbuf);
}
while (sdb_llist_iter_has_next(svc_iter)) {
snprintf(time_str, sizeof(time_str), "<error>");
time_str[sizeof(time_str) - 1] = '\0';
- fprintf(fh, "\tService '%s' (last updated: %s)\n",
+ sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+ "\"last_update\": \"%s\"},",
SDB_OBJ(svc)->name, time_str);
}
sdb_llist_iter_destroy(svc_iter);
+ sdb_strbuf_append(buf, "]},");
}
+ sdb_strbuf_append(buf, "]}");
+
sdb_llist_iter_destroy(host_iter);
pthread_rwlock_unlock(&obj_lock);
return 0;
-} /* sdb_store_dump */
+} /* sdb_store_tojson */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */