diff --git a/src/core/store.c b/src/core/store.c
index ab37e689641ec52b42f844bb5f1f1d3cd6236d63..498217b394c092ce1a356a98d1f31e7bcffcdc3f 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;
+struct sdb_store {
+ sdb_object_t super;
+
+ /* hosts are the top-level entries and
+ * reference everything else */
+ sdb_avltree_t *hosts;
+ pthread_rwlock_t host_lock;
+};
/*
* 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 (! (SDB_STORE(obj)->hosts = sdb_avltree_create()))
+ return -1;
+ if ((err = pthread_rwlock_init(&SDB_STORE(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(&SDB_STORE(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(SDB_STORE(obj)->hosts);
+ SDB_STORE(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 status;
} /* store_attr */
-/* The host_lock has to be acquired before calling this function. */
+static int
+store_metric_store(sdb_metric_t *metric, sdb_metric_store_t *store)
+{
+ char *type = metric->store.type;
+ char *id = metric->store.id;
+
+ if ((! metric->store.type) || strcasecmp(metric->store.type, store->type)) {
+ if (! (type = strdup(store->type)))
+ return -1;
+ }
+ if ((! metric->store.id) || strcasecmp(metric->store.id, store->id)) {
+ if (! (id = strdup(store->id))) {
+ if (type != metric->store.type)
+ free(type);
+ return -1;
+ }
+ }
+
+ if (type != metric->store.type) {
+ if (metric->store.type)
+ free(metric->store.type);
+ metric->store.type = type;
+ }
+ if (id != metric->store.id) {
+ if (metric->store.id)
+ free(metric->store.id);
+ metric->store.id = id;
+ }
+ return 0;
+} /* store_metric_store */
+
+/* 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)
{
size_t i;
/* TODO: make time format configurable */
- if (! sdb_strftime(start_str, sizeof(start_str),
- "%F %T %z", ts->start))
+ if (! sdb_strftime(start_str, sizeof(start_str), ts->start))
snprintf(start_str, sizeof(start_str), "<error>");
start_str[sizeof(start_str) - 1] = '\0';
- if (! sdb_strftime(end_str, sizeof(end_str),
- "%F %T %z", ts->end))
+ if (! sdb_strftime(end_str, sizeof(end_str), ts->end))
snprintf(end_str, sizeof(end_str), "<error>");
end_str[sizeof(end_str) - 1] = '\0';
for (j = 0; j < ts->data_len; ++j) {
char time_str[64];
- if (! sdb_strftime(time_str, sizeof(time_str),
- "%F %T %z", ts->data[i][j].timestamp))
+ if (! sdb_strftime(time_str, sizeof(time_str), ts->data[i][j].timestamp))
snprintf(time_str, sizeof(time_str), "<error>");
time_str[sizeof(time_str) - 1] = '\0';
} /* 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 = SDB_STORE(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 = */ 0);
+ 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 */
-
-bool
-sdb_store_has_host(const char *name)
-{
- sdb_host_t *host;
+} /* store_attribute */
- if (! name)
- return NULL;
-
- 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)
+static int
+store_host(const char *name, sdb_time_t last_update, sdb_object_t *user_data)
{
- sdb_host_t *host;
+ sdb_store_t *st = SDB_STORE(user_data);
+ int status = 0;
if (! name)
- return NULL;
+ return -1;
- host = lookup_host(name, /* canonicalize = */ 0);
- if (! host)
- return NULL;
+ pthread_rwlock_wrlock(&st->host_lock);
+ status = store_obj(NULL, st->hosts,
+ SDB_HOST, name, last_update, NULL);
+ pthread_rwlock_unlock(&st->host_lock);
- return STORE_OBJ(host);
-} /* sdb_store_get_host */
+ return status;
+} /* store_host */
-int
-sdb_store_attribute(const char *hostname,
- const char *key, const sdb_data_t *value,
- sdb_time_t last_update)
+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 = SDB_STORE(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 = */ 0);
+ 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 = SDB_STORE(user_data);
+
sdb_host_t *host;
sdb_avltree_t *services;
+ sdb_data_t d;
int status = 0;
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 = */ 0);
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 (sdb_plugin_store_service(hostname, name, last_update))
+ if (status)
+ return status;
+
+ /* record the hostname as an attribute */
+ d.type = SDB_TYPE_STRING;
+ d.data.string = SDB_OBJ(host)->name;
+ 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 = SDB_STORE(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 = */ 0);
+ 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 = SDB_STORE(user_data);
+
sdb_store_obj_t *obj = NULL;
sdb_host_t *host;
sdb_metric_t *metric;
+ sdb_data_t d;
sdb_avltree_t *metrics;
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 = */ 0);
metrics = get_host_children(host, SDB_METRIC);
if (! metrics) {
sdb_log(SDB_LOG_ERR, "store: Failed to store metric '%s' - "
name, last_update, &obj);
sdb_object_deref(SDB_OBJ(host));
- if (status || (! store)) {
- pthread_rwlock_unlock(&host_lock);
+ if (status) {
+ pthread_rwlock_unlock(&st->host_lock);
return status;
}
assert(obj);
metric = METRIC(obj);
- if ((! metric->store.type) || strcasecmp(metric->store.type, store->type)) {
- if (metric->store.type)
- free(metric->store.type);
- metric->store.type = strdup(store->type);
- }
- if ((! metric->store.id) || strcasecmp(metric->store.id, store->id)) {
- if (metric->store.id)
- free(metric->store.id);
- metric->store.id = strdup(store->id);
- }
-
- if ((! metric->store.type) || (! metric->store.id)) {
- if (metric->store.type)
- free(metric->store.type);
- if (metric->store.id)
- free(metric->store.id);
- metric->store.type = metric->store.id = NULL;
- status = -1;
- }
- pthread_rwlock_unlock(&host_lock);
+ if (store)
+ if (store_metric_store(metric, store))
+ status = -1;
+ pthread_rwlock_unlock(&st->host_lock);
- if (sdb_plugin_store_metric(hostname, name, store, last_update))
+ /* record the hostname as an attribute */
+ d.type = SDB_TYPE_STRING;
+ d.data.string = SDB_OBJ(host)->name;
+ if (store_metric_attr(hostname, name, "hostname", &d, last_update, user_data))
status = -1;
return status;
+} /* store_metric */
+
+sdb_store_writer_t sdb_store_writer = {
+ store_host, store_service, store_metric,
+ store_attribute, store_service_attr, store_metric_attr,
+};
+
+/*
+ * TODO: let prepare and execute accept a store object as their user_data
+ * object
+ */
+
+static sdb_object_t *
+prepare_query(sdb_ast_node_t *ast,
+ sdb_strbuf_t __attribute__((unused)) *errbuf,
+ sdb_object_t __attribute__((unused)) *user_data)
+{
+ return SDB_OBJ(sdb_store_query_prepare(ast));
+} /* prepare_query */
+
+static int
+execute_query(sdb_object_t *q,
+ sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
+ sdb_object_t *user_data)
+{
+ return sdb_store_query_execute(SDB_STORE(user_data),
+ QUERY(q), buf, errbuf);
+} /* execute_query */
+
+sdb_store_reader_t sdb_store_reader = {
+ prepare_query, execute_query,
+};
+
+/*
+ * public API
+ */
+
+sdb_store_t *
+sdb_store_create(void)
+{
+ return SDB_STORE(sdb_object_create("store", store_type));
+} /* sdb_store_create */
+
+int
+sdb_store_host(sdb_store_t *store, const char *name, sdb_time_t last_update)
+{
+ return store_host(name, last_update, SDB_OBJ(store));
+} /* sdb_store_host */
+
+int
+sdb_store_service(sdb_store_t *store, const char *hostname, const char *name,
+ sdb_time_t last_update)
+{
+ return store_service(hostname, name, last_update, SDB_OBJ(store));
+} /* sdb_store_service */
+
+int
+sdb_store_metric(sdb_store_t *store, const char *hostname, const char *name,
+ sdb_metric_store_t *metric_store, sdb_time_t last_update)
+{
+ return store_metric(hostname, name, metric_store, last_update, SDB_OBJ(store));
} /* sdb_store_metric */
int
-sdb_store_metric_attr(const char *hostname, const char *metric,
+sdb_store_attribute(sdb_store_t *store, const char *hostname,
const char *key, const sdb_data_t *value, sdb_time_t last_update)
{
- sdb_avltree_t *metrics;
- sdb_host_t *host;
- sdb_metric_t *m;
- int status = 0;
+ return store_attribute(hostname, key, value, last_update, SDB_OBJ(store));
+} /* sdb_store_attribute */
- if ((! hostname) || (! metric) || (! key))
- return -1;
+int
+sdb_store_service_attr(sdb_store_t *store, const char *hostname,
+ const char *service, const char *key, const sdb_data_t *value,
+ sdb_time_t last_update)
+{
+ return store_service_attr(hostname, service, key, value,
+ last_update, SDB_OBJ(store));
+} /* sdb_store_service_attr */
- pthread_rwlock_wrlock(&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 store attribute '%s' "
- "for metric '%s' - host '%s' not found",
- key, metric, hostname);
- pthread_rwlock_unlock(&host_lock);
- return -1;
- }
+int
+sdb_store_metric_attr(sdb_store_t *store, const char *hostname,
+ const char *metric, const char *key, const sdb_data_t *value,
+ sdb_time_t last_update)
+{
+ return store_metric_attr(hostname, metric, key, value,
+ last_update, SDB_OBJ(store));
+} /* sdb_store_metric_attr */
- 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(sdb_store_t *store, const char *name)
+{
+ sdb_host_t *host;
- if (! status)
- status = store_attr(STORE_OBJ(m), m->attributes,
- key, value, last_update);
+ if ((! store) || (! name))
+ return NULL;
- sdb_object_deref(SDB_OBJ(m));
- pthread_rwlock_unlock(&host_lock);
+ host = lookup_host(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;
-
- 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);
- 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);
- return -1;
- }
- }
-
- ts_tojson(ts, buf);
- sdb_timeseries_destroy(ts);
- return 0;
-} /* sdb_store_fetch_timeseries */
-
int
sdb_store_get_field(sdb_store_obj_t *obj, int field, sdb_data_t *res)
{
if (! res)
return 0;
return sdb_data_copy(res, &ATTR(obj)->value);
+ case SDB_FIELD_TIMESERIES:
+ if (obj->type != SDB_METRIC)
+ return -1;
+ tmp.type = SDB_TYPE_BOOLEAN;
+ tmp.data.boolean = METRIC(obj)->store.type != NULL;
default:
return -1;
}
return 0;
} /* sdb_store_get_attr */
+/* TODO: sdb_store_fetch_timeseries should move into the plugin module */
+
int
-sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
+sdb_store_fetch_timeseries(sdb_store_t *store,
+ 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 ((! store) || (! hostname) || (! metric) || (! opts) || (! buf))
+ return -1;
+
+ pthread_rwlock_rdlock(&store->host_lock);
+ host = lookup_host(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(&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(&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(&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(&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(sdb_store_t *store, 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 ((! store) || (! cb))
return -1;
if ((type != SDB_HOST) && (type != SDB_SERVICE) && (type != SDB_METRIC)) {
@@ -970,13 +1105,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(&store->host_lock);
+ host_iter = sdb_avltree_get_iter(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(&store->host_lock);
return status;
} /* sdb_store_scan */