![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Sebastian Harl <sh@tokkee.org> | |
| Thu, 21 May 2015 22:46:58 +0000 (00:46 +0200) | ||
| committer | Sebastian Harl <sh@tokkee.org> | |
| Thu, 21 May 2015 22:46:58 +0000 (00:46 +0200) |
diff --git a/src/core/plugin.c b/src/core/plugin.c
index f581eb1629fbe3f043c02e13f6a4f3799de9b6d4..96df9fe6b77fdc89377da0efee47cd159ad6cccb 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_host(name, last_update, writer->w_user_data))
- status = -1;
+ s = writer->impl.store_host(name, last_update, writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_service(hostname, name, last_update,
- writer->w_user_data))
- status = -1;
+ s = writer->impl.store_service(hostname, name, last_update,
+ writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_metric(hostname, name, store, last_update,
- writer->w_user_data))
- status = -1;
+ s = writer->impl.store_metric(hostname, name, store, last_update,
+ writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_attribute(hostname, key, value, last_update,
- writer->w_user_data))
- status = -1;
+ s = writer->impl.store_attribute(hostname, key, value, last_update,
+ writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;
@@ -1438,11 +1446,13 @@ sdb_plugin_store_service_attribute(const char *hostname, const char *service,
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_service_attr(hostname, service,
- key, value, last_update, writer->w_user_data))
- status = -1;
+ s = writer->impl.store_service_attr(hostname, service,
+ key, value, last_update, writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
sdb_plugin_writer_t *writer;
+ int s;
writer = SDB_PLUGIN_WRITER(sdb_llist_iter_get_next(iter));
assert(writer);
- if (writer->impl.store_metric_attr(hostname, metric,
- key, value, last_update, writer->w_user_data))
- status = -1;
+ s = writer->impl.store_metric_attr(hostname, metric,
+ key, value, last_update, writer->w_user_data);
+ if (((s > 0) && (status >= 0)) || (s < 0))
+ status = s;
}
sdb_llist_iter_destroy(iter);
return status;
diff --git a/src/core/store.c b/src/core/store.c
index 171e31935bb898eefb5e6e95b46000a20f3cb1a6..1396669e4b58e53dd427f76ec5119f1ab1d7d669 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
* private variables
*/
-static sdb_avltree_t *hosts = NULL;
-static pthread_rwlock_t host_lock = PTHREAD_RWLOCK_INITIALIZER;
+typedef struct {
+ sdb_object_t super;
+
+ /* hosts are the top-level entries and
+ * reference everything else */
+ sdb_avltree_t *hosts;
+ pthread_rwlock_t host_lock;
+} sdb_store_t;
+#define ST(obj) ((sdb_store_t *)(obj))
+
+sdb_store_t *global_store = NULL;
/*
* private types
*/
-static sdb_type_t sdb_host_type;
-static sdb_type_t sdb_service_type;
-static sdb_type_t sdb_metric_type;
-static sdb_type_t sdb_attribute_type;
+static sdb_type_t host_type;
+static sdb_type_t service_type;
+static sdb_type_t metric_type;
+static sdb_type_t attribute_type;
+
+static int
+store_init(sdb_object_t *obj, va_list __attribute__((unused)) ap)
+{
+ int err;
+ if (! (ST(obj)->hosts = sdb_avltree_create()))
+ return -1;
+ if ((err = pthread_rwlock_init(&ST(obj)->host_lock, /* attr = */ NULL))) {
+ char errbuf[128];
+ sdb_log(SDB_LOG_ERR, "store: Failed to initialize lock: %s",
+ sdb_strerror(err, errbuf, sizeof(errbuf)));
+ return -1;
+ }
+ return 0;
+} /* store_init */
+
+static void
+store_destroy(sdb_object_t *obj)
+{
+ int err;
+ if ((err = pthread_rwlock_destroy(&ST(obj)->host_lock))) {
+ char errbuf[128];
+ sdb_log(SDB_LOG_ERR, "store: Failed to destroy lock: %s",
+ sdb_strerror(err, errbuf, sizeof(errbuf)));
+ return;
+ }
+ sdb_avltree_destroy(ST(obj)->hosts);
+ ST(obj)->hosts = NULL;
+} /* store_destroy */
static int
store_obj_init(sdb_object_t *obj, va_list ap)
} /* store_obj_destroy */
static int
-sdb_host_init(sdb_object_t *obj, va_list ap)
+host_init(sdb_object_t *obj, va_list ap)
{
sdb_host_t *sobj = HOST(obj);
int ret;
if (! sobj->attributes)
return -1;
return 0;
-} /* sdb_host_init */
+} /* host_init */
static void
-sdb_host_destroy(sdb_object_t *obj)
+host_destroy(sdb_object_t *obj)
{
sdb_host_t *sobj = HOST(obj);
assert(obj);
sdb_avltree_destroy(sobj->metrics);
if (sobj->attributes)
sdb_avltree_destroy(sobj->attributes);
-} /* sdb_host_destroy */
+} /* host_destroy */
static int
-sdb_service_init(sdb_object_t *obj, va_list ap)
+service_init(sdb_object_t *obj, va_list ap)
{
sdb_service_t *sobj = SVC(obj);
int ret;
if (! sobj->attributes)
return -1;
return 0;
-} /* sdb_service_init */
+} /* service_init */
static void
-sdb_service_destroy(sdb_object_t *obj)
+service_destroy(sdb_object_t *obj)
{
sdb_service_t *sobj = SVC(obj);
assert(obj);
if (sobj->attributes)
sdb_avltree_destroy(sobj->attributes);
-} /* sdb_service_destroy */
+} /* service_destroy */
static int
-sdb_metric_init(sdb_object_t *obj, va_list ap)
+metric_init(sdb_object_t *obj, va_list ap)
{
sdb_metric_t *sobj = METRIC(obj);
int ret;
sobj->store.type = sobj->store.id = NULL;
return 0;
-} /* sdb_metric_init */
+} /* metric_init */
static void
-sdb_metric_destroy(sdb_object_t *obj)
+metric_destroy(sdb_object_t *obj)
{
sdb_metric_t *sobj = METRIC(obj);
assert(obj);
free(sobj->store.type);
if (sobj->store.id)
free(sobj->store.id);
-} /* sdb_metric_destroy */
+} /* metric_destroy */
static int
-sdb_attr_init(sdb_object_t *obj, va_list ap)
+attr_init(sdb_object_t *obj, va_list ap)
{
const sdb_data_t *value;
int ret;
if (sdb_data_copy(&ATTR(obj)->value, value))
return -1;
return 0;
-} /* sdb_attr_init */
+} /* attr_init */
static void
-sdb_attr_destroy(sdb_object_t *obj)
+attr_destroy(sdb_object_t *obj)
{
assert(obj);
store_obj_destroy(obj);
sdb_data_free_datum(&ATTR(obj)->value);
-} /* sdb_attr_destroy */
+} /* attr_destroy */
+
+static sdb_type_t store_type = {
+ /* size = */ sizeof(sdb_store_t),
+ /* init = */ store_init,
+ /* destroy = */ store_destroy,
+};
-static sdb_type_t sdb_host_type = {
- sizeof(sdb_host_t),
- sdb_host_init,
- sdb_host_destroy
+static sdb_type_t host_type = {
+ /* size = */ sizeof(sdb_host_t),
+ /* init = */ host_init,
+ /* destroy = */ host_destroy
};
-static sdb_type_t sdb_service_type = {
- sizeof(sdb_service_t),
- sdb_service_init,
- sdb_service_destroy
+static sdb_type_t service_type = {
+ /* size = */ sizeof(sdb_service_t),
+ /* init = */ service_init,
+ /* destroy = */ service_destroy
};
-static sdb_type_t sdb_metric_type = {
- sizeof(sdb_metric_t),
- sdb_metric_init,
- sdb_metric_destroy
+static sdb_type_t metric_type = {
+ /* size = */ sizeof(sdb_metric_t),
+ /* init = */ metric_init,
+ /* destroy = */ metric_destroy
};
-static sdb_type_t sdb_attribute_type = {
- sizeof(sdb_attribute_t),
- sdb_attr_init,
- sdb_attr_destroy
+static sdb_type_t attribute_type = {
+ /* size = */ sizeof(sdb_attribute_t),
+ /* init = */ attr_init,
+ /* destroy = */ attr_destroy
};
/*
*/
static sdb_host_t *
-lookup_host(const char *name, bool canonicalize)
+lookup_host(sdb_store_t *st, const char *name, bool canonicalize)
{
sdb_host_t *host;
char *cname;
assert(name);
if (! canonicalize)
- return HOST(sdb_avltree_lookup(hosts, name));
+ return HOST(sdb_avltree_lookup(st->hosts, name));
cname = strdup(name);
cname = sdb_plugin_cname(cname);
return NULL;
}
- host = HOST(sdb_avltree_lookup(hosts, cname));
+ host = HOST(sdb_avltree_lookup(st->hosts, cname));
free(cname);
return host;
} /* lookup_host */
else {
if (type == SDB_ATTRIBUTE) {
/* the value will be updated by the caller */
- new = STORE_OBJ(sdb_object_create(name, sdb_attribute_type,
+ new = STORE_OBJ(sdb_object_create(name, attribute_type,
type, last_update, NULL));
}
else {
sdb_type_t t;
t = type == SDB_HOST
- ? sdb_host_type
+ ? host_type
: type == SDB_SERVICE
- ? sdb_service_type
- : sdb_metric_type;
+ ? service_type
+ : metric_type;
new = STORE_OBJ(sdb_object_create(name, t, type, last_update));
}
return 0;
} /* store_metric_store */
-/* The host_lock has to be acquired before calling this function. */
+/* The store's host_lock has to be acquired before calling this function. */
static sdb_avltree_t *
get_host_children(sdb_host_t *host, int type)
{
} /* ts_tojson */
/*
- * public API
+ * store writer API
*/
-void
-sdb_store_clear(void)
+static int
+store_attribute(const char *hostname,
+ const char *key, const sdb_data_t *value,
+ sdb_time_t last_update, sdb_object_t *user_data)
{
- sdb_avltree_destroy(hosts);
- hosts = NULL;
-} /* sdb_store_clear */
+ sdb_store_t *st = ST(user_data);
-int
-sdb_store_host(const char *name, sdb_time_t last_update)
-{
- char *cname = NULL;
+ sdb_host_t *host;
+ sdb_avltree_t *attrs;
int status = 0;
- if (! name)
+ if ((! hostname) || (! key))
return -1;
- cname = sdb_plugin_cname(strdup(name));
- if (! cname) {
- sdb_log(SDB_LOG_ERR, "store: strdup failed");
- return -1;
+ pthread_rwlock_wrlock(&st->host_lock);
+ host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ attrs = get_host_children(host, 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_wrlock(&host_lock);
- if (! hosts)
- if (! (hosts = sdb_avltree_create()))
- status = -1;
-
if (! status)
- status = store_obj(NULL, hosts, SDB_HOST, cname, last_update, NULL);
- pthread_rwlock_unlock(&host_lock);
+ status = store_attr(STORE_OBJ(host), attrs, key, value, last_update);
- if (sdb_plugin_store_host(name, last_update))
- status = -1;
+ sdb_object_deref(SDB_OBJ(host));
+ pthread_rwlock_unlock(&st->host_lock);
- free(cname);
return status;
-} /* sdb_store_host */
+} /* store_attribute */
-bool
-sdb_store_has_host(const char *name)
+static int
+store_host(const char *name, sdb_time_t last_update, sdb_object_t *user_data)
{
- sdb_host_t *host;
-
- if (! name)
- return NULL;
+ sdb_store_t *st = ST(user_data);
- host = lookup_host(name, /* canonicalize = */ 0);
- sdb_object_deref(SDB_OBJ(host));
- return host != NULL;
-} /* sdb_store_has_host */
-
-sdb_store_obj_t *
-sdb_store_get_host(const char *name)
-{
- sdb_host_t *host;
+ char *cname = NULL;
+ int status = 0;
if (! name)
- return NULL;
+ return -1;
- host = lookup_host(name, /* canonicalize = */ 0);
- if (! host)
- return NULL;
+ cname = sdb_plugin_cname(strdup(name));
+ if (! cname) {
+ sdb_log(SDB_LOG_ERR, "store: strdup failed");
+ return -1;
+ }
- return STORE_OBJ(host);
-} /* sdb_store_get_host */
+ pthread_rwlock_wrlock(&st->host_lock);
+ status = store_obj(NULL, st->hosts,
+ SDB_HOST, cname, last_update, NULL);
+ pthread_rwlock_unlock(&st->host_lock);
-int
-sdb_store_attribute(const char *hostname,
- const char *key, const sdb_data_t *value,
- sdb_time_t last_update)
+ free(cname);
+ return status;
+} /* store_host */
+
+static int
+store_service_attr(const char *hostname, const char *service,
+ const char *key, const sdb_data_t *value, sdb_time_t last_update,
+ sdb_object_t *user_data)
{
+ sdb_store_t *st = ST(user_data);
+
sdb_host_t *host;
- sdb_avltree_t *attrs;
+ sdb_service_t *svc;
+ sdb_avltree_t *services;
int status = 0;
- if ((! hostname) || (! key))
+ if ((! hostname) || (! service) || (! key))
return -1;
- pthread_rwlock_wrlock(&host_lock);
- host = lookup_host(hostname, /* canonicalize = */ 1);
- attrs = get_host_children(host, SDB_ATTRIBUTE);
- if (! attrs) {
+ pthread_rwlock_wrlock(&st->host_lock);
+ host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ services = get_host_children(host, SDB_SERVICE);
+ sdb_object_deref(SDB_OBJ(host));
+ 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(&st->host_lock);
+ return -1;
+ }
+
+ svc = SVC(sdb_avltree_lookup(services, service));
+ if (! svc) {
sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
- "host '%s' not found", key, hostname);
+ "service '%s/%s' not found", key, hostname, service);
status = -1;
}
if (! status)
- status = store_attr(STORE_OBJ(host), attrs, key, value, last_update);
+ status = store_attr(STORE_OBJ(svc), svc->attributes,
+ key, value, last_update);
- sdb_object_deref(SDB_OBJ(host));
- pthread_rwlock_unlock(&host_lock);
+ sdb_object_deref(SDB_OBJ(svc));
+ pthread_rwlock_unlock(&st->host_lock);
- if (sdb_plugin_store_attribute(hostname, key, value, last_update))
- status = -1;
return status;
-} /* sdb_store_attribute */
+} /* store_service_attr */
-int
-sdb_store_service(const char *hostname, const char *name,
- sdb_time_t last_update)
+static int
+store_service(const char *hostname, const char *name,
+ sdb_time_t last_update, sdb_object_t *user_data)
{
+ sdb_store_t *st = ST(user_data);
+
sdb_host_t *host;
sdb_avltree_t *services;
sdb_data_t d;
if ((! hostname) || (! name))
return -1;
- pthread_rwlock_wrlock(&host_lock);
- host = lookup_host(hostname, /* canonicalize = */ 1);
+ pthread_rwlock_wrlock(&st->host_lock);
+ host = lookup_host(st, hostname, /* canonicalize = */ 1);
services = get_host_children(host, SDB_SERVICE);
if (! services) {
sdb_log(SDB_LOG_ERR, "store: Failed to store service '%s' - "
name, last_update, NULL);
sdb_object_deref(SDB_OBJ(host));
- pthread_rwlock_unlock(&host_lock);
+ pthread_rwlock_unlock(&st->host_lock);
if (status)
return status;
- if (sdb_plugin_store_service(hostname, name, last_update))
- status = -1;
-
/* record the hostname as an attribute */
d.type = SDB_TYPE_STRING;
d.data.string = SDB_OBJ(host)->name;
- if (sdb_store_service_attr(hostname, name, "hostname", &d, last_update))
+ if (store_service_attr(hostname, name, "hostname", &d, last_update, user_data))
status = -1;
return status;
-} /* sdb_store_service */
+} /* store_service */
-int
-sdb_store_service_attr(const char *hostname, const char *service,
- const char *key, const sdb_data_t *value, sdb_time_t last_update)
+static int
+store_metric_attr(const char *hostname, const char *metric,
+ const char *key, const sdb_data_t *value, sdb_time_t last_update,
+ sdb_object_t *user_data)
{
+ sdb_store_t *st = ST(user_data);
+
+ sdb_avltree_t *metrics;
sdb_host_t *host;
- sdb_service_t *svc;
- sdb_avltree_t *services;
+ sdb_metric_t *m;
int status = 0;
- if ((! hostname) || (! service) || (! key))
+ if ((! hostname) || (! metric) || (! key))
return -1;
- pthread_rwlock_wrlock(&host_lock);
- host = lookup_host(hostname, /* canonicalize = */ 1);
- services = get_host_children(host, SDB_SERVICE);
+ pthread_rwlock_wrlock(&st->host_lock);
+ host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ metrics = get_host_children(host, SDB_METRIC);
sdb_object_deref(SDB_OBJ(host));
- if (! services) {
+ if (! metrics) {
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);
+ "for metric '%s' - host '%s' not found",
+ key, metric, hostname);
+ pthread_rwlock_unlock(&st->host_lock);
return -1;
}
- svc = SVC(sdb_avltree_lookup(services, service));
- if (! svc) {
+ m = METRIC(sdb_avltree_lookup(metrics, metric));
+ if (! m) {
sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
- "service '%s/%s' not found", key, hostname, service);
+ "metric '%s/%s' not found", key, hostname, metric);
status = -1;
}
if (! status)
- status = store_attr(STORE_OBJ(svc), svc->attributes,
+ status = store_attr(STORE_OBJ(m), m->attributes,
key, value, last_update);
- sdb_object_deref(SDB_OBJ(svc));
- pthread_rwlock_unlock(&host_lock);
+ sdb_object_deref(SDB_OBJ(m));
+ pthread_rwlock_unlock(&st->host_lock);
- if (sdb_plugin_store_service_attribute(hostname, service,
- key, value, last_update))
- status = -1;
return status;
-} /* sdb_store_service_attr */
+} /* store_metric_attr */
-int
-sdb_store_metric(const char *hostname, const char *name,
- sdb_metric_store_t *store, sdb_time_t last_update)
+static int
+store_metric(const char *hostname, const char *name,
+ sdb_metric_store_t *store, sdb_time_t last_update,
+ sdb_object_t *user_data)
{
+ sdb_store_t *st = ST(user_data);
+
sdb_store_obj_t *obj = NULL;
sdb_host_t *host;
sdb_metric_t *metric;
store = NULL;
}
- pthread_rwlock_wrlock(&host_lock);
- host = lookup_host(hostname, /* canonicalize = */ 1);
+ pthread_rwlock_wrlock(&st->host_lock);
+ host = lookup_host(st, hostname, /* canonicalize = */ 1);
metrics = get_host_children(host, SDB_METRIC);
if (! metrics) {
sdb_log(SDB_LOG_ERR, "store: Failed to store metric '%s' - "
sdb_object_deref(SDB_OBJ(host));
if (status) {
- pthread_rwlock_unlock(&host_lock);
+ pthread_rwlock_unlock(&st->host_lock);
return status;
}
if (store)
if (store_metric_store(metric, store))
status = -1;
- pthread_rwlock_unlock(&host_lock);
-
- if (sdb_plugin_store_metric(hostname, name, store, last_update))
- status = -1;
+ pthread_rwlock_unlock(&st->host_lock);
/* record the hostname as an attribute */
d.type = SDB_TYPE_STRING;
d.data.string = SDB_OBJ(host)->name;
- if (sdb_store_metric_attr(hostname, name, "hostname", &d, last_update))
+ if (store_metric_attr(hostname, name, "hostname", &d, last_update, user_data))
status = -1;
return status;
+} /* store_metric */
+
+static sdb_store_writer_t store_writer = {
+ store_host, store_service, store_metric,
+ store_attribute, store_service_attr, store_metric_attr,
+};
+
+/*
+ * public API
+ */
+
+int
+sdb_store_init(void)
+{
+ if (global_store)
+ return 0;
+
+ global_store = ST(sdb_object_create("store", store_type));
+ if (! global_store) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to allocate store");
+ return -1;
+ }
+ return sdb_plugin_register_writer("memstore",
+ &store_writer, SDB_OBJ(global_store));
+} /* sdb_store_init */
+
+void
+sdb_store_clear(void)
+{
+ if (! global_store)
+ return;
+ sdb_avltree_clear(global_store->hosts);
+} /* sdb_store_clear */
+
+int
+sdb_store_host(const char *name, sdb_time_t last_update)
+{
+ return sdb_plugin_store_host(name, last_update);
+} /* sdb_store_host */
+
+int
+sdb_store_attribute(const char *hostname,
+ const char *key, const sdb_data_t *value,
+ sdb_time_t last_update)
+{
+ return sdb_plugin_store_attribute(hostname, key, value, last_update);
+} /* sdb_store_attribute */
+
+int
+sdb_store_service(const char *hostname, const char *name,
+ sdb_time_t last_update)
+{
+ return sdb_plugin_store_service(hostname, name, last_update);
+} /* sdb_store_service */
+
+int
+sdb_store_service_attr(const char *hostname, const char *service,
+ const char *key, const sdb_data_t *value, sdb_time_t last_update)
+{
+ return sdb_plugin_store_service_attribute(hostname, service,
+ key, value, last_update);
+} /* sdb_store_service_attr */
+
+int
+sdb_store_metric(const char *hostname, const char *name,
+ sdb_metric_store_t *store, sdb_time_t last_update)
+{
+ return sdb_plugin_store_metric(hostname, name, store, last_update);
} /* sdb_store_metric */
int
sdb_store_metric_attr(const char *hostname, const char *metric,
const char *key, const sdb_data_t *value, sdb_time_t last_update)
{
- sdb_avltree_t *metrics;
+ return sdb_plugin_store_metric_attribute(hostname, metric,
+ key, value, last_update);
+} /* sdb_store_metric_attr */
+
+bool
+sdb_store_has_host(const char *name)
+{
sdb_host_t *host;
- sdb_metric_t *m;
- int status = 0;
- if ((! hostname) || (! metric) || (! key))
- return -1;
+ if ((! global_store) || (! name))
+ return false;
- pthread_rwlock_wrlock(&host_lock);
- host = lookup_host(hostname, /* canonicalize = */ 1);
- metrics = get_host_children(host, SDB_METRIC);
+ host = lookup_host(global_store, name, /* canonicalize = */ 0);
sdb_object_deref(SDB_OBJ(host));
- if (! metrics) {
- sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' "
- "for metric '%s' - host '%s' not found",
- key, metric, hostname);
- pthread_rwlock_unlock(&host_lock);
- return -1;
- }
+ return host != NULL;
+} /* sdb_store_has_host */
- m = METRIC(sdb_avltree_lookup(metrics, metric));
- if (! m) {
- sdb_log(SDB_LOG_ERR, "store: Failed to store attribute '%s' - "
- "metric '%s/%s' not found", key, hostname, metric);
- status = -1;
- }
+sdb_store_obj_t *
+sdb_store_get_host(const char *name)
+{
+ sdb_host_t *host;
- if (! status)
- status = store_attr(STORE_OBJ(m), m->attributes,
- key, value, last_update);
+ if ((! global_store) || (! name))
+ return NULL;
- sdb_object_deref(SDB_OBJ(m));
- pthread_rwlock_unlock(&host_lock);
+ host = lookup_host(global_store, name, /* canonicalize = */ 0);
+ if (! host)
+ return NULL;
- if (sdb_plugin_store_metric_attribute(hostname, metric,
- key, value, last_update))
- status = -1;
- return status;
-} /* sdb_store_metric_attr */
+ return STORE_OBJ(host);
+} /* sdb_store_get_host */
sdb_store_obj_t *
sdb_store_get_child(sdb_store_obj_t *host, int type, const char *name)
return STORE_OBJ(sdb_avltree_lookup(children, name));
} /* sdb_store_get_child */
-int
-sdb_store_fetch_timeseries(const char *hostname, const char *metric,
- sdb_timeseries_opts_t *opts, sdb_strbuf_t *buf)
-{
- sdb_avltree_t *metrics;
- sdb_host_t *host;
- sdb_metric_t *m;
-
- sdb_timeseries_t *ts;
-
- int status = 0;
-
- if ((! hostname) || (! metric) || (! opts) || (! buf))
- return -1;
-
- pthread_rwlock_rdlock(&host_lock);
- host = lookup_host(hostname, /* canonicalize = */ 1);
- metrics = get_host_children(host, SDB_METRIC);
- sdb_object_deref(SDB_OBJ(host));
- if (! metrics) {
- sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
- "- host '%s' not found", hostname, metric, hostname);
- pthread_rwlock_unlock(&host_lock);
- return -1;
- }
-
- m = METRIC(sdb_avltree_lookup(metrics, metric));
- if (! m) {
- sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
- "- metric '%s' not found", hostname, metric, metric);
- pthread_rwlock_unlock(&host_lock);
- return -1;
- }
-
- if ((! m->store.type) || (! m->store.id)) {
- sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
- "- no data-store configured for the stored metric",
- hostname, metric);
- sdb_object_deref(SDB_OBJ(m));
- pthread_rwlock_unlock(&host_lock);
- return -1;
- }
-
- {
- char type[strlen(m->store.type) + 1];
- char id[strlen(m->store.id) + 1];
-
- strncpy(type, m->store.type, sizeof(type));
- strncpy(id, m->store.id, sizeof(id));
- pthread_rwlock_unlock(&host_lock);
-
- ts = sdb_plugin_fetch_timeseries(type, id, opts);
- if (! ts) {
- sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
- "- %s fetcher callback returned no data for '%s'",
- hostname, metric, type, id);
- status = -1;
- }
- }
-
- ts_tojson(ts, buf);
- sdb_object_deref(SDB_OBJ(m));
- sdb_timeseries_destroy(ts);
- return status;
-} /* sdb_store_fetch_timeseries */
-
int
sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res)
{
return 0;
} /* sdb_store_get_attr */
+int
+sdb_store_fetch_timeseries(const char *hostname, const char *metric,
+ sdb_timeseries_opts_t *opts, sdb_strbuf_t *buf)
+{
+ sdb_avltree_t *metrics;
+ sdb_host_t *host;
+ sdb_metric_t *m;
+
+ sdb_timeseries_t *ts;
+
+ int status = 0;
+
+ if ((! global_store) || (! hostname) || (! metric) || (! opts) || (! buf))
+ return -1;
+
+ pthread_rwlock_rdlock(&global_store->host_lock);
+ host = lookup_host(global_store, hostname, /* canonicalize = */ 1);
+ metrics = get_host_children(host, SDB_METRIC);
+ sdb_object_deref(SDB_OBJ(host));
+ if (! metrics) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
+ "- host '%s' not found", hostname, metric, hostname);
+ pthread_rwlock_unlock(&global_store->host_lock);
+ return -1;
+ }
+
+ m = METRIC(sdb_avltree_lookup(metrics, metric));
+ if (! m) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
+ "- metric '%s' not found", hostname, metric, metric);
+ pthread_rwlock_unlock(&global_store->host_lock);
+ return -1;
+ }
+
+ if ((! m->store.type) || (! m->store.id)) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
+ "- no data-store configured for the stored metric",
+ hostname, metric);
+ sdb_object_deref(SDB_OBJ(m));
+ pthread_rwlock_unlock(&global_store->host_lock);
+ return -1;
+ }
+
+ {
+ char type[strlen(m->store.type) + 1];
+ char id[strlen(m->store.id) + 1];
+
+ strncpy(type, m->store.type, sizeof(type));
+ strncpy(id, m->store.id, sizeof(id));
+ pthread_rwlock_unlock(&global_store->host_lock);
+
+ ts = sdb_plugin_fetch_timeseries(type, id, opts);
+ if (! ts) {
+ sdb_log(SDB_LOG_ERR, "store: Failed to fetch time-series '%s/%s' "
+ "- %s fetcher callback returned no data for '%s'",
+ hostname, metric, type, id);
+ status = -1;
+ }
+ }
+
+ ts_tojson(ts, buf);
+ sdb_object_deref(SDB_OBJ(m));
+ sdb_timeseries_destroy(ts);
+ return status;
+} /* sdb_store_fetch_timeseries */
+
int
sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
sdb_store_lookup_cb cb, void *user_data)
sdb_avltree_iter_t *host_iter = NULL;
int status = 0;
- if (! cb)
+ if ((! global_store) || (! cb))
return -1;
if ((type != SDB_HOST) && (type != SDB_SERVICE) && (type != SDB_METRIC)) {
@@ -1008,13 +1115,10 @@ sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
return -1;
}
- pthread_rwlock_rdlock(&host_lock);
-
- if (hosts) {
- host_iter = sdb_avltree_get_iter(hosts);
- if (! host_iter)
- status = -1;
- }
+ pthread_rwlock_rdlock(&global_store->host_lock);
+ host_iter = sdb_avltree_get_iter(global_store->hosts);
+ if (! host_iter)
+ status = -1;
/* has_next returns false if the iterator is NULL */
while (sdb_avltree_iter_has_next(host_iter)) {
}
sdb_avltree_iter_destroy(host_iter);
- pthread_rwlock_unlock(&host_lock);
+ pthread_rwlock_unlock(&global_store->host_lock);
return status;
} /* sdb_store_scan */
index c52299e806314a951df6fbb670e7b098f7e371cd..4a0960c1cbe0055f77c1c1c6d64a9f32aa566b82 100644 (file)
--- a/src/include/core/store.h
+++ b/src/include/core/store.h
sdb_object_t *user_data);
} sdb_store_writer_t;
+/*
+ * sdb_store_init:
+ * Initialize the store sub-system. This function has to be called before
+ * doing any other store operations.
+ *
+ * Returns:
+ * - 0 on success
+ * - a negative value else
+ */
+int
+sdb_store_init(void);
+
/*
* sdb_store_clear:
* Clear the entire store and remove all stored objects.
index 759eee2f5652ebee72c9131d22a05ddbf8f704b2..cc3525e30ef4374e3c904797cccd176de2e94043 100644 (file)
--- a/src/tools/sysdbd/main.c
+++ b/src/tools/sysdbd/main.c
if (sdb_ssl_init())
exit(1);
+ if (sdb_store_init())
+ exit(1);
sdb_plugin_init_all();
plugin_main_loop.default_interval = SECS_TO_SDB_TIME(60);
index 679fb548418092fbe1377cd9232dadf07e1af928..b15809a589bc890dd36ff5c8809bdf71b75cfd84 100644 (file)
size_t i;
+ sdb_store_init();
+
for (i = 0; i < SDB_STATIC_ARRAY_LEN(hosts); ++i) {
int status = sdb_store_host(hosts[i], 1);
ck_assert(status == 0);
index 113d3a0010d0f5669e53d68aa6dbd2fdad753858..ebb2daf1d22ec7cee81e267d97ca476612b5abe9 100644 (file)
{
sdb_data_t datum;
+ sdb_store_init();
+
sdb_store_host("h1", 1 * SDB_INTERVAL_SECOND);
sdb_store_host("h2", 3 * SDB_INTERVAL_SECOND);
index b4c6015b7bfb0dcfe2d338eb05af51555491efca..913e6b78a0905bb803a5d7073e3cc27c4a457904 100644 (file)
size_t i;
+ sdb_store_init();
+
for (i = 0; i < SDB_STATIC_ARRAY_LEN(hosts); ++i) {
int status = sdb_store_host(hosts[i], 1);
fail_unless(status == 0,
index dbf220cef4f26d718a505b8a9678812bbd0a1360..8308f3334f39d7c2c8cd71362f5903eab399c412 100644 (file)
--- a/t/unit/core/store_test.c
+++ b/t/unit/core/store_test.c
#include <string.h>
#include <strings.h>
+static void
+init(void)
+{
+ sdb_store_init();
+}
+
static void
populate(void)
{
sdb_data_t datum;
+ sdb_store_init();
+
sdb_store_host("h1", 1);
sdb_store_host("h2", 3);
tcase_add_test(tc, test_get_child);
tcase_add_test(tc, test_interval);
tcase_add_test(tc, test_scan);
- tcase_add_unchecked_fixture(tc, NULL, sdb_store_clear);
+ tcase_add_unchecked_fixture(tc, init, sdb_store_clear);
ADD_TCASE(tc);
}
TEST_MAIN_END
index 8047b2668bae56b596d4cc6e2067c40d930408f6..d7e5b30cbd7f7c2a4122c4851233eca306fbda23 100644 (file)
{
sdb_data_t datum;
+ sdb_store_init();
+
sdb_store_host("h1", 1 * SDB_INTERVAL_SECOND);
sdb_store_host("h2", 3 * SDB_INTERVAL_SECOND);