merge conflicts

[simgrid.git] / src / gras / Virtu / gras_module.c

diff --git a/src/gras/Virtu/gras_module.c b/src/gras/Virtu/gras_module.c
index 7f8037e..cd48084 100644 (file)
--- a/src/gras/Virtu/gras_module.c
+++ b/src/gras/Virtu/gras_module.c
@@ -130,24 +130,25 @@ void gras_module_add(const char *name, unsigned int datasize, int *ID,
   }
 
   if (found) {
-    xbt_assert1(mod->init_f == init_f,
+    xbt_assert(mod->init_f == init_f,
                 "Module %s reregistered with a different init_f!", name);
-    xbt_assert1(mod->exit_f == exit_f,
+    xbt_assert(mod->exit_f == exit_f,
                 "Module %s reregistered with a different exit_f!", name);
-    xbt_assert1(mod->join_f == join_f,
+    xbt_assert(mod->join_f == join_f,
                 "Module %s reregistered with a different join_f!", name);
-    xbt_assert1(mod->leave_f == leave_f,
+    xbt_assert(mod->leave_f == leave_f,
                 "Module %s reregistered with a different leave_f!", name);
-    xbt_assert1(mod->datasize == datasize,
+    xbt_assert(mod->datasize == datasize,
                 "Module %s reregistered with a different datasize!", name);
-    xbt_assert1(mod->p_id == ID,
-                "Module %s reregistered with a different p_id field!", name);
+    xbt_assert(mod->p_id == ID,
+                "Module %s reregistered with a different p_id field!",
+                name);
 
-    DEBUG1("Module %s already registered. Ignoring re-registration", name);
+    XBT_DEBUG("Module %s already registered. Ignoring re-registration", name);
     return;
   }
 
-  VERB1("Register module %s", name);
+  XBT_VERB("Register module %s", name);
   mod = xbt_new(s_gras_module_t, 1);
   mod->name = xbt_strdup(name);
   mod->name_len = strlen(name);
@@ -186,7 +187,7 @@ static void moddata_freep(void *p)
   int id = xbt_dynar_search(pd->moddata, p);
   gras_module_t mod = (gras_module_t) xbt_set_get_by_id(_gras_modules, id);
 
-  (*mod->leave_f) (gras_moddata_by_id(id));
+  mod->leave_f(gras_moddata_by_id(id));
 }
 
 void gras_module_join(const char *name)
@@ -194,18 +195,18 @@ void gras_module_join(const char *name)
   gras_procdata_t *pd;
   void *moddata;
   gras_module_t mod =
-    (gras_module_t) xbt_set_get_by_name(_gras_modules, name);
+      (gras_module_t) xbt_set_get_by_name(_gras_modules, name);
 
-  VERB2("Join to module %s (%p)", name, mod);
+  XBT_VERB("Join to module %s (%p)", name, mod);
 
   /* NEW */
   if (mod->refcount == 0) {
-    VERB1("Init module %s", name);
+    XBT_VERB("Init module %s", name);
     mod->name = xbt_strdup(name);
 
-    (*mod->init_f) ();
+    mod->init_f();
   } else {
-    DEBUG3("Module %s already inited. Refcount=%d ID=%d",
+    XBT_DEBUG("Module %s already inited. Refcount=%d ID=%d",
            mod->name, mod->refcount, *(mod->p_id));
   }
   mod->refcount++;
@@ -220,29 +221,29 @@ void gras_module_join(const char *name)
 
   xbt_dynar_set(pd->moddata, *(mod->p_id), &moddata);
 
-  (*mod->join_f) (moddata);
+  mod->join_f(moddata);
 
-  DEBUG2("Module %s joined successfully (ID=%d)", name, *(mod->p_id));
+  XBT_DEBUG("Module %s joined successfully (ID=%d)", name, *(mod->p_id));
 }
 
 void gras_module_leave(const char *name)
 {
   void *moddata;
   gras_module_t mod =
-    (gras_module_t) xbt_set_get_by_name(_gras_modules, name);
+      (gras_module_t) xbt_set_get_by_name(_gras_modules, name);
 
-  VERB1("Leave module %s", name);
+  XBT_VERB("Leave module %s", name);
 
   /* LEAVE */
   moddata = gras_moddata_by_id(*(mod->p_id));
-  (*mod->leave_f) (moddata);
+  mod->leave_f(moddata);
 
   /* EXIT */
   mod->refcount--;
   if (!mod->refcount) {
-    VERB1("Exit module %s", name);
+    XBT_VERB("Exit module %s", name);
 
-    (*mod->exit_f) ();
+    mod->exit_f();
 
     /* Don't remove the module for real, sets don't allow to