![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
diff --git a/src/core/plugin.c b/src/core/plugin.c
index 99f07cb03e2a10914f56fab553a4e56aad54eed6..5df7059e9c6412b1c49bfc49813563a534f7d031 100644 (file)
--- a/src/core/plugin.c
+++ b/src/core/plugin.c
#include "core/plugin.h"
#include "utils/error.h"
#include "utils/llist.h"
-#include "utils/string.h"
#include "utils/time.h"
#include <assert.h>
if (sdb_plugin_find_by_name(*list, name)) {
sdb_log(SDB_LOG_WARNING, "plugin: %s callback '%s' "
"has already been registered. Ignoring newly "
- "registered version.\n", type, name);
+ "registered version.", type, name);
return -1;
}
/* pass control to the list */
sdb_object_deref(obj);
- sdb_log(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_log(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_log(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_log(SDB_LOG_ERR, "plugin: Failed to load plugin '%s': "
- "could not find symbol 'sdb_module_init'\n", name);
+ "could not find symbol 'sdb_module_init'", name);
return -1;
}
status = mod_init(&plugin_info);
if (status) {
sdb_log(SDB_LOG_ERR, "plugin: Failed to initialize "
- "plugin '%s'\n", name);
+ "plugin '%s'", name);
return -1;
}
|| ((int)(plugin_info.version / 100) != (int)(SDB_VERSION / 100)))
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_log(SDB_LOG_INFO, "plugin: Successfully loaded "
- "plugin '%s' v%i (%s)\n\t%s\n",
+ "plugin '%s' v%i (%s)\n\t%s",
plugin_info.name, plugin_info.plugin_version,
plugin_info.description, plugin_info.copyright);
return 0;
@@ -439,7 +455,7 @@ 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_log(SDB_LOG_ERR, "plugin: Failed to determine current "
- "time: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ "time: %s", sdb_strerror(errno, errbuf, sizeof(errbuf)));
sdb_object_deref(obj);
return -1;
}
@@ -454,7 +470,7 @@ sdb_plugin_register_collector(const char *name, sdb_plugin_collector_cb callback
sdb_object_deref(obj);
sdb_log(SDB_LOG_INFO, "plugin: Registered collector callback '%s' "
- "(interval = %.3fs).\n", name,
+ "(interval = %.3fs).", name,
SDB_TIME_TO_DOUBLE(SDB_PLUGIN_CCB(obj)->ccb_interval));
return 0;
} /* sdb_plugin_register_collector */
if (! plugin) {
/* XXX: check if any such plugin has been loaded */
sdb_log(SDB_LOG_ERR, "plugin: Plugin '%s' did not register "
- "a config callback.\n", name);
+ "a config callback.", name);
errno = ENOENT;
return -1;
}
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_log(SDB_LOG_ERR, "plugin: Failed to determine current "
- "time: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ "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_log(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) {
sdb_log(SDB_LOG_WARNING, "plugin: No interval configured "
"for plugin '%s'; skipping any further "
- "iterations.\n", SDB_PLUGIN_CCB(obj)->ccb_name);
+ "iterations.", SDB_PLUGIN_CCB(obj)->ccb_name);
sdb_object_deref(obj);
continue;
}
if (! (now = sdb_gettime())) {
char errbuf[1024];
sdb_log(SDB_LOG_ERR, "plugin: Failed to determine current "
- "time: %s\n", sdb_strerror(errno, errbuf, sizeof(errbuf)));
+ "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_log(SDB_LOG_WARNING, "plugin: Plugin '%s' took too "
- "long; skipping iterations to keep up.\n",
+ "long; skipping iterations to keep up.",
SDB_PLUGIN_CCB(obj)->ccb_name);
SDB_PLUGIN_CCB(obj)->ccb_next_update = now;
}
sdb_plugin_cmp_next_update)) {
sdb_log(SDB_LOG_ERR, "plugin: Failed to re-insert "
"plugin '%s' into collector list. Unable to further "
- "use the plugin.\n",
+ "use the plugin.",
SDB_PLUGIN_CCB(obj)->ccb_name);
sdb_object_deref(obj);
return -1;