![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index f39f6784a9e788f2606011fcd11115ea1704f5ec..7671e9800f13a0ac0a81e2b24817d95b0f0a83ef 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
} /* ts_tojson */
/*
- * public API
+ * store writer 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 0;
-} /* sdb_store_init */
-
-void
-sdb_store_clear(void)
-{
- if (! global_store)
- return;
- sdb_avltree_clear(global_store->hosts);
-} /* sdb_store_clear */
-
-int
-sdb_store_attribute(const char *hostname,
+static int
+store_attribute(const char *hostname,
const char *key, const sdb_data_t *value,
- sdb_time_t last_update)
+ 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;
int status = 0;
- if ((! global_store) || (! hostname) || (! key))
+ if ((! hostname) || (! key))
return -1;
- pthread_rwlock_wrlock(&global_store->host_lock);
- host = lookup_host(global_store, hostname, /* canonicalize = */ 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' - "
status = store_attr(STORE_OBJ(host), attrs, key, value, last_update);
sdb_object_deref(SDB_OBJ(host));
- pthread_rwlock_unlock(&global_store->host_lock);
+ pthread_rwlock_unlock(&st->host_lock);
- if (sdb_plugin_store_attribute(hostname, key, value, last_update))
- status = -1;
return status;
-} /* sdb_store_attribute */
+} /* store_attribute */
-int
-sdb_store_host(const char *name, sdb_time_t last_update)
+static int
+store_host(const char *name, sdb_time_t last_update, sdb_object_t *user_data)
{
+ sdb_store_t *st = ST(user_data);
+
char *cname = NULL;
int status = 0;
- if ((! global_store) || (! name))
+ if (! name)
return -1;
cname = sdb_plugin_cname(strdup(name));
return -1;
}
- pthread_rwlock_wrlock(&global_store->host_lock);
- status = store_obj(NULL, global_store->hosts,
+ pthread_rwlock_wrlock(&st->host_lock);
+ status = store_obj(NULL, st->hosts,
SDB_HOST, cname, last_update, NULL);
- pthread_rwlock_unlock(&global_store->host_lock);
-
- if (sdb_plugin_store_host(name, last_update))
- status = -1;
+ pthread_rwlock_unlock(&st->host_lock);
free(cname);
return status;
-} /* sdb_store_host */
+} /* store_host */
-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_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_service_t *svc;
sdb_avltree_t *services;
int status = 0;
- if ((! global_store) || (! hostname) || (! service) || (! key))
+ if ((! hostname) || (! service) || (! key))
return -1;
- pthread_rwlock_wrlock(&global_store->host_lock);
- host = lookup_host(global_store, hostname, /* canonicalize = */ 1);
+ 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(&global_store->host_lock);
+ pthread_rwlock_unlock(&st->host_lock);
return -1;
}
key, value, last_update);
sdb_object_deref(SDB_OBJ(svc));
- pthread_rwlock_unlock(&global_store->host_lock);
+ 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_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;
int status = 0;
- if ((! global_store) || (! hostname) || (! name))
+ if ((! hostname) || (! name))
return -1;
- pthread_rwlock_wrlock(&global_store->host_lock);
- host = lookup_host(global_store, 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(&global_store->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_metric_attr(const char *hostname, const char *metric,
- 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_metric_t *m;
int status = 0;
- if ((! global_store) || (! hostname) || (! metric) || (! key))
+ if ((! hostname) || (! metric) || (! key))
return -1;
- pthread_rwlock_wrlock(&global_store->host_lock);
- host = lookup_host(global_store, hostname, /* canonicalize = */ 1);
+ 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 (! 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(&global_store->host_lock);
+ pthread_rwlock_unlock(&st->host_lock);
return -1;
}
key, value, last_update);
sdb_object_deref(SDB_OBJ(m));
- pthread_rwlock_unlock(&global_store->host_lock);
+ pthread_rwlock_unlock(&st->host_lock);
- if (sdb_plugin_store_metric_attribute(hostname, metric,
- key, value, last_update))
- status = -1;
return status;
-} /* sdb_store_metric_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;
int status = 0;
- if ((! global_store) || (! hostname) || (! name))
+ if ((! hostname) || (! name))
return -1;
if (store) {
store = NULL;
}
- pthread_rwlock_wrlock(&global_store->host_lock);
- host = lookup_host(global_store, 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(&global_store->host_lock);
+ pthread_rwlock_unlock(&st->host_lock);
return status;
}
if (store)
if (store_metric_store(metric, store))
status = -1;
- pthread_rwlock_unlock(&global_store->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;
-} /* sdb_store_metric */
+} /* store_metric */
-bool
-sdb_store_has_host(const char *name)
+static sdb_store_writer_t 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)
{
- sdb_host_t *host;
+ return SDB_OBJ(sdb_store_query_prepare(ast));
+} /* prepare_query */
- if ((! global_store) || (! name))
- return false;
+static int
+execute_query(sdb_object_t *q,
+ sdb_strbuf_t *buf, sdb_strbuf_t *errbuf,
+ sdb_object_t __attribute__((unused)) *user_data)
+{
+ return sdb_store_query_execute(QUERY(q), buf, errbuf);
+} /* execute_query */
- host = lookup_host(global_store, name, /* canonicalize = */ 0);
- sdb_object_deref(SDB_OBJ(host));
- return host != NULL;
-} /* sdb_store_has_host */
+static sdb_store_reader_t store_reader = {
+ prepare_query, execute_query,
+};
+
+/*
+ * 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;
+ }
+ if (sdb_plugin_register_writer("memstore",
+ &store_writer, SDB_OBJ(global_store)))
+ return -1;
+ return sdb_plugin_register_reader("memstore",
+ &store_reader, 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 */
sdb_store_obj_t *
sdb_store_get_host(const char *name)
return 0;
} /* sdb_store_get_attr */
+/* TODO: sdb_store_fetch_timeseries should move into the plugin module */
+
int
sdb_store_fetch_timeseries(const char *hostname, const char *metric,
sdb_timeseries_opts_t *opts, sdb_strbuf_t *buf)