![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/store.c b/src/core/store.c
index 1396669e4b58e53dd427f76ec5119f1ab1d7d669..0ab57d97be4e5ee884f6a472188fd857eb0bd6b2 100644 (file)
--- a/src/core/store.c
+++ b/src/core/store.c
* private variables
*/
-typedef struct {
+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;
-} sdb_store_t;
-#define ST(obj) ((sdb_store_t *)(obj))
+};
sdb_store_t *global_store = NULL;
store_init(sdb_object_t *obj, va_list __attribute__((unused)) ap)
{
int err;
- if (! (ST(obj)->hosts = sdb_avltree_create()))
+ if (! (SDB_STORE(obj)->hosts = sdb_avltree_create()))
return -1;
- if ((err = pthread_rwlock_init(&ST(obj)->host_lock, /* attr = */ NULL))) {
+ 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)));
store_destroy(sdb_object_t *obj)
{
int err;
- if ((err = pthread_rwlock_destroy(&ST(obj)->host_lock))) {
+ 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(ST(obj)->hosts);
- ST(obj)->hosts = NULL;
+ sdb_avltree_destroy(SDB_STORE(obj)->hosts);
+ SDB_STORE(obj)->hosts = NULL;
} /* store_destroy */
static int
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_store_t *st = SDB_STORE(user_data);
sdb_host_t *host;
sdb_avltree_t *attrs;
static int
store_host(const char *name, sdb_time_t last_update, sdb_object_t *user_data)
{
- sdb_store_t *st = ST(user_data);
+ sdb_store_t *st = SDB_STORE(user_data);
char *cname = NULL;
int status = 0;
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_store_t *st = SDB_STORE(user_data);
sdb_host_t *host;
sdb_service_t *svc;
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_store_t *st = SDB_STORE(user_data);
sdb_host_t *host;
sdb_avltree_t *services;
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_store_t *st = SDB_STORE(user_data);
sdb_avltree_t *metrics;
sdb_host_t *host;
sdb_metric_store_t *store, sdb_time_t last_update,
sdb_object_t *user_data)
{
- sdb_store_t *st = ST(user_data);
+ sdb_store_t *st = SDB_STORE(user_data);
sdb_store_obj_t *obj = NULL;
sdb_host_t *host;
return status;
} /* store_metric */
-static sdb_store_writer_t store_writer = {
+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 __attribute__((unused)) *user_data)
+{
+ return sdb_store_query_execute(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_init(void)
{
if (global_store)
return 0;
- global_store = ST(sdb_object_create("store", store_type));
+ 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;
}
- return sdb_plugin_register_writer("memstore",
- &store_writer, SDB_OBJ(global_store));
+ 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 */
void
} /* sdb_store_clear */
int
-sdb_store_host(const char *name, sdb_time_t last_update)
+sdb_store_host(sdb_store_t *store, const char *name, sdb_time_t last_update)
{
- return sdb_plugin_store_host(name, last_update);
+ return store_host(name, last_update, SDB_OBJ(store));
} /* sdb_store_host */
int
-sdb_store_attribute(const char *hostname,
- const char *key, const sdb_data_t *value,
+sdb_store_service(sdb_store_t *store, const char *hostname, const char *name,
sdb_time_t last_update)
{
- return sdb_plugin_store_attribute(hostname, key, value, last_update);
-} /* sdb_store_attribute */
+ return store_service(hostname, name, last_update, SDB_OBJ(store));
+} /* sdb_store_service */
int
-sdb_store_service(const char *hostname, const char *name,
- sdb_time_t last_update)
+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 sdb_plugin_store_service(hostname, name, last_update);
-} /* sdb_store_service */
+ return store_metric(hostname, name, metric_store, last_update, SDB_OBJ(store));
+} /* sdb_store_metric */
int
-sdb_store_service_attr(const char *hostname, const char *service,
+sdb_store_attribute(sdb_store_t *store, const char *hostname,
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 */
+ return store_attribute(hostname, key, value, last_update, SDB_OBJ(store));
+} /* sdb_store_attribute */
int
-sdb_store_metric(const char *hostname, const char *name,
- sdb_metric_store_t *store, sdb_time_t last_update)
+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 sdb_plugin_store_metric(hostname, name, store, last_update);
-} /* sdb_store_metric */
+ return store_service_attr(hostname, service, key, value,
+ last_update, SDB_OBJ(store));
+} /* sdb_store_service_attr */
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_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 sdb_plugin_store_metric_attribute(hostname, metric,
- key, value, last_update);
+ return store_metric_attr(hostname, metric, key, value,
+ last_update, SDB_OBJ(store));
} /* sdb_store_metric_attr */
-bool
-sdb_store_has_host(const char *name)
-{
- sdb_host_t *host;
-
- if ((! global_store) || (! name))
- return false;
-
- host = lookup_host(global_store, 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)
{
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)