![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/plugin.c b/src/core/plugin.c
index 235b8c7721ba97d08dc1b165c6ac0812ed7c6292..44ea48a06b53e38434cd23a6a9a951d689d48cf2 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
return ctx;
} /* ctx_create */
-static int
-plugin_cb_init(sdb_object_t *obj, va_list ap)
+/*
+ * plugin_init_ok:
+ * Checks whether the registration of a new plugin identified by 'obj' is
+ * okay. It consumes the first two arguments of 'ap'.
+ */
+static bool
+plugin_init_ok(sdb_object_t *obj, va_list ap)
{
sdb_llist_t **list = va_arg(ap, sdb_llist_t **);
- const char *type = va_arg(ap, const char *);
- void *callback = va_arg(ap, void *);
- sdb_object_t *ud = va_arg(ap, sdb_object_t *);
+ const char *type = va_arg(ap, const char *);
- assert(list);
- assert(type);
- assert(obj);
+ assert(list); assert(type);
if (sdb_llist_search_by_name(*list, obj->name)) {
sdb_log(SDB_LOG_WARNING, "core: %s callback '%s' "
"has already been registered. Ignoring newly "
"registered version.", type, obj->name);
- return -1;
+ return 0;
}
+ return 1;
+} /* plugin_init_ok */
+
+static int
+plugin_cb_init(sdb_object_t *obj, va_list ap)
+{
+ void *callback;
+ sdb_object_t *ud;
+
+ if (! plugin_init_ok(obj, ap))
+ return -1;
+
+ callback = va_arg(ap, void *);
+ ud = va_arg(ap, sdb_object_t *);
/* cb_ctx may be NULL if the plugin was not registered by a plugin */
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 *);
+ sdb_store_writer_t *impl;
+ sdb_object_t *ud;
+
+ if (! plugin_init_ok(obj, ap))
+ return -1;
+ impl = va_arg(ap, sdb_store_writer_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)) {
+ || (! impl->store_metric) || (! impl->store_attribute)) {
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 callback was not registered by a plugin */
static int
plugin_reader_init(sdb_object_t *obj, va_list ap)
{
- sdb_store_reader_t *impl = va_arg(ap, sdb_store_reader_t *);
- sdb_object_t *ud = va_arg(ap, sdb_object_t *);
+ sdb_store_reader_t *impl;
+ sdb_object_t *ud;
+
+ if (! plugin_init_ok(obj, ap))
+ return -1;
+ impl = va_arg(ap, sdb_store_reader_t *);
+ ud = va_arg(ap, sdb_object_t *);
assert(impl);
if ((! impl->prepare_query) || (! impl->execute_query)) {
obj->name);
return -1;
}
- if (sdb_llist_search_by_name(reader_list, obj->name)) {
- sdb_log(SDB_LOG_WARNING, "core: store reader callback '%s' "
- "has already been registered. Ignoring newly "
- "registered version.", obj->name);
- return -1;
- }
/* ctx may be NULL if the callback was not registered by a plugin */
} /* plugin_get_name */
static int
-plugin_add_callback(sdb_llist_t **list, const char *type,
- const char *name, void *callback, sdb_object_t *user_data)
+plugin_add_impl(sdb_llist_t **list, sdb_type_t T, const char *type,
+ const char *name, void *impl, sdb_object_t *user_data)
{
sdb_object_t *obj;
- if ((! name) || (! callback))
+ if ((! name) || (! impl))
return -1;
assert(list);
if (! *list)
return -1;
- obj = sdb_object_create(name, callback_type,
- list, type, callback, user_data);
+ obj = sdb_object_create(name, T, list, type, impl, user_data);
if (! obj)
return -1;
sdb_log(SDB_LOG_INFO, "core: Registered %s callback '%s'.",
type, name);
return 0;
-} /* plugin_add_callback */
+} /* plugin_add_impl */
+
+/*
+ * object meta-data
+ */
+
+typedef struct {
+ int obj_type;
+ sdb_time_t last_update;
+ sdb_time_t interval;
+} interval_fetcher_t;
+
+static int
+interval_fetcher_host(sdb_store_host_t *host, sdb_object_t *user_data)
+{
+ interval_fetcher_t *lu = SDB_OBJ_WRAPPER(user_data)->data;
+ lu->obj_type = SDB_HOST;
+ lu->last_update = host->last_update;
+ return 0;
+} /* interval_fetcher_host */
+
+static int
+interval_fetcher_service(sdb_store_service_t *svc, sdb_object_t *user_data)
+{
+ interval_fetcher_t *lu = SDB_OBJ_WRAPPER(user_data)->data;
+ lu->obj_type = SDB_SERVICE;
+ lu->last_update = svc->last_update;
+ return 0;
+} /* interval_fetcher_service */
+
+static int
+interval_fetcher_metric(sdb_store_metric_t *metric, sdb_object_t *user_data)
+{
+ interval_fetcher_t *lu = SDB_OBJ_WRAPPER(user_data)->data;
+ lu->obj_type = SDB_METRIC;
+ lu->last_update = metric->last_update;
+ return 0;
+} /* interval_fetcher_metric */
+
+static int
+interval_fetcher_attr(sdb_store_attribute_t *attr, sdb_object_t *user_data)
+{
+ interval_fetcher_t *lu = SDB_OBJ_WRAPPER(user_data)->data;
+ lu->obj_type = SDB_ATTRIBUTE;
+ lu->last_update = attr->last_update;
+ return 0;
+} /* interval_fetcher_attr */
+
+static sdb_store_writer_t interval_fetcher = {
+ interval_fetcher_host, interval_fetcher_service,
+ interval_fetcher_metric, interval_fetcher_attr,
+};
+
+static int
+get_interval(int obj_type, const char *hostname,
+ int parent_type, const char *parent, const char *name,
+ sdb_time_t last_update, sdb_time_t *interval_out)
+{
+ sdb_ast_fetch_t fetch = SDB_AST_FETCH_INIT;
+ char hn[hostname ? strlen(hostname) + 1 : 1];
+ char pn[parent ? strlen(parent) + 1 : 1];
+ char n[strlen(name) + 1];
+ int status;
+
+ interval_fetcher_t lu = { 0, 0, 0 };
+ sdb_object_wrapper_t obj = SDB_OBJECT_WRAPPER_STATIC(&lu);
+ sdb_time_t interval;
+
+ assert(name);
+
+ if (hostname)
+ strncpy(hn, hostname, sizeof(hn));
+ if (parent)
+ strncpy(pn, parent, sizeof(pn));
+ strncpy(n, name, sizeof(n));
+
+ fetch.obj_type = obj_type;
+ fetch.hostname = hostname ? hn : NULL;
+ fetch.parent_type = parent_type;
+ fetch.parent = parent ? pn : NULL;
+ fetch.name = n;
+
+ status = sdb_plugin_query(SDB_AST_NODE(&fetch),
+ &interval_fetcher, SDB_OBJ(&obj), NULL);
+ if ((status < 0) || (lu.obj_type != obj_type) || (lu.last_update == 0)) {
+ *interval_out = 0;
+ return 0;
+ }
+
+ if (lu.last_update >= last_update) {
+ if (lu.last_update > last_update)
+ sdb_log(SDB_LOG_DEBUG, "memstore: Cannot update %s '%s' - "
+ "value too old (%"PRIsdbTIME" < %"PRIsdbTIME")",
+ SDB_STORE_TYPE_TO_NAME(obj_type), name,
+ lu.last_update, last_update);
+ *interval_out = lu.interval;
+ return 1;
+ }
+
+ interval = last_update - lu.last_update;
+ if (lu.interval && interval)
+ interval = (sdb_time_t)((0.9 * (double)lu.interval)
+ + (0.1 * (double)interval));
+ *interval_out = interval;
+ return 0;
+} /* get_interval */
+
+static void
+get_backend(char **backends, size_t *backends_num)
+{
+ const sdb_plugin_info_t *info;
+
+ info = sdb_plugin_current();
+ if ((! info) || (! info->plugin_name) || (! *info->plugin_name)) {
+ *backends_num = 0;
+ return;
+ }
+
+ backends[0] = info->plugin_name;
+ *backends_num = 1;
+} /* get_backend */
/*
* public API
"config callback from outside a plugin");
return -1;
}
- return plugin_add_callback(&config_list, "config", ctx->info.plugin_name,
- (void *)callback, NULL);
+ return plugin_add_impl(&config_list, callback_type, "config",
+ ctx->info.plugin_name, (void *)callback, NULL);
} /* sdb_plugin_register_config */
int
sdb_object_t *user_data)
{
char cb_name[1024];
- return plugin_add_callback(&init_list, "init",
+ return plugin_add_impl(&init_list, callback_type, "init",
plugin_get_name(name, cb_name, sizeof(cb_name)),
(void *)callback, user_data);
} /* sdb_plugin_register_init */
sdb_object_t *user_data)
{
char cb_name[1024];
- return plugin_add_callback(&shutdown_list, "shutdown",
+ return plugin_add_impl(&shutdown_list, callback_type, "shutdown",
plugin_get_name(name, cb_name, sizeof(cb_name)),
(void *)callback, user_data);
} /* sdb_plugin_register_shutdown */
sdb_object_t *user_data)
{
char cb_name[1024];
- return plugin_add_callback(&log_list, "log",
+ return plugin_add_impl(&log_list, callback_type, "log",
plugin_get_name(name, cb_name, sizeof(cb_name)),
callback, user_data);
} /* sdb_plugin_register_log */
sdb_object_t *user_data)
{
char cb_name[1024];
- return plugin_add_callback(&cname_list, "cname",
+ return plugin_add_impl(&cname_list, callback_type, "cname",
plugin_get_name(name, cb_name, sizeof(cb_name)),
callback, user_data);
} /* sdb_plugin_register_cname */
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",
+ return plugin_add_impl(&ts_fetcher_list, callback_type, "time-series fetcher",
name, callback, user_data);
} /* sdb_plugin_register_ts_fetcher */
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, writer_type,
+ return plugin_add_impl(&writer_list, writer_type, "store writer",
+ plugin_get_name(name, cb_name, sizeof(cb_name)),
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 */
int
sdb_store_reader_t *reader, sdb_object_t *user_data)
{
char cb_name[1024];
- sdb_object_t *obj;
-
- if ((! name) || (! reader))
- return -1;
-
- if (! reader_list)
- reader_list = sdb_llist_create();
- if (! reader_list)
- return -1;
-
- plugin_get_name(name, cb_name, sizeof(cb_name));
-
- obj = sdb_object_create(cb_name, reader_type,
+ return plugin_add_impl(&reader_list, reader_type, "store reader",
+ plugin_get_name(name, cb_name, sizeof(cb_name)),
reader, user_data);
- if (! obj)
- return -1;
-
- if (sdb_llist_append(reader_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 reader callback '%s'.",
- cb_name);
- return 0;
} /* sdb_plugin_register_reader */
void
} /* sdb_plugin_fetch_timeseries */
int
-sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
+sdb_plugin_query(sdb_ast_node_t *ast,
+ sdb_store_writer_t *w, sdb_object_t *wd, sdb_strbuf_t *errbuf)
{
size_t n = sdb_llist_len(reader_list);
reader_t *reader;
@@ -1435,8 +1517,7 @@ sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
if ((ast->type != SDB_AST_TYPE_FETCH)
&& (ast->type != SDB_AST_TYPE_LIST)
- && (ast->type != SDB_AST_TYPE_LOOKUP)
- && (ast->type != SDB_AST_TYPE_TIMESERIES)) {
+ && (ast->type != SDB_AST_TYPE_LOOKUP)) {
sdb_log(SDB_LOG_ERR, "core: Cannot execute query of type %s",
SDB_AST_TYPE_TO_STRING(ast));
sdb_strbuf_sprintf(errbuf, "Cannot execute query of type %s",
@@ -1458,7 +1539,8 @@ sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
q = reader->impl.prepare_query(ast, errbuf, reader->r_user_data);
if (q)
- status = reader->impl.execute_query(q, buf, errbuf, reader->r_user_data);
+ status = reader->impl.execute_query(q, w, SDB_OBJ(wd),
+ errbuf, reader->r_user_data);
else
status = -1;
@@ -1470,6 +1552,8 @@ sdb_plugin_query(sdb_ast_node_t *ast, sdb_strbuf_t *buf, sdb_strbuf_t *errbuf)
int
sdb_plugin_store_host(const char *name, sdb_time_t last_update)
{
+ sdb_store_host_t host = SDB_STORE_HOST_INIT;
+ char *backends[1];
char *cname;
sdb_llist_iter_t *iter;
return -1;
}
+ host.name = cname;
+ host.last_update = last_update ? last_update : sdb_gettime();
+ if (get_interval(SDB_HOST, NULL, -1, NULL, cname,
+ host.last_update, &host.interval)) {
+ free(cname);
+ return 1;
+ }
+ host.backends = (const char * const *)backends;
+ get_backend(backends, &host.backends_num);
+
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
int s;
assert(writer);
- s = writer->impl.store_host(cname, last_update, writer->w_user_data);
+ s = writer->impl.store_host(&host, writer->w_user_data);
if (((s > 0) && (status >= 0)) || (s < 0))
status = s;
}
sdb_plugin_store_service(const char *hostname, const char *name,
sdb_time_t last_update)
{
+ sdb_store_service_t service = SDB_STORE_SERVICE_INIT;
+ char *backends[1];
char *cname;
sdb_llist_iter_t *iter;
+ sdb_data_t d;
+
int status = 0;
if ((! hostname) || (! name))
return -1;
}
+ service.hostname = cname;
+ service.name = name;
+ service.last_update = last_update ? last_update : sdb_gettime();
+ if (get_interval(SDB_SERVICE, cname, -1, NULL, name,
+ service.last_update, &service.interval)) {
+ free(cname);
+ return 1;
+ }
+ service.backends = (const char * const *)backends;
+ get_backend(backends, &service.backends_num);
+
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
int s;
assert(writer);
- s = writer->impl.store_service(cname, name, last_update,
- writer->w_user_data);
+ s = writer->impl.store_service(&service, writer->w_user_data);
if (((s > 0) && (status >= 0)) || (s < 0))
status = s;
}
sdb_llist_iter_destroy(iter);
+
+ if (! status) {
+ /* record the hostname as an attribute */
+ d.type = SDB_TYPE_STRING;
+ d.data.string = cname;
+ if (sdb_plugin_store_service_attribute(cname, name,
+ "hostname", &d, service.last_update))
+ status = -1;
+ }
+
free(cname);
return status;
} /* sdb_plugin_store_service */
sdb_plugin_store_metric(const char *hostname, const char *name,
sdb_metric_store_t *store, sdb_time_t last_update)
{
+ sdb_store_metric_t metric = SDB_STORE_METRIC_INIT;
+ char *backends[1];
char *cname;
sdb_llist_iter_t *iter;
+ sdb_data_t d;
+
int status = 0;
if ((! hostname) || (! name))
if (store && ((! store->type) || (! store->id)))
store = NULL;
+ metric.hostname = cname;
+ metric.name = name;
+ if (store) {
+ if (store->last_update < last_update)
+ store->last_update = last_update;
+ metric.stores = store;
+ metric.stores_num = 1;
+ }
+ metric.last_update = last_update ? last_update : sdb_gettime();
+ if (get_interval(SDB_METRIC, cname, -1, NULL, name,
+ metric.last_update, &metric.interval)) {
+ free(cname);
+ return 1;
+ }
+ metric.backends = (const char * const *)backends;
+ get_backend(backends, &metric.backends_num);
+
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
int s;
assert(writer);
- s = writer->impl.store_metric(cname, name, store, last_update,
- writer->w_user_data);
+ s = writer->impl.store_metric(&metric, writer->w_user_data);
if (((s > 0) && (status >= 0)) || (s < 0))
status = s;
}
sdb_llist_iter_destroy(iter);
+
+ if (! status) {
+ /* record the hostname as an attribute */
+ d.type = SDB_TYPE_STRING;
+ d.data.string = cname;
+ if (sdb_plugin_store_metric_attribute(cname, name,
+ "hostname", &d, metric.last_update))
+ status = -1;
+ }
+
free(cname);
return status;
} /* sdb_plugin_store_metric */
sdb_plugin_store_attribute(const char *hostname, const char *key,
const sdb_data_t *value, sdb_time_t last_update)
{
+ sdb_store_attribute_t attr = SDB_STORE_ATTRIBUTE_INIT;
+ char *backends[1];
char *cname;
sdb_llist_iter_t *iter;
return -1;
}
+ attr.parent_type = SDB_HOST;
+ attr.parent = cname;
+ attr.key = key;
+ attr.value = *value;
+ attr.last_update = last_update ? last_update : sdb_gettime();
+ if (get_interval(SDB_ATTRIBUTE, cname, -1, NULL, key,
+ attr.last_update, &attr.interval)) {
+ free(cname);
+ return 1;
+ }
+ attr.backends = (const char * const *)backends;
+ get_backend(backends, &attr.backends_num);
+
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
int s;
assert(writer);
- s = writer->impl.store_attribute(cname, key, value, last_update,
- writer->w_user_data);
+ s = writer->impl.store_attribute(&attr, writer->w_user_data);
if (((s > 0) && (status >= 0)) || (s < 0))
status = s;
}
sdb_plugin_store_service_attribute(const char *hostname, const char *service,
const char *key, const sdb_data_t *value, sdb_time_t last_update)
{
+ sdb_store_attribute_t attr = SDB_STORE_ATTRIBUTE_INIT;
+ char *backends[1];
char *cname;
sdb_llist_iter_t *iter;
@@ -1648,13 +1812,26 @@ sdb_plugin_store_service_attribute(const char *hostname, const char *service,
return -1;
}
+ attr.hostname = cname;
+ attr.parent_type = SDB_SERVICE;
+ attr.parent = service;
+ attr.key = key;
+ attr.value = *value;
+ attr.last_update = last_update ? last_update : sdb_gettime();
+ if (get_interval(SDB_ATTRIBUTE, cname, SDB_SERVICE, service, key,
+ attr.last_update, &attr.interval)) {
+ free(cname);
+ return 1;
+ }
+ attr.backends = (const char * const *)backends;
+ get_backend(backends, &attr.backends_num);
+
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
int s;
assert(writer);
- s = writer->impl.store_service_attr(cname, service,
- key, value, last_update, writer->w_user_data);
+ s = writer->impl.store_attribute(&attr, writer->w_user_data);
if (((s > 0) && (status >= 0)) || (s < 0))
status = s;
}
sdb_plugin_store_metric_attribute(const char *hostname, const char *metric,
const char *key, const sdb_data_t *value, sdb_time_t last_update)
{
+ sdb_store_attribute_t attr = SDB_STORE_ATTRIBUTE_INIT;
+ char *backends[1];
char *cname;
sdb_llist_iter_t *iter;
return -1;
}
+ attr.hostname = cname;
+ attr.parent_type = SDB_METRIC;
+ attr.parent = metric;
+ attr.key = key;
+ attr.value = *value;
+ attr.last_update = last_update ? last_update : sdb_gettime();
+ if (get_interval(SDB_ATTRIBUTE, cname, SDB_METRIC, metric, key,
+ attr.last_update, &attr.interval)) {
+ free(cname);
+ return 1;
+ }
+ attr.backends = (const char * const *)backends;
+ get_backend(backends, &attr.backends_num);
+
iter = sdb_llist_get_iter(writer_list);
while (sdb_llist_iter_has_next(iter)) {
writer_t *writer = WRITER(sdb_llist_iter_get_next(iter));
int s;
assert(writer);
- s = writer->impl.store_metric_attr(cname, metric,
- key, value, last_update, writer->w_user_data);
+ s = writer->impl.store_attribute(&attr, writer->w_user_data);
if (((s > 0) && (status >= 0)) || (s < 0))
status = s;
}