X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodule.c;h=a77aa736f5f372bb1557c0622ba480b6abf6b90a;hb=96cfe486b3d3bb3e42f7738cd0764a0838e00cba;hp=0f6f5a0727a0d35e8fddb7cc23a24a2db8b25fcb;hpb=ffd54a901f0062e31ffb35a316de9d8b17104abb;p=lttv.git diff --git a/ltt/branches/poly/lttv/module.c b/ltt/branches/poly/lttv/module.c index 0f6f5a07..a77aa736 100644 --- a/ltt/branches/poly/lttv/module.c +++ b/ltt/branches/poly/lttv/module.c @@ -78,7 +78,9 @@ module_load(const char *name, int argc, char **argv) for(i = 0 ; i < modulesPaths->len ; i++) { pathname = g_module_build_path(modulesPaths->pdata[i],name); - gm = g_module_open(pathname,0); + gm = g_module_open(pathname,G_MODULE_BIND_LAZY); + g_critical("loading module : %s", pathname); + g_critical("module error : %s", g_module_error()); g_free(pathname); if(gm != NULL) break; @@ -88,12 +90,12 @@ module_load(const char *name, int argc, char **argv) if(gm == NULL) { pathname = g_module_build_path(NULL,name); - gm = g_module_open(pathname,0); + gm = g_module_open(pathname,G_MODULE_BIND_LAZY); + g_critical("loading module : %s", pathname); g_free(pathname); } /* Module cannot be found */ - if(gm == NULL) return NULL; /* Check if the module was already opened using the hopefully canonical name @@ -118,7 +120,7 @@ module_load(const char *name, int argc, char **argv) if(!g_module_symbol(gm, "init", (gpointer)&init_function)) { g_warning("module %s (%s) has no init function", name, pathname); } - else init_Function(m, argc, argv); + else init_function(m, argc, argv); } else { @@ -138,7 +140,6 @@ LttvModule * lttv_module_load(const char *name, int argc, char **argv) { LttvModule *m = module_load(name, argc, argv); - if(m != NULL) m->load_count++; return m; }