diff --git a/src/core/plugin.c b/src/core/plugin.c
index 8d836cc981de718a9f42cb270ec1b7f8ce66d783..76fc2092d022ff8588a2b5f11739e8653fa5c1c4 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
static sdb_llist_t *cname_list = NULL;
static sdb_llist_t *shutdown_list = NULL;
static sdb_llist_t *log_list = NULL;
-static sdb_llist_t *ts_fetcher_list = NULL;
static sdb_llist_t *timeseries_fetcher_list = NULL;
static sdb_llist_t *writer_list = NULL;
static sdb_llist_t *reader_list = NULL;
{ "cname", &cname_list },
{ "shutdown", &shutdown_list },
{ "log", &log_list },
- { "timeseries fetcher", &ts_fetcher_list },
{ "timeseries fetcher", ×eries_fetcher_list },
{ "store writer", &writer_list },
{ "store reader", &reader_list },
/* else: other callbacks still reference it */
} /* plugin_unregister_by_name */
+/*
+ * store writer wrapper for performing database queries:
+ * It wraps another store writer, adding extra logic as needed.
+ */
+
+typedef struct {
+ sdb_object_t super;
+ sdb_store_writer_t *w;
+ sdb_object_t *ud;
+ sdb_query_opts_t opts;
+} query_writer_t;
+#define QUERY_WRITER_INIT(w, ud) { \
+ SDB_OBJECT_INIT, \
+ (w), (ud), \
+ SDB_DEFAULT_QUERY_OPTS \
+}
+#define QUERY_WRITER(obj) ((query_writer_t *)(obj))
+
+static int
+query_store_host(sdb_store_host_t *host, sdb_object_t *user_data)
+{
+ query_writer_t *qw = QUERY_WRITER(user_data);
+ return qw->w->store_host(host, qw->ud);
+} /* query_store_host */
+
+static int
+query_store_service(sdb_store_service_t *service, sdb_object_t *user_data)
+{
+ query_writer_t *qw = QUERY_WRITER(user_data);
+ return qw->w->store_service(service, qw->ud);
+} /* query_store_service */
+
+static int
+query_store_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
+{
+ query_writer_t *qw = QUERY_WRITER(user_data);
+ sdb_timeseries_info_t *infos[metric->stores_num];
+ sdb_metric_store_t stores[metric->stores_num];
+
+ const sdb_metric_store_t *orig_stores = metric->stores;
+ int status;
+ size_t i;
+
+ if (! qw->opts.describe_timeseries)
+ /* nothing further to do */
+ return qw->w->store_metric(metric, qw->ud);
+
+ for (i = 0; i < metric->stores_num; i++) {
+ sdb_metric_store_t *s = stores + i;
+ *s = metric->stores[i];
+ infos[i] = sdb_plugin_describe_timeseries(s->type, s->id);
+ s->info = infos[i];
+ }
+
+ metric->stores = stores;
+ status = qw->w->store_metric(metric, qw->ud);
+ metric->stores = orig_stores;
+
+ for (i = 0; i < metric->stores_num; i++)
+ sdb_timeseries_info_destroy(infos[i]);
+ return status;
+} /* query_store_metric */
+
+static int
+query_store_attribute(sdb_store_attribute_t *attr, sdb_object_t *user_data)
+{
+ query_writer_t *qw = QUERY_WRITER(user_data);
+ return qw->w->store_attribute(attr, qw->ud);
+} /* query_store_attribute */
+
+static sdb_store_writer_t query_writer = {
+ query_store_host, query_store_service,
+ query_store_metric, query_store_attribute,
+};
+
/*
* private types
*/
if ((status = module_init(name, lh, &ctx->info))) {
sdb_object_deref(SDB_OBJ(ctx));
+ ctx_set(NULL);
return status;
}
fetch.name = n;
status = sdb_plugin_query(SDB_AST_NODE(&fetch),
- &interval_fetcher, SDB_OBJ(&obj), NULL);
+ &interval_fetcher, SDB_OBJ(&obj), NULL, NULL);
if ((status < 0) || (lu.obj_type != obj_type) || (lu.last_update == 0)) {
*interval_out = 0;
return 0;
ctx_t *old_ctx = ctx_set(ctx);
status = module_init(ctx->info.plugin_name, ctx->handle, NULL);
+ ctx_set(old_ctx);
if (status)
return status;
sdb_log(SDB_LOG_INFO, "core: Successfully reloaded plugin "
"'%s' (%s)", ctx->info.plugin_name,
INFO_GET(&ctx->info, description));
- ctx_set(old_ctx);
}
++ctx->use_cnt;
return 0;
@@ -1068,14 +1142,6 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
return 0;
} /* sdb_plugin_register_collector */
-int
-sdb_plugin_register_ts_fetcher(const char *name,
- sdb_plugin_fetch_ts_cb callback, sdb_object_t *user_data)
-{
- return plugin_add_impl(&ts_fetcher_list, callback_type, "time-series fetcher",
- name, callback, user_data);
-} /* sdb_plugin_register_ts_fetcher */
-
int
sdb_plugin_register_timeseries_fetcher(const char *name,
sdb_timeseries_fetcher_t *fetcher, sdb_object_t *user_data)
c = ctx_get();
if (! c) {
- sdb_plugin_log(SDB_LOG_ERR, "core: Invalid read access to plugin "
+ sdb_log(SDB_LOG_ERR, "core: Invalid read access to plugin "
"context outside a plugin");
return plugin_default_ctx;
}
c = ctx_get();
if (! c) {
- sdb_plugin_log(SDB_LOG_ERR, "core: Invalid write access to plugin "
+ sdb_log(SDB_LOG_ERR, "core: Invalid write access to plugin "
"context outside a plugin");
return -1;
}
sdb_plugin_fetch_timeseries(const char *type, const char *id,
sdb_timeseries_opts_t *opts)
{
- callback_t *plugin;
- sdb_plugin_fetch_ts_cb callback;
-
ts_fetcher_t *fetcher;
sdb_timeseries_t *ts;
return NULL;
fetcher = TS_FETCHER(sdb_llist_search_by_name(timeseries_fetcher_list, type));
- if (fetcher) {
- old_ctx = ctx_set(fetcher->ts_ctx);
- ts = fetcher->impl.fetch(id, opts, fetcher->ts_user_data);
- ctx_set(old_ctx);
- return ts;
- }
-
- /* fallback code */
- plugin = CB(sdb_llist_search_by_name(ts_fetcher_list, type));
- if (! plugin) {
+ if (! fetcher) {
sdb_log(SDB_LOG_ERR, "core: Cannot fetch time-series of type %s: "
"no such plugin loaded", type);
errno = ENOENT;
return NULL;
}
- old_ctx = ctx_set(plugin->cb_ctx);
- callback = (sdb_plugin_fetch_ts_cb)plugin->cb_callback;
- ts = callback(id, opts, plugin->cb_user_data);
+ old_ctx = ctx_set(fetcher->ts_ctx);
+ ts = fetcher->impl.fetch(id, opts, fetcher->ts_user_data);
ctx_set(old_ctx);
return ts;
} /* sdb_plugin_fetch_timeseries */
+sdb_timeseries_info_t *
+sdb_plugin_describe_timeseries(const char *type, const char *id)
+{
+ ts_fetcher_t *fetcher;
+ sdb_timeseries_info_t *ts_info;
+
+ ctx_t *old_ctx;
+
+ if ((! type) || (! id))
+ return NULL;
+
+ fetcher = TS_FETCHER(sdb_llist_search_by_name(timeseries_fetcher_list, type));
+ if (! fetcher) {
+ sdb_log(SDB_LOG_ERR, "core: Cannot describe time-series of type %s: "
+ "no such plugin loaded", type);
+ errno = ENOENT;
+ return NULL;
+ }
+
+ old_ctx = ctx_set(fetcher->ts_ctx);
+ ts_info = fetcher->impl.describe(id, fetcher->ts_user_data);
+ ctx_set(old_ctx);
+ return ts_info;
+} /* sdb_plugin_describe_timeseries */
+
int
sdb_plugin_query(sdb_ast_node_t *ast,
- sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf)
+ sdb_store_writer_t *w, sdb_object_t *wd,
+ sdb_query_opts_t *opts, sdb_strbuf_t *errbuf)
{
- size_t n = sdb_llist_len(reader_list);
+ query_writer_t qw = QUERY_WRITER_INIT(w, wd);
reader_t *reader;
sdb_object_t *q;
+
+ size_t n = sdb_llist_len(reader_list);
int status = 0;
if (! ast)
return 0;
+ if (opts)
+ qw.opts = *opts;
+
if ((ast->type != SDB_AST_TYPE_FETCH)
&& (ast->type != SDB_AST_TYPE_LIST)
&& (ast->type != SDB_AST_TYPE_LOOKUP)) {
q = reader->impl.prepare_query(ast, errbuf, reader->r_user_data);
if (q)
- status = reader->impl.execute_query(q, w, SDB_OBJ(wd),
+ status = reader->impl.execute_query(q, &query_writer, SDB_OBJ(&qw),
errbuf, reader->r_user_data);
else
status = -1;