![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/plugin.c b/src/core/plugin.c
index 7f5883aa20cefa0a4e1e07afb8b89a3afe54a598..0a69bff2364a50e2b7566e4f4d0c4aaa6ec5b74c 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
#include "sysdb.h"
#include "core/plugin.h"
-#include "utils/error.h"
+#include "core/error.h"
+#include "core/time.h"
#include "utils/llist.h"
-#include "utils/string.h"
-#include "utils/time.h"
#include <assert.h>
typedef struct {
sdb_object_t super;
- char cb_name[64];
void *cb_callback;
sdb_object_t *cb_user_data;
sdb_plugin_ctx_t cb_ctx;
} sdb_plugin_cb_t;
-#define SDB_PLUGIN_CB_INIT { SDB_OBJECT_INIT, /* name = */ "", \
+#define SDB_PLUGIN_CB_INIT { SDB_OBJECT_INIT, \
/* callback = */ NULL, /* user_data = */ NULL, \
SDB_PLUGIN_CTX_INIT }
typedef struct {
sdb_plugin_cb_t super;
-#define ccb_name super.cb_name
#define ccb_callback super.cb_callback
#define ccb_user_data super.cb_user_data
#define ccb_ctx super.cb_ctx
static sdb_llist_t *init_list = NULL;
static sdb_llist_t *collector_list = NULL;
static sdb_llist_t *shutdown_list = NULL;
+static sdb_llist_t *log_list = NULL;
/*
* private helper functions
return ctx;
} /* sdb_plugin_ctx_create */
-static int
-sdb_plugin_cmp_name(const sdb_object_t *a, const sdb_object_t *b)
-{
- const sdb_plugin_cb_t *cb1 = (const sdb_plugin_cb_t *)a;
- const sdb_plugin_cb_t *cb2 = (const sdb_plugin_cb_t *)b;
-
- assert(cb1 && cb2);
- return strcasecmp(cb1->cb_name, cb2->cb_name);
-} /* sdb_plugin_cmp_name */
-
static int
sdb_plugin_cmp_next_update(const sdb_object_t *a, const sdb_object_t *b)
{
? -1 : 0;
} /* sdb_plugin_cmp_next_update */
-static sdb_plugin_cb_t *
-sdb_plugin_find_by_name(sdb_llist_t *list, const char *name)
-{
- sdb_plugin_cb_t tmp = SDB_PLUGIN_CB_INIT;
-
- sdb_object_t *obj;
- assert(name);
-
- if (! list)
- return NULL;
-
- snprintf(tmp.cb_name, sizeof(tmp.cb_name), "%s", name);
- tmp.cb_name[sizeof(tmp.cb_name) - 1] = '\0';
- obj = sdb_llist_search(list, SDB_OBJ(&tmp), sdb_plugin_cmp_name);
- if (! obj)
- return NULL;
- return SDB_PLUGIN_CB(obj);
-} /* sdb_plugin_find_by_name */
+/*
+ * private types
+ */
static int
sdb_plugin_cb_init(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 *);
- const char *name = va_arg(ap, const char *);
- void *callback = va_arg(ap, void *);
+ const char *type = va_arg(ap, const char *);
+ void *callback = va_arg(ap, void *);
sdb_object_t *ud = va_arg(ap, sdb_object_t *);
assert(list);
assert(type);
assert(obj);
- if (sdb_plugin_find_by_name(*list, name)) {
- sdb_error_set(SDB_LOG_WARNING, "plugin: %s callback '%s' "
+ if (sdb_llist_search_by_name(*list, obj->name)) {
+ sdb_log(SDB_LOG_WARNING, "plugin: %s callback '%s' "
"has already been registered. Ignoring newly "
- "registered version.\n", type, name);
+ "registered version.", type, obj->name);
return -1;
}
- snprintf(SDB_PLUGIN_CB(obj)->cb_name,
- sizeof(SDB_PLUGIN_CB(obj)->cb_name),
- "%s", name);
- SDB_PLUGIN_CB(obj)->cb_name[sizeof(SDB_PLUGIN_CB(obj)->cb_name) - 1] = '\0';
SDB_PLUGIN_CB(obj)->cb_callback = callback;
SDB_PLUGIN_CB(obj)->cb_ctx = sdb_plugin_get_ctx();
sdb_object_deref(SDB_PLUGIN_CB(obj)->cb_user_data);
} /* sdb_plugin_cb_destroy */
+static sdb_type_t sdb_plugin_cb_type = {
+ sizeof(sdb_plugin_cb_t),
+
+ sdb_plugin_cb_init,
+ sdb_plugin_cb_destroy,
+ /* clone = */ NULL
+};
+
+static sdb_type_t sdb_plugin_collector_cb_type = {
+ sizeof(sdb_plugin_collector_cb_t),
+
+ sdb_plugin_cb_init,
+ sdb_plugin_cb_destroy,
+ /* clone = */ NULL
+};
+
static int
sdb_plugin_add_callback(sdb_llist_t **list, const char *type,
const char *name, void *callback, sdb_object_t *user_data)
if (! *list)
return -1;
- obj = sdb_object_create(sizeof(sdb_plugin_cb_t), sdb_plugin_cb_init,
- sdb_plugin_cb_destroy, list, type, name, callback, user_data);
+ obj = sdb_object_create(name, sdb_plugin_cb_type,
+ list, type, callback, user_data);
if (! obj)
return -1;
/* pass control to the list */
sdb_object_deref(obj);
- sdb_error_set(SDB_LOG_INFO, "plugin: Registered %s callback '%s'.\n",
+ sdb_log(SDB_LOG_INFO, "plugin: Registered %s callback '%s'.",
type, name);
return 0;
} /* sdb_plugin_add_callback */
int
sdb_plugin_load(const char *name)
{
+ char real_name[strlen(name) > 0 ? strlen(name) : 1];
+ const char *name_ptr;
+ char *tmp;
+
char filename[1024];
lt_dlhandle lh;
int status;
+ if ((! name) || (! *name))
+ return -1;
+
+ real_name[0] = '\0';
+ name_ptr = name;
+
+ while ((tmp = strstr(name_ptr, "::"))) {
+ strncat(real_name, name_ptr, (size_t)(tmp - name_ptr));
+ strcat(real_name, "/");
+ name_ptr = tmp + strlen("::");
+ }
+ strcat(real_name, name_ptr);
+
snprintf(filename, sizeof(filename), "%s/%s.so",
- PKGLIBDIR, name);
+ PKGLIBDIR, real_name);
filename[sizeof(filename) - 1] = '\0';
if (access(filename, R_OK)) {
char errbuf[1024];
- sdb_error_set(SDB_LOG_ERR, "plugin: Failed to load plugin '%s': %s\n",
- name, sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ sdb_log(SDB_LOG_ERR, "plugin: Failed to load plugin '%s' (%s): %s",
+ name, filename, sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
lh = lt_dlopen(filename);
if (! lh) {
- sdb_error_set(SDB_LOG_ERR, "plugin: Failed to load plugin '%s': %s\n"
+ sdb_log(SDB_LOG_ERR, "plugin: Failed to load plugin '%s': %s"
"The most common cause for this problem are missing "
"dependencies.\n", name, lt_dlerror());
return -1;
mod_init = (int (*)(sdb_plugin_info_t *))lt_dlsym(lh, "sdb_module_init");
if (! mod_init) {
- sdb_error_set(SDB_LOG_ERR, "plugin: Failed to load plugin '%s': "
- "could not find symbol 'sdb_module_init'\n", name);
+ sdb_log(SDB_LOG_ERR, "plugin: Failed to load plugin '%s': "
+ "could not find symbol 'sdb_module_init'", name);
return -1;
}
status = mod_init(&plugin_info);
if (status) {
- sdb_error_set(SDB_LOG_ERR, "plugin: Failed to initialize "
- "plugin '%s'\n", name);
+ sdb_log(SDB_LOG_ERR, "plugin: Failed to initialize "
+ "plugin '%s'", name);
return -1;
}
/* compare minor version */
if ((plugin_info.version < 0)
|| ((int)(plugin_info.version / 100) != (int)(SDB_VERSION / 100)))
- sdb_error_set(SDB_LOG_WARNING, "plugin: WARNING: version of "
+ sdb_log(SDB_LOG_WARNING, "plugin: WARNING: version of "
"plugin '%s' (%i.%i.%i) does not match our version "
- "(%i.%i.%i); this might cause problems\n",
+ "(%i.%i.%i); this might cause problems",
name, SDB_VERSION_DECODE(plugin_info.version),
SDB_VERSION_DECODE(SDB_VERSION));
- sdb_error_set(SDB_LOG_INFO, "plugin: Successfully loaded "
- "plugin '%s' v%i (%s)\n\t%s\n",
+ sdb_log(SDB_LOG_INFO, "plugin: Successfully loaded "
+ "plugin '%s' v%i (%s)\n\t%s",
plugin_info.name, plugin_info.plugin_version,
plugin_info.description, plugin_info.copyright);
return 0;
@@ -405,6 +406,14 @@ sdb_plugin_register_shutdown(const char *name, sdb_plugin_shutdown_cb callback,
callback, user_data);
} /* sdb_plugin_register_shutdown */
+int
+sdb_plugin_register_log(const char *name, sdb_plugin_log_cb callback,
+ sdb_object_t *user_data)
+{
+ return sdb_plugin_add_callback(&log_list, "log", name, callback,
+ user_data);
+} /* sdb_plugin_register_log */
+
int
sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback,
const sdb_time_t *interval, sdb_object_t *user_data)
@@ -419,9 +428,8 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
if (! collector_list)
return -1;
- obj = sdb_object_create(sizeof(sdb_plugin_collector_cb_t),
- sdb_plugin_cb_init, sdb_plugin_cb_destroy,
- &collector_list, "collector", name, callback, user_data);
+ obj = sdb_object_create(name, sdb_plugin_collector_cb_type,
+ &collector_list, "collector", callback, user_data);
if (! obj)
return -1;
@@ -438,8 +446,8 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
if (! (SDB_PLUGIN_CCB(obj)->ccb_next_update = sdb_gettime())) {
char errbuf[1024];
- sdb_error_set(SDB_LOG_ERR, "plugin: Failed to determine current "
- "time: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ sdb_log(SDB_LOG_ERR, "plugin: Failed to determine current "
+ "time: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
sdb_object_deref(obj);
return -1;
}
@@ -453,8 +461,8 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
/* pass control to the list */
sdb_object_deref(obj);
- sdb_error_set(SDB_LOG_INFO, "plugin: Registered collector callback '%s' "
- "(interval = %.3fs).\n", name,
+ sdb_log(SDB_LOG_INFO, "plugin: Registered collector callback '%s' "
+ "(interval = %.3fs).", name,
SDB_TIME_TO_DOUBLE(SDB_PLUGIN_CCB(obj)->ccb_interval));
return 0;
} /* sdb_plugin_register_collector */
if ((! name) || (! ci))
return -1;
- plugin = sdb_plugin_find_by_name(config_list, name);
+ plugin = SDB_PLUGIN_CB(sdb_llist_search_by_name(config_list, name));
if (! plugin) {
/* XXX: check if any such plugin has been loaded */
- sdb_error_set(SDB_LOG_ERR, "plugin: Plugin '%s' did not register "
- "a config callback.\n", name);
+ sdb_log(SDB_LOG_ERR, "plugin: Plugin '%s' did not register "
+ "a config callback.", name);
errno = ENOENT;
return -1;
}
}
sdb_plugin_set_ctx(old_ctx);
}
+ sdb_llist_iter_destroy(iter);
return 0;
} /* sdb_plugin_init_all */
int
sdb_plugin_collector_loop(sdb_plugin_loop_t *loop)
{
- if ((! collector_list) || (! loop))
+ if (! collector_list) {
+ sdb_log(SDB_LOG_WARNING, "plugin: No collectors registered. "
+ "Quiting main loop.");
+ return -1;
+ }
+
+ if (! loop)
return -1;
while (loop->do_loop) {
if (! (now = sdb_gettime())) {
char errbuf[1024];
- sdb_error_set(SDB_LOG_ERR, "plugin: Failed to determine current "
- "time: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ sdb_log(SDB_LOG_ERR, "plugin: Failed to determine current "
+ "time: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
now = SDB_PLUGIN_CCB(obj)->ccb_next_update;
}
while (loop->do_loop && sdb_sleep(interval, &interval)) {
if (errno != EINTR) {
char errbuf[1024];
- sdb_error_set(SDB_LOG_ERR, "plugin: Failed to sleep: %s\n",
+ sdb_log(SDB_LOG_ERR, "plugin: Failed to sleep: %s",
sdb_strerror(errno, errbuf, sizeof(errbuf)));
return -1;
}
if (! interval)
interval = loop->default_interval;
if (! interval) {
- sdb_error_set(SDB_LOG_WARNING, "plugin: No interval configured "
+ sdb_log(SDB_LOG_WARNING, "plugin: No interval configured "
"for plugin '%s'; skipping any further "
- "iterations.\n", SDB_PLUGIN_CCB(obj)->ccb_name);
+ "iterations.", obj->name);
sdb_object_deref(obj);
continue;
}
if (! (now = sdb_gettime())) {
char errbuf[1024];
- sdb_error_set(SDB_LOG_ERR, "plugin: Failed to determine current "
- "time: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ sdb_log(SDB_LOG_ERR, "plugin: Failed to determine current "
+ "time: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
now = SDB_PLUGIN_CCB(obj)->ccb_next_update;
}
if (now > SDB_PLUGIN_CCB(obj)->ccb_next_update) {
- sdb_error_set(SDB_LOG_WARNING, "plugin: Plugin '%s' took too "
- "long; skipping iterations to keep up.\n",
- SDB_PLUGIN_CCB(obj)->ccb_name);
+ sdb_log(SDB_LOG_WARNING, "plugin: Plugin '%s' took too "
+ "long; skipping iterations to keep up.",
+ obj->name);
SDB_PLUGIN_CCB(obj)->ccb_next_update = now;
}
if (sdb_llist_insert_sorted(collector_list, obj,
sdb_plugin_cmp_next_update)) {
- sdb_error_set(SDB_LOG_ERR, "plugin: Failed to re-insert "
+ sdb_log(SDB_LOG_ERR, "plugin: Failed to re-insert "
"plugin '%s' into collector list. Unable to further "
- "use the plugin.\n",
- SDB_PLUGIN_CCB(obj)->ccb_name);
+ "use the plugin.",
+ obj->name);
sdb_object_deref(obj);
return -1;
}
return 0;
} /* sdb_plugin_read_loop */
+int
+sdb_plugin_log(int prio, const char *msg)
+{
+ sdb_llist_iter_t *iter;
+ int ret = -1;
+
+ if (! log_list)
+ return fprintf(stderr, "[%s] %s\n", SDB_LOG_PRIO_TO_STRING(prio), msg);
+
+ iter = sdb_llist_get_iter(log_list);
+ while (sdb_llist_iter_has_next(iter)) {
+ sdb_plugin_log_cb callback;
+ int tmp;
+
+ sdb_object_t *obj = sdb_llist_iter_get_next(iter);
+ assert(obj);
+
+ callback = SDB_PLUGIN_CB(obj)->cb_callback;
+ tmp = callback(prio, msg, SDB_PLUGIN_CB(obj)->cb_user_data);
+ if (tmp > ret)
+ ret = tmp;
+ }
+ sdb_llist_iter_destroy(iter);
+ return ret;
+} /* sdb_plugin_log */
+
/* vim: set tw=78 sw=4 ts=4 noexpandtab : */