diff --git a/src/core/plugin.c b/src/core/plugin.c
index 0e87ce5a9f51f5a719031e36b0dc83460729bb83..85dd76f410dbccfdb27f6bbf9fff3c0ee4653f27 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
#include <pthread.h>
+/* helper to access info attributes */
+#define INFO_GET(i, attr) \
+ ((i)->attr ? (i)->attr : #attr" not set")
+
/*
* private data types
*/
-struct sdb_plugin_info {
- char *plugin_name;
- char *filename;
-
- /* public attributes */
- char *description;
- char *copyright;
- char *license;
-
- int version;
- int plugin_version;
-};
-#define SDB_PLUGIN_INFO_INIT { \
- /* plugin_name */ NULL, /* filename */ NULL, /* desc */ NULL, \
- /* copyright */ NULL, /* license */ NULL, \
- /* version */ -1, /* plugin_version */ -1 }
-#define INFO_GET(i, attr) \
- ((i)->attr ? (i)->attr : #attr" not set")
-
typedef struct {
sdb_object_t super;
sdb_plugin_ctx_t public;
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 struct {
const char *type;
sdb_llist_append(all_plugins, SDB_OBJ(ctx));
sdb_log(SDB_LOG_INFO, "core: Successfully loaded "
- "plugin '%s' v%i (%s)\n\t%s\n\tLicense: %s",
- ctx->info.plugin_name, ctx->info.plugin_version,
- INFO_GET(&ctx->info, description),
+ "plugin %s v%i (%s)", ctx->info.plugin_name,
+ ctx->info.plugin_version,
+ INFO_GET(&ctx->info, description));
+ sdb_log(SDB_LOG_INFO, "core: Plugin %s: %s, License: %s",
+ ctx->info.plugin_name,
INFO_GET(&ctx->info, copyright),
INFO_GET(&ctx->info, license));
@@ -764,12 +752,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())) {
@@ -795,6 +787,14 @@ 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 */
+
sdb_plugin_ctx_t
sdb_plugin_get_ctx(void)
{
return 0;
} /* sdb_plugin_set_ctx */
+const sdb_plugin_info_t *
+sdb_plugin_current(void)
+{
+ ctx_t *ctx = ctx_get();
+
+ if (! ctx)
+ return NULL;
+ return &ctx->info;
+} /* sdb_plugin_current */
+
int
sdb_plugin_configure(const char *name, oconfig_item_t *ci)
{