![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/plugin.c b/src/core/plugin.c
index 806e13c2f717f27b339ffd42b4cf43f4e2c3575b..4de1c3a4d93f3a8f502844bc67d4fe5801889b6b 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
#define SDB_PLUGIN_CB_INIT { SDB_OBJECT_INIT, \
/* callback = */ NULL, /* user_data = */ NULL, \
SDB_PLUGIN_CTX_INIT }
+#define SDB_PLUGIN_CB(obj) ((sdb_plugin_cb_t *)(obj))
+#define SDB_CONST_PLUGIN_CB(obj) ((const sdb_plugin_cb_t *)(obj))
typedef struct {
sdb_plugin_cb_t super;
sdb_time_t ccb_interval;
sdb_time_t ccb_next_update;
} sdb_plugin_collector_cb_t;
-
-#define SDB_PLUGIN_CB(obj) ((sdb_plugin_cb_t *)(obj))
-#define SDB_CONST_PLUGIN_CB(obj) ((const sdb_plugin_cb_t *)(obj))
#define SDB_PLUGIN_CCB(obj) ((sdb_plugin_collector_cb_t *)(obj))
#define SDB_CONST_PLUGIN_CCB(obj) ((const sdb_plugin_collector_cb_t *)(obj))
+typedef struct {
+ sdb_object_t super;
+ sdb_store_writer_t impl;
+ sdb_object_t *user_data;
+ ctx_t *ctx;
+} sdb_plugin_writer_t;
+#define SDB_PLUGIN_WRITER(obj) ((sdb_plugin_writer_t *)(obj))
+
/*
* private variables
*/
static sdb_plugin_info_t plugin_default_info = SDB_PLUGIN_INFO_INIT;
static pthread_key_t plugin_ctx_key;
-static _Bool plugin_ctx_key_initialized = 0;
+static bool plugin_ctx_key_initialized = 0;
/* a list of the plugin contexts of all registered plugins */
static sdb_llist_t *all_plugins = NULL;
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 *writer_list = NULL;
static struct {
const char *type;
sdb_llist_t **list;
} all_lists[] = {
- { "config", &config_list },
- { "init", &init_list },
- { "collector", &collector_list },
- { "cname", &cname_list },
- { "shutdown", &shutdown_list },
- { "log", &log_list },
+ { "config", &config_list },
+ { "init", &init_list },
+ { "collector", &collector_list },
+ { "cname", &cname_list },
+ { "shutdown", &shutdown_list },
+ { "log", &log_list },
+ { "timeseries fetcher", &ts_fetcher_list },
+ { "store writer", &writer_list },
};
/*
plugin_cb_destroy
};
+static int
+plugin_writer_init(sdb_object_t *obj, va_list ap)
+{
+ sdb_store_writer_t *impl = va_arg(ap, sdb_store_writer_t *);
+ sdb_object_t *ud = va_arg(ap, sdb_object_t *);
+
+ assert(impl);
+
+ if ((! impl->store_host) || (! impl->store_service)
+ || (! impl->store_metric) || (! impl->store_attribute)
+ || (! impl->store_service_attr) || (! impl->store_metric_attr)) {
+ sdb_log(SDB_LOG_ERR, "core: store writer callback '%s' "
+ "does not fully implement the writer interface.",
+ obj->name);
+ return -1;
+ }
+ if (sdb_llist_search_by_name(writer_list, obj->name)) {
+ sdb_log(SDB_LOG_WARNING, "core: store writer callback '%s' "
+ "has already been registered. Ignoring newly "
+ "registered version.", obj->name);
+ return -1;
+ }
+
+ /* ctx may be NULL if the plugin was not registered by a plugin */
+
+ SDB_PLUGIN_WRITER(obj)->impl = *impl;
+ SDB_PLUGIN_WRITER(obj)->ctx = ctx_get();
+ sdb_object_ref(SDB_OBJ(SDB_PLUGIN_WRITER(obj)->ctx));
+
+ sdb_object_ref(ud);
+ SDB_PLUGIN_WRITER(obj)->user_data = ud;
+ return 0;
+} /* plugin_writer_init */
+
+static void
+plugin_writer_destroy(sdb_object_t *obj)
+{
+ assert(obj);
+ sdb_object_deref(SDB_PLUGIN_WRITER(obj)->user_data);
+ sdb_object_deref(SDB_OBJ(SDB_PLUGIN_WRITER(obj)->ctx));
+} /* plugin_writer_destroy */
+
+static sdb_type_t sdb_plugin_writer_type = {
+ sizeof(sdb_plugin_writer_t),
+
+ plugin_writer_init,
+ plugin_writer_destroy
+};
+
static int
module_init(const char *name, lt_dlhandle lh, sdb_plugin_info_t *info)
{
@@ -751,12 +811,16 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
if (interval)
SDB_PLUGIN_CCB(obj)->ccb_interval = *interval;
else {
- sdb_time_t tmp = sdb_plugin_get_ctx().interval;
+ ctx_t *ctx = ctx_get();
- if (tmp > 0)
- SDB_PLUGIN_CCB(obj)->ccb_interval = tmp;
- else
- SDB_PLUGIN_CCB(obj)->ccb_interval = 0;
+ if (! ctx) {
+ sdb_log(SDB_LOG_ERR, "core: Cannot determine interval "
+ "for collector %s; none specified and no plugin "
+ "context found", cb_name);
+ return -1;
+ }
+
+ SDB_PLUGIN_CCB(obj)->ccb_interval = ctx->public.interval;
}
if (! (SDB_PLUGIN_CCB(obj)->ccb_next_update = sdb_gettime())) {
@@ -782,6 +846,49 @@ 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_callback(&ts_fetcher_list, "time-series fetcher",
+ name, callback, user_data);
+} /* sdb_plugin_register_ts_fetcher */
+
+int
+sdb_plugin_register_writer(const char *name,
+ sdb_store_writer_t *writer, sdb_object_t *user_data)
+{
+ char cb_name[1024];
+ sdb_object_t *obj;
+
+ if ((! name) || (! writer))
+ return -1;
+
+ if (! writer_list)
+ writer_list = sdb_llist_create();
+ if (! writer_list)
+ return -1;
+
+ plugin_get_name(name, cb_name, sizeof(cb_name));
+
+ obj = sdb_object_create(cb_name, sdb_plugin_writer_type,
+ writer, user_data);
+ if (! obj)
+ return -1;
+
+ if (sdb_llist_append(writer_list, obj)) {
+ sdb_object_deref(obj);
+ return -1;
+ }
+
+ /* pass control to the list */
+ sdb_object_deref(obj);
+
+ sdb_log(SDB_LOG_INFO, "core: Registered store writer callback '%s'.",
+ cb_name);
+ return 0;
+} /* sdb_store_register_writer */
+
sdb_plugin_ctx_t
sdb_plugin_get_ctx(void)
{
sdb_llist_iter_t *iter;
int ret = -1;
- _Bool logged = 0;
+ bool logged = 0;
if (! msg)
return 0;
return ret;
} /* sdb_plugin_logf */
+sdb_timeseries_t *
+sdb_plugin_fetch_timeseries(const char *type, const char *id,
+ sdb_timeseries_opts_t *opts)
+{
+ sdb_plugin_cb_t *plugin;
+ sdb_plugin_fetch_ts_cb callback;
+ sdb_timeseries_t *ts;
+
+ ctx_t *old_ctx;
+
+ if ((! type) || (! id) || (! opts))
+ return NULL;
+
+ plugin = SDB_PLUGIN_CB(sdb_llist_search_by_name(ts_fetcher_list, type));
+ if (! plugin) {
+ 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);
+ ctx_set(old_ctx);
+ return ts;
+} /* sdb_plugin_fetch_timeseries */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */