![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index ccb35389f5c5c6a7f912dccd24787860ee525445..498217b394c092ce1a356a98d1f31e7bcffcdc3f 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
pthread_rwlock_t host_lock;
};
-sdb_store_t *global_store = NULL;
-
/*
* private types
*/
return -1;
pthread_rwlock_wrlock(&st->host_lock);
- host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ 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' - "
store_host(const char *name, sdb_time_t last_update, sdb_object_t *user_data)
{
sdb_store_t *st = SDB_STORE(user_data);
-
- char *cname = NULL;
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;
- }
-
pthread_rwlock_wrlock(&st->host_lock);
status = store_obj(NULL, st->hosts,
- SDB_HOST, cname, last_update, NULL);
+ SDB_HOST, name, last_update, NULL);
pthread_rwlock_unlock(&st->host_lock);
- free(cname);
return status;
} /* store_host */
return -1;
pthread_rwlock_wrlock(&st->host_lock);
- host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ host = lookup_host(st, hostname, /* canonicalize = */ 0);
services = get_host_children(host, SDB_SERVICE);
sdb_object_deref(SDB_OBJ(host));
if (! services) {
return -1;
pthread_rwlock_wrlock(&st->host_lock);
- host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ 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' - "
return -1;
pthread_rwlock_wrlock(&st->host_lock);
- host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ host = lookup_host(st, hostname, /* canonicalize = */ 0);
metrics = get_host_children(host, SDB_METRIC);
sdb_object_deref(SDB_OBJ(host));
if (! metrics) {
}
pthread_rwlock_wrlock(&st->host_lock);
- host = lookup_host(st, hostname, /* canonicalize = */ 1);
+ 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' - "
static int
execute_query(sdb_object_t *q,
sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
- sdb_object_t __attribute__((unused)) *user_data)
+ sdb_object_t *user_data)
{
- return sdb_store_query_execute(QUERY(q), buf, errbuf);
+ return sdb_store_query_execute(SDB_STORE(user_data),
+ QUERY(q), buf, errbuf);
} /* execute_query */
sdb_store_reader_t sdb_store_reader = {
} /* sdb_store_create */
int
-sdb_store_init(void)
+sdb_store_host(sdb_store_t *store, const char *name, sdb_time_t last_update)
{
- if (global_store)
- return 0;
+ return store_host(name, last_update, SDB_OBJ(store));
+} /* sdb_store_host */
- global_store = SDB_STORE(sdb_object_create("store", store_type));
- if (! global_store) {
- sdb_log(SDB_LOG_ERR, "store: Failed to allocate store");
- return -1;
- }
- if (sdb_plugin_register_writer("memstore",
- &sdb_store_writer, SDB_OBJ(global_store)))
- return -1;
- return sdb_plugin_register_reader("memstore",
- &sdb_store_reader, SDB_OBJ(global_store));
-} /* sdb_store_init */
+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 */
-void
-sdb_store_clear(void)
+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)
{
- if (! global_store)
- return;
- sdb_avltree_clear(global_store->hosts);
-} /* sdb_store_clear */
+ return store_metric(hostname, name, metric_store, last_update, SDB_OBJ(store));
+} /* sdb_store_metric */
+
+int
+sdb_store_attribute(sdb_store_t *store, const char *hostname,
+ const char *key, const sdb_data_t *value, sdb_time_t last_update)
+{
+ return store_attribute(hostname, key, value, last_update, SDB_OBJ(store));
+} /* sdb_store_attribute */
+
+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 */
+
+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 */
sdb_store_obj_t *
-sdb_store_get_host(const char *name)
+sdb_store_get_host(sdb_store_t *store, const char *name)
{
sdb_host_t *host;
- if ((! global_store) || (! name))
+ if ((! store) || (! name))
return NULL;
- host = lookup_host(global_store, name, /* canonicalize = */ 0);
+ host = lookup_host(store, name, /* canonicalize = */ 0);
if (! host)
return NULL;
/* TODO: sdb_store_fetch_timeseries should move into the plugin module */
int
-sdb_store_fetch_timeseries(const char *hostname, const char *metric,
+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;
int status = 0;
- if ((! global_store) || (! hostname) || (! metric) || (! opts) || (! buf))
+ if ((! store) || (! hostname) || (! metric) || (! opts) || (! buf))
return -1;
- pthread_rwlock_rdlock(&global_store->host_lock);
- host = lookup_host(global_store, hostname, /* canonicalize = */ 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(&global_store->host_lock);
+ pthread_rwlock_unlock(&store->host_lock);
return -1;
}
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);
+ pthread_rwlock_unlock(&store->host_lock);
return -1;
}
"- no data-store configured for the stored metric",
hostname, metric);
sdb_object_deref(SDB_OBJ(m));
- pthread_rwlock_unlock(&global_store->host_lock);
+ pthread_rwlock_unlock(&store->host_lock);
return -1;
}
strncpy(type, m->store.type, sizeof(type));
strncpy(id, m->store.id, sizeof(id));
- pthread_rwlock_unlock(&global_store->host_lock);
+ pthread_rwlock_unlock(&store->host_lock);
ts = sdb_plugin_fetch_timeseries(type, id, opts);
if (! ts) {
} /* sdb_store_fetch_timeseries */
int
-sdb_store_scan(int type, sdb_store_matcher_t *m, sdb_store_matcher_t *filter,
+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 ((! global_store) || (! cb))
+ if ((! store) || (! cb))
return -1;
if ((type != SDB_HOST) && (type != SDB_SERVICE) && (type != SDB_METRIC)) {
return -1;
}
- pthread_rwlock_rdlock(&global_store->host_lock);
- host_iter = sdb_avltree_get_iter(global_store->hosts);
+ pthread_rwlock_rdlock(&store->host_lock);
+ host_iter = sdb_avltree_get_iter(store->hosts);
if (! host_iter)
status = -1;
}
sdb_avltree_iter_destroy(host_iter);
- pthread_rwlock_unlock(&global_store->host_lock);
+ pthread_rwlock_unlock(&store->host_lock);
return status;
} /* sdb_store_scan */