IntenseFinance/gnucash
3
0
Fork 0
mirror of https://github.com/Gnucash/gnucash.git synced 2025-02-25 18:55:30 -06:00
Code Issues Packages Projects Releases Wiki Activity

Bug #564209: Improved debuggability for module loading

Browse Source 
gnucash-2.2.7 doesn't (IMHO) log enough (any?) information about failures to
load optional modules. It was a bit of work to debug a recent problem (#564033)
and I ended up tweaking gnc_module_load_common() a bit to coax the error
messages out. I slightly reorganized the code in this function to accomplish
two things:

1. Make the logic clearer to someone new to the code (i.e., me)
2. If an optional module is found, log any errors in loading it

I tried to maintain the original spirit of not squawking too much about unfound
optional modules while still generating messages about legitimate problems.

Patch by G. Paul Ziemba.
BP

git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@17818 57a11ea4-9604-0410-9ed3-97b8803252fd
This commit is contained in:
Christian Stimming 2009-01-14 19:59:46 +00:00
parent 3fe13a6733
commit 8cad2f514e
1 changed files with 52 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
src/gnc-module/gnc-module.c
View File

@ -454,6 +454,8 @@ gnc_module_load_common(char * module_name, gint iface, gboolean optional)
{ {
GNCLoadedModule * info; GNCLoadedModule * info;
GModule * gmodule;
GNCModuleInfo * modinfo;
if(!loaded_modules) if(!loaded_modules)
{ {
@ -487,65 +489,72 @@ gnc_module_load_common(char * module_name, gint iface, gboolean optional)
g_warning ("module has no init func: %s", module_name); g_warning ("module has no init func: %s", module_name);
return NULL; return NULL;
} }
/* NOTREACHED */
g_error("internal error");
return NULL;
} }
else
modinfo = gnc_module_locate(module_name, iface);
if (!modinfo)
{ {
GNCModuleInfo * modinfo = gnc_module_locate(module_name, iface); if (optional)
GModule * gmodule; {
g_message ("Could not locate optional module %s interface v.%d",
module_name, iface);
}
else
{
g_warning ("Could not locate module %s interface v.%d",
module_name, iface);
}
return NULL;
}
/* if (modinfo) */ /* if (modinfo) */
/* g_debug("(init) loading '%s' from '%s'\n", module_name, */ /* g_debug("(init) loading '%s' from '%s'\n", module_name, */
/* modinfo->module_filepath); */ /* modinfo->module_filepath); */
if (modinfo && if ((gmodule = g_module_open(modinfo->module_filepath, 0)) != NULL)
((gmodule = g_module_open(modinfo->module_filepath, 0)) {
!= NULL)) gpointer initfunc;
if (gnc_module_get_symbol(gmodule, "gnc_module_init", &initfunc))
{ {
gpointer initfunc; /* stick it in the hash table */
info = g_new0(GNCLoadedModule, 1);
info->gmodule = gmodule;
info->filename = g_strdup(modinfo->module_filepath);
info->load_count = 1;
info->init_func = initfunc;
g_hash_table_insert(loaded_modules, info, info);
if (gnc_module_get_symbol(gmodule, "gnc_module_init", &initfunc)) /* now call its init function. this should load any dependent
* modules, too. If it doesn't return TRUE unload the module. */
if (!info->init_func(0))
{ {
/* stick it in the hash table */ /* init failed. unload the module. */
info = g_new0(GNCLoadedModule, 1); g_warning ("Initialization failed for module %s\n", module_name);
info->gmodule = gmodule; g_hash_table_remove(loaded_modules, info);
info->filename = g_strdup(modinfo->module_filepath); g_free(info->filename);
info->load_count = 1; g_free(info);
info->init_func = initfunc; /* g_module_close(module); */
g_hash_table_insert(loaded_modules, info, info); return NULL;
/* now call its init function. this should load any dependent
* modules, too. If it doesn't return TRUE unload the module. */
if (!info->init_func(0))
{
/* init failed. unload the module. */
g_warning ("Initialization failed for module %s\n", module_name);
g_hash_table_remove(loaded_modules, info);
g_free(info->filename);
g_free(info);
/* g_module_close(module); */
return NULL;
}
return info;
}
else
{
g_warning ("Module %s (%s) is not a gnc-module.\n", module_name,
modinfo->module_filepath);
//lt_dlclose(handle);
} }
return info; return info;
} }
else if (!optional) else
{ {
g_warning ("Failed to open module %s", module_name); g_warning ("Module %s (%s) is not a gnc-module.\n", module_name,
if(modinfo) printf(": %s\n", g_module_error()); modinfo->module_filepath);
else g_warning (": could not locate %s interface v.%d\n", //lt_dlclose(handle);
module_name, iface);
return NULL;
} }
return NULL; return info;
} }
g_warning ("Failed to open module %s: %s\n", module_name, g_module_error());
return NULL;
} }