external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-04-23 20:35:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

plugin: include plugin type in log messages

Browse source
This commit is contained in:
Daniel Eklöf 2019-01-12 22:47:36 +01:00
parent 0fa7906e99
commit 72edcf608c
1 changed files with 16 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
plugin.c
View file

@ -21,6 +21,17 @@ struct plugin {
static tll(struct plugin) plugins = tll_init(); static tll(struct plugin) plugins = tll_init();
static const char *
type2str(enum plugin_type type)
{
switch (type) {
case PLUGIN_MODULE: return "module";
case PLUGIN_PARTICLE: return "particle";
}
return NULL;
}
static void static void
free_plugin(struct plugin plug) free_plugin(struct plugin plug)
{ {
@ -29,7 +40,7 @@ free_plugin(struct plugin plug)
const char *dl_error = dlerror(); const char *dl_error = dlerror();
if (dl_error != NULL) if (dl_error != NULL)
LOG_ERR("%s: dlclose(): %s", plug.name, dl_error); LOG_ERR("%s: %s: dlclose(): %s", type2str(plug.type), plug.name, dl_error);
free(plug.name); free(plug.name);
} }
@ -46,7 +57,7 @@ _load_plugin(const char *name, enum plugin_type type)
/* Have we already loaded it? */ /* Have we already loaded it? */
tll_foreach(plugins, plug) { tll_foreach(plugins, plug) {
if (plug->item.type == type && strcmp(plug->item.name, name) == 0) { if (plug->item.type == type && strcmp(plug->item.name, name) == 0) {
LOG_DBG("%s already loaded: %p", name, plug->item.lib); LOG_DBG("%s: %s already loaded: %p", type2str(type), name, plug->item.lib);
assert(plug->item.sym != NULL); assert(plug->item.sym != NULL);
return plug->item.sym; return plug->item.sym;
} }
@ -57,10 +68,10 @@ _load_plugin(const char *name, enum plugin_type type)
/* Not loaded - do it now */ /* Not loaded - do it now */
void *lib = dlopen(path, RTLD_LOCAL | RTLD_NOW); void *lib = dlopen(path, RTLD_LOCAL | RTLD_NOW);
LOG_DBG("%s: dlopened to %p", name, lib); LOG_DBG("%s: %s: dlopened to %p", type2str(type), name, lib);
if (lib == NULL) { if (lib == NULL) {
LOG_ERR("%s: dlopen: %s", name, dlerror()); LOG_ERR("%s: %s: dlopen: %s", type2str(type), name, dlerror());
return NULL; return NULL;
} }
@ -73,7 +84,7 @@ _load_plugin(const char *name, enum plugin_type type)
const char *dlsym_error = dlerror(); const char *dlsym_error = dlerror();
if (dlsym_error != NULL) { if (dlsym_error != NULL) {
LOG_ERR("%s: dlsym: %s", name, dlsym_error); LOG_ERR("%s: %s: dlsym: %s", type2str(type), name, dlsym_error);
return NULL; return NULL;
} }