X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=ltt%2Fbranches%2Fpoly%2Flttv%2Fmodule.c;h=f73e6e935c367e796edb293886ecbf3bc6b3426a;hb=b445142a71748192520cfd645b4963e23070a486;hp=a77aa736f5f372bb1557c0622ba480b6abf6b90a;hpb=b9f095dbe5986f50ca4665d976735bbb8c639c12;p=lttv.git

diff --git a/ltt/branches/poly/lttv/module.c b/ltt/branches/poly/lttv/module.c
index a77aa736..f73e6e93 100644
--- a/ltt/branches/poly/lttv/module.c
+++ b/ltt/branches/poly/lttv/module.c
@@ -5,6 +5,8 @@
 
 #include <lttv/module.h>
 
+#define g_info(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_INFO, format)
+#define g_debug(format...) g_log (G_LOG_DOMAIN, G_LOG_LEVEL_DEBUG, format)
 
 struct _LttvModule
 {
@@ -26,6 +28,7 @@ static void lttv_module_unload_all();
 
 void lttv_module_init(int argc, char **argv) 
 {
+  g_info("Init module.c");
   modules = g_hash_table_new(g_str_hash, g_str_equal);
   modulesPaths = g_ptr_array_new();
 }
@@ -35,6 +38,8 @@ void lttv_module_destroy()
 {  
   int i;
 
+  g_info("Destroy module.c");
+
   /* Unload all modules */
   lttv_module_unload_all();
 
@@ -55,6 +60,7 @@ void lttv_module_destroy()
 
 void lttv_module_path_add(const char *name) 
 {
+  g_info("Add module path %s", name);
   g_ptr_array_add(modulesPaths,(char*)g_strdup(name));
 }
 
@@ -74,29 +80,35 @@ module_load(const char *name, int argc, char **argv)
   
   LttvModuleInit init_function;
 
+  g_info("Load module %s", name);
+
   /* Try to find the module along all the user specified paths */
 
   for(i = 0 ; i < modulesPaths->len ; i++) {
     pathname = g_module_build_path(modulesPaths->pdata[i],name);
-    gm = g_module_open(pathname,G_MODULE_BIND_LAZY);
-	g_critical("loading module : %s", pathname);
-	g_critical("module error : %s", g_module_error());
+    g_info("Try path %s", pathname);
+    gm = g_module_open(pathname,0);
     g_free(pathname);    
     
     if(gm != NULL) break;
+    g_info("Trial failed, %s", g_module_error());
   }
 
   /* Try the default system path */
 
   if(gm == NULL) {
     pathname = g_module_build_path(NULL,name);
-    gm = g_module_open(pathname,G_MODULE_BIND_LAZY);
-	g_critical("loading module : %s", pathname);
+    g_info("Try default path");
+    gm = g_module_open(pathname,0);
     g_free(pathname);
   }
 
   /* Module cannot be found */
-  if(gm == NULL) return NULL;
+  if(gm == NULL) {
+    g_info("Trial failed, %s", g_module_error());
+    g_info("Failed to load %s", name); 
+    return NULL;
+  }
 
   /* Check if the module was already opened using the hopefully canonical name
      returned by g_module_name. */
@@ -106,6 +118,7 @@ module_load(const char *name, int argc, char **argv)
   m = g_hash_table_lookup(modules, module_name);
 
   if(m == NULL) {
+    g_info("Module %s (%s) loaded, call its init function", name, module_name);
 
     /* Module loaded for the first time. Insert it in the table and call the
        init function if any. */
@@ -127,6 +140,8 @@ module_load(const char *name, int argc, char **argv)
     /* Module was already opened, check that it really is the same and
        undo the extra g_module_open */
 
+    g_info("Module %s (%s) was already loaded, no need to call init function",
+	   name, module_name);
     if(m->module != gm) g_error("Two gmodules with the same pathname");
     g_module_close(gm);
   }
@@ -139,6 +154,7 @@ module_load(const char *name, int argc, char **argv)
 LttvModule *
 lttv_module_load(const char *name, int argc, char **argv) 
 {
+  g_info("Load module %s explicitly", name);
   LttvModule *m = module_load(name, argc, argv);
   if(m != NULL) m->load_count++;
   return m;
@@ -150,6 +166,8 @@ lttv_module_require(LttvModule *m, const char *name, int argc, char **argv)
 {
   LttvModule *module;
 
+  g_info("Load module %s, as %s is a dependent requiring it", name, 
+      g_module_name(m->module));
   module = module_load(name, argc, argv);
   if(module != NULL) g_ptr_array_add(m->dependents, module);
   return module;
@@ -166,12 +184,16 @@ static void module_unload(LttvModule *m)
 
   /* Decrement the reference count */
 
+  g_info("Unload module %s", g_module_name(m->module));
   m->ref_count--;
-  if(m->ref_count > 0) return;
-
+  if(m->ref_count > 0) {
+    g_info("Module usage count decremented to %d", m->ref_count);
+    return;
+  }
   /* We really have to unload the module, first unload its dependents */
 
   len = m->dependents->len;
+  g_info("Unload dependent modules");
 
   for(i = 0 ; i < len ; i++) {
     module_unload(m->dependents->pdata[i]);
@@ -181,6 +203,7 @@ static void module_unload(LttvModule *m)
 
   /* Unload the module itself */
 
+  g_info("Call the destroy function and unload the module");
   if(!g_module_symbol(m->module, "destroy", (gpointer)&destroy_function)) {
     g_warning("module (%s) has no destroy function", pathname);
   }
@@ -195,6 +218,7 @@ static void module_unload(LttvModule *m)
 
 void lttv_module_unload(LttvModule *m) 
 {
+  g_info("Explicitly unload module %s", g_module_name(m->module));
   if(m->load_count <= 0) { 
     g_error("more unload than load (%s)", g_module_name(m->module));
     return;