diff --git a/src/core/store.c b/src/core/store.c
index cbd5f0c05595ccdca54ce2dba48b02d386fed972..ccb5f0a954d97e0f867bc2bb2067573245e30133 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
/*
* SysDB - src/core/store.c
/*
* SysDB - src/core/store.c
- * Copyright (C) 2012 Sebastian 'tokkee' Harl <sh@tokkee.org>
+ * Copyright (C) 2012-2013 Sebastian 'tokkee' Harl <sh@tokkee.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#if HAVE_CONFIG_H
+# include "config.h"
+#endif /* HAVE_CONFIG_H */
+
#include "sysdb.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"
#include "utils/llist.h"
-#include "utils/string.h"
#include <assert.h>
#include <assert.h>
#include <pthread.h>
#include <pthread.h>
-/*
- * private data types
- */
-
-/* type used for looking up named objects */
-typedef struct {
- sdb_object_t parent;
- const char *obj_name;
-} sdb_store_lookup_obj_t;
-#define SDB_STORE_LOOKUP_OBJ_INIT { SDB_OBJECT_INIT, NULL }
-
/*
* private variables
*/
static sdb_llist_t *host_list = NULL;
/*
* private variables
*/
static sdb_llist_t *host_list = NULL;
-static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
+static pthread_rwlock_t obj_lock = PTHREAD_RWLOCK_INITIALIZER;
/*
/*
- * private helper functions
+ * private types
*/
*/
+static sdb_type_t sdb_host_type;
+static sdb_type_t sdb_service_type;
+static sdb_type_t sdb_attribute_type;
+
static int
static int
-sdb_store_obj_cmp_by_name(const sdb_object_t *a, const sdb_object_t *b)
+store_base_init(sdb_object_t *obj, va_list ap)
{
{
- const sdb_store_obj_t *h1 = (const sdb_store_obj_t *)a;
- const sdb_store_obj_t *h2 = (const sdb_store_obj_t *)b;
+ sdb_store_base_t *sobj = STORE_BASE(obj);
- assert(h1 && h2);
- return strcasecmp(h1->name, h2->name);
-} /* sdb_store_obj_cmp_by_name */
+ sobj->type = va_arg(ap, int);
-static int
-sdb_cmp_store_obj_with_name(const sdb_object_t *a, const sdb_object_t *b)
+ sobj->last_update = va_arg(ap, sdb_time_t);
+ sobj->interval = 0;
+ sobj->parent = NULL;
+ return 0;
+} /* store_base_init */
+
+static void
+store_base_destroy(sdb_object_t *obj)
{
{
- const sdb_store_obj_t *obj = (const sdb_store_obj_t *)a;
- const sdb_store_lookup_obj_t *lookup = (const sdb_store_lookup_obj_t *)b;
+ const sdb_store_base_t *sobj = STORE_CONST_BASE(obj);
- assert(obj && lookup);
- return strcasecmp(obj->name, lookup->obj_name);
-} /* sdb_cmp_store_obj_with_name */
+ if (sobj->parent)
+ sdb_object_deref(SDB_OBJ(sobj->parent));
+} /* store_base_destroy */
static int
sdb_host_init(sdb_object_t *obj, va_list ap)
{
static int
sdb_host_init(sdb_object_t *obj, va_list ap)
{
- const char *name = va_arg(ap, const char *);
+ sdb_host_t *sobj = HOST(obj);
+ int ret;
- SDB_HOST(obj)->host_name = strdup(name);
- if (! SDB_HOST(obj)->host_name)
- return -1;
-
- SDB_HOST(obj)->host_last_update = sdb_gettime();
- /* ignore errors -> last_update will be updated later */
+ /* this will consume the first argument (type) of ap */
+ ret = store_base_init(obj, ap);
+ if (ret)
+ return ret;
- SDB_HOST(obj)->attributes = sdb_llist_create();
- if (! SDB_HOST(obj)->attributes)
+ sobj->services = sdb_llist_create();
+ if (! sobj->services)
return -1;
return -1;
- SDB_HOST(obj)->services = sdb_llist_create();
- if (! SDB_HOST(obj)->services)
+ sobj->attributes = sdb_llist_create();
+ if (! sobj->attributes)
return -1;
return 0;
} /* sdb_host_init */
return -1;
return 0;
} /* sdb_host_init */
static void
sdb_host_destroy(sdb_object_t *obj)
{
static void
sdb_host_destroy(sdb_object_t *obj)
{
+ sdb_host_t *sobj = HOST(obj);
assert(obj);
assert(obj);
- if (SDB_HOST(obj)->host_name)
- free(SDB_HOST(obj)->host_name);
+ store_base_destroy(obj);
- if (SDB_HOST(obj)->attributes)
- sdb_llist_destroy(SDB_HOST(obj)->attributes);
- if (SDB_HOST(obj)->services)
- sdb_llist_destroy(SDB_HOST(obj)->services);
+ if (sobj->services)
+ sdb_llist_destroy(sobj->services);
+ if (sobj->attributes)
+ sdb_llist_destroy(sobj->attributes);
} /* sdb_host_destroy */
static int
} /* sdb_host_destroy */
static int
-sdb_attr_init(sdb_object_t *obj, va_list ap)
+sdb_service_init(sdb_object_t *obj, va_list ap)
{
{
- const char *hostname = va_arg(ap, const char *);
- const char *name = va_arg(ap, const char *);
- const char *value = va_arg(ap, const char *);
-
- SDB_ATTR(obj)->hostname = strdup(hostname);
- SDB_ATTR(obj)->attr_name = strdup(name);
- SDB_ATTR(obj)->attr_value = strdup(value);
- if ((! SDB_ATTR(obj)->hostname)
- || (! SDB_ATTR(obj)->attr_name) || (! SDB_ATTR(obj)->attr_value))
- return -1;
+ sdb_service_t *sobj = SVC(obj);
+ int ret;
+
+ /* this will consume the first argument (type) of ap */
+ ret = store_base_init(obj, ap);
+ if (ret)
+ return ret;
- SDB_ATTR(obj)->attr_last_update = sdb_gettime();
+ sobj->attributes = sdb_llist_create();
+ if (! sobj->attributes)
+ return -1;
return 0;
return 0;
-} /* sdb_attr_init */
+} /* sdb_service_init */
static void
static void
-sdb_attr_destroy(sdb_object_t *obj)
+sdb_service_destroy(sdb_object_t *obj)
{
{
+ sdb_service_t *sobj = SVC(obj);
assert(obj);
assert(obj);
- if (SDB_ATTR(obj)->hostname)
- free(SDB_ATTR(obj)->hostname);
- if (SDB_ATTR(obj)->attr_name)
- free(SDB_ATTR(obj)->attr_name);
- if (SDB_ATTR(obj)->attr_value)
- free(SDB_ATTR(obj)->attr_value);
-} /* sdb_attr_destroy */
+ store_base_destroy(obj);
+
+ if (sobj->attributes)
+ sdb_llist_destroy(sobj->attributes);
+} /* sdb_service_destroy */
static int
static int
-sdb_svc_init(sdb_object_t *obj, va_list ap)
+sdb_attr_init(sdb_object_t *obj, va_list ap)
{
{
- const char *hostname = va_arg(ap, const char *);
- const char *name = va_arg(ap, const char *);
-
- SDB_SVC(obj)->hostname = strdup(hostname);
- SDB_SVC(obj)->svc_name = strdup(name);
- if ((! SDB_SVC(obj)->hostname) || (! SDB_SVC(obj)->svc_name))
- return -1;
-
- SDB_SVC(obj)->svc_last_update = sdb_gettime();
- /* ignore errors -> last_update will be updated later */
+ const sdb_data_t *value;
+ int ret;
+
+ /* 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 sdb_data_t *);
+
+ if (value)
+ if (sdb_data_copy(&ATTR(obj)->value, value))
+ return -1;
return 0;
return 0;
-} /* sdb_svc_init */
+} /* sdb_attr_init */
static void
static void
-sdb_svc_destroy(sdb_object_t *obj)
+sdb_attr_destroy(sdb_object_t *obj)
{
assert(obj);
{
assert(obj);
- if (SDB_SVC(obj)->hostname)
- free(SDB_SVC(obj)->hostname);
- if (SDB_SVC(obj)->svc_name)
- free(SDB_SVC(obj)->svc_name);
-} /* sdb_svc_destroy */
+ store_base_destroy(obj);
+ sdb_data_free_datum(&ATTR(obj)->value);
+} /* sdb_attr_destroy */
+
+static sdb_type_t sdb_host_type = {
+ sizeof(sdb_host_t),
+ sdb_host_init,
+ sdb_host_destroy
+};
+
+static sdb_type_t sdb_service_type = {
+ sizeof(sdb_service_t),
+ sdb_service_init,
+ sdb_service_destroy
+};
+
+static sdb_type_t sdb_attribute_type = {
+ sizeof(sdb_attribute_t),
+ sdb_attr_init,
+ sdb_attr_destroy
+};
/*
/*
- * public API
+ * private helper functions
*/
*/
-sdb_host_t *
-sdb_host_create(const char *name)
+static sdb_host_t *
+lookup_host(const char *name)
{
{
- sdb_object_t *obj;
+ return HOST(sdb_llist_search_by_name(host_list, name));
+} /* lookup_host */
- if (! name)
- return NULL;
+/* 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)
+{
+ char *host_cname = NULL, *cname = NULL;
- obj = sdb_object_create(sizeof(sdb_host_t), sdb_host_init,
- sdb_host_destroy, name);
- if (! obj)
- return NULL;
- return SDB_HOST(obj);
-} /* sdb_host_create */
+ sdb_llist_t *parent_list;
+ sdb_store_base_t *old;
+ int status = 0;
-sdb_host_t *
-sdb_host_clone(const sdb_host_t *host)
-{
- sdb_host_t *new;
+ if (last_update <= 0)
+ last_update = sdb_gettime();
- new = sdb_host_create(host->host_name);
- if (! new)
- return NULL;
+ assert((type == 0)
+ || (type == SDB_HOST)
+ || (type == SDB_SERVICE)
+ || (type == SDB_ATTRIBUTE));
- /* make sure these are initialized; else sdb_object_deref() might access
- * arbitrary memory in case of an error */
- new->services = new->attributes = NULL;
+ assert(hostname || (type == SDB_HOST));
+ assert((! hostname)
+ || (type == SDB_SERVICE)
+ || (type == SDB_ATTRIBUTE));
- if (host->attributes) {
- new->attributes = sdb_llist_clone(host->attributes);
- if (! new->attributes) {
- sdb_object_deref(SDB_OBJ(new));
- return NULL;
- }
- }
+ if (! host_list)
+ if (! (host_list = sdb_llist_create()))
+ return -1;
+ parent_list = host_list;
- new->host_last_update = host->host_last_update;
- if (host->services) {
- new->services = sdb_llist_clone(host->services);
- if (! new->services) {
- sdb_object_deref(SDB_OBJ(new));
- return NULL;
+ if (type == SDB_HOST) {
+ cname = sdb_plugin_cname(strdup(name));
+ if (! cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ return -1;
}
}
+ name = cname;
}
}
- return new;
-} /* sdb_host_clone */
-int
-sdb_store_host(const sdb_host_t *host)
-{
- sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
- sdb_time_t last_update;
-
- sdb_host_t *old;
- int status = 0;
+ if (hostname) {
+ sdb_host_t *host;
- if ((! host) || (! host->host_name))
- return -1;
-
- last_update = host->host_last_update;
- if (last_update <= 0)
- last_update = sdb_gettime();
-
- pthread_rwlock_wrlock(&host_lock);
-
- if (! host_list) {
- if (! (host_list = sdb_llist_create())) {
- pthread_rwlock_unlock(&host_lock);
+ host_cname = sdb_plugin_cname(strdup(hostname));
+ if (! host_cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ free(cname);
return -1;
}
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;
+ }
+
+ if (type == SDB_ATTRIBUTE)
+ parent_list = host->attributes;
+ else
+ parent_list = host->services;
}
}
- lookup.obj_name = host->host_name;
- old = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
- sdb_cmp_store_obj_with_name));
+ 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 (old) {
if (old) {
- if (old->host_last_update > last_update) {
- fprintf(stderr, "store: Cannot update host '%s' - "
- "value too old (%"PRIscTIME" < %"PRIscTIME")\n",
- host->host_name, last_update, old->host_last_update);
- /* don't report an error; the host may be updated by multiple
+ 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,
+ last_update, old->last_update);
+ /* don't report an error; the object may be updated by multiple
* backends */
status = 1;
}
else {
* backends */
status = 1;
}
else {
- old->host_last_update = last_update;
+ 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)
+ *updated_obj = old;
}
else {
}
else {
- sdb_host_t *new = sdb_host_clone(host);
+ 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,
+ 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));
+ }
+
if (! new) {
char errbuf[1024];
if (! new) {
char errbuf[1024];
- fprintf(stderr, "store: Failed to clone host object: %s\n",
+ 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)));
sdb_strerror(errno, errbuf, sizeof(errbuf)));
- pthread_rwlock_unlock(&host_lock);
+ free(host_cname);
+ free(cname);
return -1;
}
return -1;
}
- if (! new->attributes) {
- if (! (new->attributes = sdb_llist_create())) {
- char errbuf[1024];
- fprintf(stderr, "store: Failed to initialize "
- "host object '%s': %s\n", host->host_name,
- sdb_strerror(errno, errbuf, sizeof(errbuf)));
- sdb_object_deref(SDB_OBJ(new));
- pthread_rwlock_unlock(&host_lock);
- return -1;
- }
- }
-
- if (! new->services) {
- if (! (new->services = sdb_llist_create())) {
- char errbuf[1024];
- fprintf(stderr, "store: Failed to initialize "
- "host object '%s': %s\n", host->host_name,
- sdb_strerror(errno, errbuf, sizeof(errbuf)));
- sdb_object_deref(SDB_OBJ(new));
- pthread_rwlock_unlock(&host_lock);
- return -1;
- }
- }
-
- status = sdb_llist_insert_sorted(host_list, SDB_OBJ(new),
- sdb_store_obj_cmp_by_name);
+ 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));
/* pass control to the list or destroy in case of an error */
sdb_object_deref(SDB_OBJ(new));
- }
- pthread_rwlock_unlock(&host_lock);
+ if (updated_obj)
+ *updated_obj = new;
+ }
+ free(host_cname);
+ free(cname);
return status;
return status;
-} /* sdb_store_host */
+} /* store_obj */
-const sdb_host_t *
-sdb_store_get_host(const char *name)
+/*
+ * store_obj_tojson serializes attribute / service objects to JSON.
+ *
+ * The function never returns an error. Rather, an error message will be part
+ * of the serialized data.
+ */
+static void
+store_obj_tojson(sdb_llist_t *list, int type, sdb_strbuf_t *buf)
{
{
- sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
- sdb_host_t *host;
+ 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];
+ sdb_log(SDB_LOG_ERR, "store: Failed to retrieve %ss: %s\n",
+ SDB_STORE_TYPE_TO_NAME(type),
+ sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ sdb_strbuf_append(buf, "{\"error\": \"failed to retrieve %ss: %s\"}",
+ SDB_STORE_TYPE_TO_NAME(type), errbuf);
+ }
- if (! name)
- return NULL;
+ /* 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));
+ assert(sobj);
- lookup.obj_name = name;
- host = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
- sdb_cmp_store_obj_with_name));
+ 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 (! host)
- return NULL;
- return host;
-} /* sdb_store_get_host */
+ 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) {
+ 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);
+ }
+ else
+ sdb_strbuf_append(buf, "\"last_update\": \"%s\", "
+ "\"update_interval\": \"%s\"}", time_str, interval_str);
-sdb_attribute_t *
-sdb_attribute_create(const char *hostname,
- const char *name, const char *value)
-{
- sdb_object_t *obj;
+ if (sdb_llist_iter_has_next(iter))
+ sdb_strbuf_append(buf, ",");
+ }
- if ((! hostname) || (! name) || (! value))
- return NULL;
+ sdb_llist_iter_destroy(iter);
+ sdb_strbuf_append(buf, "]");
+} /* store_obj_tojson */
- obj = sdb_object_create(sizeof(sdb_attribute_t), sdb_attr_init,
- sdb_attr_destroy, hostname, name, value);
- if (! obj)
- return NULL;
- return SDB_ATTR(obj);
-} /* sdb_attribute_create */
+/*
+ * public API
+ */
-sdb_attribute_t *
-sdb_attribute_clone(const sdb_attribute_t *attr)
+void
+sdb_store_clear(void)
{
{
- sdb_attribute_t *new;
+ sdb_llist_destroy(host_list);
+ host_list = NULL;
+} /* sdb_store_clear */
- new = sdb_attribute_create(attr->hostname,
- attr->attr_name, attr->attr_value);
- if (! new)
- return NULL;
+int
+sdb_store_host(const char *name, sdb_time_t last_update)
+{
+ int status;
- new->attr_last_update = attr->attr_last_update;
- return new;
-} /* sdb_attribute_clone */
+ if (! name)
+ return -1;
-int
-sdb_store_attribute(const sdb_attribute_t *attr)
+ 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);
+ return status;
+} /* sdb_store_host */
+
+_Bool
+sdb_store_has_host(const char *name)
{
{
- sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
sdb_host_t *host;
sdb_host_t *host;
- sdb_attribute_t *old;
+ if (! name)
+ return NULL;
- sdb_time_t last_update;
+ host = lookup_host(name);
+ return host != NULL;
+} /* sdb_store_has_host */
- int status = 0;
+sdb_store_base_t *
+sdb_store_get_host(const char *name)
+{
+ sdb_host_t *host;
- if (! attr)
- return -1;
+ if (! name)
+ return NULL;
- last_update = attr->attr_last_update;
- if (last_update <= 0)
- last_update = sdb_gettime();
+ host = lookup_host(name);
+ if (! host)
+ return NULL;
- if (! host_list)
- return -1;
+ sdb_object_ref(SDB_OBJ(host));
+ return STORE_BASE(host);
+} /* sdb_store_get_host */
- pthread_rwlock_wrlock(&host_lock);
+int
+sdb_store_attribute(const char *hostname,
+ const char *key, const sdb_data_t *value,
+ sdb_time_t last_update)
+{
+ int status;
- lookup.obj_name = attr->hostname;
- host = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
- sdb_cmp_store_obj_with_name));
+ sdb_store_base_t *updated_attr = NULL;
- if (! host) {
- pthread_rwlock_unlock(&host_lock);
+ if ((! hostname) || (! key))
return -1;
return -1;
- }
- lookup.obj_name = attr->attr_name;
- old = SDB_ATTR(sdb_llist_search(host->attributes,
- (const sdb_object_t *)&lookup,
- sdb_cmp_store_obj_with_name));
-
- if (old) {
- if (old->host_last_update > last_update) {
- fprintf(stderr, "store: Cannot update attribute '%s/%s' - "
- "value too old (%"PRIscTIME" < %"PRIscTIME")\n",
- attr->hostname, attr->attr_name, last_update,
- old->host_last_update);
- status = 1;
- }
- else {
- old->attr_last_update = last_update;
+ 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;
}
}
}
}
- else {
- sdb_attribute_t *new = sdb_attribute_clone(attr);
- if (! new) {
- char errbuf[1024];
- fprintf(stderr, "store: Failed to clone attribute object: %s\n",
- sdb_strerror(errno, errbuf, sizeof(errbuf)));
- pthread_rwlock_unlock(&host_lock);
- return -1;
- }
-
- status = sdb_llist_insert_sorted(host->attributes, SDB_OBJ(new),
- sdb_store_obj_cmp_by_name);
- /* pass control to the list or destroy in case of an error */
- sdb_object_deref(SDB_OBJ(new));
- }
-
- pthread_rwlock_unlock(&host_lock);
+ pthread_rwlock_unlock(&obj_lock);
return status;
} /* sdb_store_attribute */
return status;
} /* sdb_store_attribute */
-sdb_service_t *
-sdb_service_create(const char *hostname, const char *name)
+int
+sdb_store_service(const char *hostname, const char *name,
+ sdb_time_t last_update)
{
{
- sdb_object_t *obj;
+ int status;
if ((! hostname) || (! name))
if ((! hostname) || (! name))
- return NULL;
-
- obj = sdb_object_create(sizeof(sdb_service_t), sdb_svc_init,
- sdb_svc_destroy, hostname, name);
- if (! obj)
- return NULL;
- return SDB_SVC(obj);
-} /* sdb_service_create */
-
-sdb_service_t *
-sdb_service_clone(const sdb_service_t *svc)
-{
- sdb_service_t *new;
-
- new = sdb_service_create(svc->hostname, svc->svc_name);
- if (! new)
- return NULL;
+ return -1;
- new->svc_last_update = svc->svc_last_update;
- return new;
-} /* sdb_service_clone */
+ pthread_rwlock_wrlock(&obj_lock);
+ status = store_obj(hostname,
+ /* stored object = */ SDB_SERVICE, name, last_update,
+ /* updated obj = */ NULL);
+ pthread_rwlock_unlock(&obj_lock);
+ return status;
+} /* sdb_store_service */
int
int
-sdb_store_service(const sdb_service_t *svc)
+sdb_store_host_tojson(sdb_store_base_t *h, sdb_strbuf_t *buf, int flags)
{
{
- sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
sdb_host_t *host;
sdb_host_t *host;
+ char time_str[64];
+ char interval_str[64];
- sdb_service_t *old;
-
- sdb_time_t last_update;
-
- int status = 0;
-
- if (! svc)
- return -1;
-
- last_update = svc->svc_last_update;
- if (last_update <= 0)
- last_update = sdb_gettime();
-
- if (! host_list)
+ if ((! h) || (h->type != SDB_HOST) || (! buf))
return -1;
return -1;
- pthread_rwlock_wrlock(&host_lock);
+ host = HOST(h);
- lookup.obj_name = svc->hostname;
- host = SDB_HOST(sdb_llist_search(host_list, (const sdb_object_t *)&lookup,
- sdb_cmp_store_obj_with_name));
+ 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 (! host) {
- pthread_rwlock_unlock(&host_lock);
- return -1;
- }
+ if (! sdb_strfinterval(interval_str, sizeof(interval_str),
+ host->_interval))
+ snprintf(interval_str, sizeof(interval_str), "<error>");
+ interval_str[sizeof(interval_str) - 1] = '\0';
- lookup.obj_name = svc->svc_name;
- old = SDB_SVC(sdb_llist_search(host->services, (const sdb_object_t *)&lookup,
- sdb_cmp_store_obj_with_name));
+ sdb_strbuf_append(buf, "{\"name\": \"%s\", "
+ "\"last_update\": \"%s\", \"update_interval\": \"%s\"",
+ SDB_OBJ(host)->name, time_str, interval_str);
- if (old) {
- if (old->host_last_update > last_update) {
- fprintf(stderr, "store: Cannot update service '%s/%s' - "
- "value too old (%"PRIscTIME" < %"PRIscTIME")\n",
- svc->hostname, svc->svc_name, last_update,
- old->host_last_update);
- status = 1;
- }
- else {
- old->svc_last_update = last_update;
- }
+ if (! (flags & SDB_SKIP_ATTRIBUTES)) {
+ sdb_strbuf_append(buf, ", \"attributes\": ");
+ store_obj_tojson(host->attributes, SDB_ATTRIBUTE, buf);
}
}
- else {
- sdb_service_t *new = sdb_service_clone(svc);
- if (! new) {
- char errbuf[1024];
- fprintf(stderr, "store: Failed to clone service object: %s\n",
- sdb_strerror(errno, errbuf, sizeof(errbuf)));
- pthread_rwlock_unlock(&host_lock);
- return -1;
- }
-
- status = sdb_llist_insert_sorted(host->services, SDB_OBJ(new),
- sdb_store_obj_cmp_by_name);
- /* pass control to the list or destroy in case of an error */
- sdb_object_deref(SDB_OBJ(new));
+ if (! (flags & SDB_SKIP_SERVICES)) {
+ sdb_strbuf_append(buf, ", \"services\": ");
+ store_obj_tojson(host->services, SDB_SERVICE, buf);
}
}
- pthread_rwlock_unlock(&host_lock);
- return status;
-} /* sdb_store_service */
-
-const sdb_service_t *
-sdb_store_get_service(const sdb_host_t *host, const char *name)
-{
- sdb_store_lookup_obj_t lookup = SDB_STORE_LOOKUP_OBJ_INIT;
- sdb_service_t *svc;
-
- if ((! host) || (! name))
- return NULL;
-
- lookup.obj_name = name;
- svc = SDB_SVC(sdb_llist_search(host->services,
- (const sdb_object_t *)&lookup,
- sdb_cmp_store_obj_with_name));
-
- if (! svc)
- return NULL;
- return svc;
-} /* sdb_store_get_service */
+ sdb_strbuf_append(buf, "}");
+ return 0;
+} /* sdb_store_host_tojson */
int
int
-sdb_store_dump(FILE *fh)
+sdb_store_tojson(sdb_strbuf_t *buf, int flags)
{
sdb_llist_iter_t *host_iter;
{
sdb_llist_iter_t *host_iter;
- if (! fh)
+ if (! buf)
return -1;
return -1;
- pthread_rwlock_rdlock(&host_lock);
+ pthread_rwlock_rdlock(&obj_lock);
host_iter = sdb_llist_get_iter(host_list);
if (! host_iter) {
host_iter = sdb_llist_get_iter(host_list);
if (! host_iter) {
- pthread_rwlock_unlock(&host_lock);
+ pthread_rwlock_unlock(&obj_lock);
return -1;
}
return -1;
}
- while (sdb_llist_iter_has_next(host_iter)) {
- sdb_host_t *host = SDB_HOST(sdb_llist_iter_get_next(host_iter));
- sdb_llist_iter_t *svc_iter;
- sdb_llist_iter_t *attr_iter;
-
- char time_str[64];
+ 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));
assert(host);
assert(host);
- if (! sdb_strftime(time_str, sizeof(time_str),
- "%F %T %z", host->host_last_update))
- snprintf(time_str, sizeof(time_str), "<error>");
- time_str[sizeof(time_str) - 1] = '\0';
-
- fprintf(fh, "Host '%s' (last updated: %s):\n",
- host->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_strerror(errno, errbuf, sizeof(errbuf)));
- continue;
- }
+ if (sdb_store_host_tojson(host, buf, flags))
+ return -1;
- while (sdb_llist_iter_has_next(attr_iter)) {
- sdb_attribute_t *attr = SDB_ATTR(sdb_llist_iter_get_next(attr_iter));
- assert(attr);
+ if (sdb_llist_iter_has_next(host_iter))
+ sdb_strbuf_append(buf, ",");
+ }
- if (! sdb_strftime(time_str, sizeof(time_str),
- "%F %T %z", attr->attr_last_update))
- snprintf(time_str, sizeof(time_str), "<error>");
- time_str[sizeof(time_str) - 1] = '\0';
+ sdb_strbuf_append(buf, "]}");
- fprintf(fh, "\tAttribute '%s' -> '%s' (last updated: %s)\n",
- attr->attr_name, attr->attr_value, time_str);
- }
+ sdb_llist_iter_destroy(host_iter);
+ pthread_rwlock_unlock(&obj_lock);
+ return 0;
+} /* sdb_store_tojson */
- sdb_llist_iter_destroy(attr_iter);
+/* 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;
- svc_iter = sdb_llist_get_iter(host->services);
- if (! svc_iter) {
- char errbuf[1024];
- fprintf(fh, "Failed to retrieve services: %s\n",
- sdb_strerror(errno, errbuf, sizeof(errbuf)));
- continue;
- }
+ pthread_rwlock_rdlock(&obj_lock);
- while (sdb_llist_iter_has_next(svc_iter)) {
- sdb_service_t *svc = SDB_SVC(sdb_llist_iter_get_next(svc_iter));
- assert(svc);
+ host_iter = sdb_llist_get_iter(host_list);
+ if (! host_iter)
+ status = -1;
- if (! sdb_strftime(time_str, sizeof(time_str),
- "%F %T %z", svc->svc_last_update))
- snprintf(time_str, sizeof(time_str), "<error>");
- time_str[sizeof(time_str) - 1] = '\0';
+ /* 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);
- fprintf(fh, "\tService '%s' (last updated: %s)\n",
- svc->svc_name, time_str);
+ if (cb(host, user_data)) {
+ status = -1;
+ break;
}
}
-
- sdb_llist_iter_destroy(svc_iter);
}
sdb_llist_iter_destroy(host_iter);
}
sdb_llist_iter_destroy(host_iter);
- pthread_rwlock_unlock(&host_lock);
- return 0;
-} /* sdb_store_dump */
+ pthread_rwlock_unlock(&obj_lock);
+ return status;
+} /* sdb_store_iterate */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */