diff --git a/src/core/plugin.c b/src/core/plugin.c
index 8d836cc981de718a9f42cb270ec1b7f8ce66d783..ca04ae21efc8745efc62553cda354060ca54390d 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 },
@@ -1068,14 +1066,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)
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)