X-Git-Url: https://git.tokkee.org/?p=sysdb.git;a=blobdiff_plain;f=src%2Fcore%2Fplugin.c;h=76fc2092d022ff8588a2b5f11739e8653fa5c1c4;hp=ca04ae21efc8745efc62553cda354060ca54390d;hb=2d39d666abde2d66a55ac4536da3f250d9513f48;hpb=b2d31bc42a7694c671186081ee0cac077a188b99

diff --git a/src/core/plugin.c b/src/core/plugin.c
index ca04ae2..76fc209 100644
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
@@ -267,6 +267,81 @@ plugin_unregister_by_name(const char *plugin_name)
 	/* 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
  */
@@ -651,6 +726,7 @@ module_load(const char *basedir, const char *name,
 
 	if ((status = module_init(name, lh, &ctx->info))) {
 		sdb_object_deref(SDB_OBJ(ctx));
+		ctx_set(NULL);
 		return status;
 	}
 
@@ -808,7 +884,7 @@ get_interval(int obj_type, const char *hostname,
 	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;
@@ -878,13 +954,13 @@ sdb_plugin_load(const char *basedir, const char *name,
 			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;
@@ -1121,7 +1197,7 @@ sdb_plugin_get_ctx(void)
 
 	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;
 	}
@@ -1135,7 +1211,7 @@ sdb_plugin_set_ctx(sdb_plugin_ctx_t ctx, sdb_plugin_ctx_t *old)
 
 	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;
 	}
@@ -1582,16 +1658,22 @@ sdb_plugin_describe_timeseries(const char *type, const char *id)
 
 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)) {
@@ -1616,7 +1698,7 @@ sdb_plugin_query(sdb_ast_node_t *ast,
 
 	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;