}
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,
+ xbt_assert(mod->p_id == ID,
"Module %s reregistered with a different p_id field!",
name);
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)
XBT_VERB("Init module %s", name);
mod->name = xbt_strdup(name);
- (*mod->init_f) ();
+ mod->init_f();
} else {
XBT_DEBUG("Module %s already inited. Refcount=%d ID=%d",
mod->name, mod->refcount, *(mod->p_id));
xbt_dynar_set(pd->moddata, *(mod->p_id), &moddata);
- (*mod->join_f) (moddata);
+ mod->join_f(moddata);
XBT_DEBUG("Module %s joined successfully (ID=%d)", name, *(mod->p_id));
}
/* LEAVE */
moddata = gras_moddata_by_id(*(mod->p_id));
- (*mod->leave_f) (moddata);
+ mod->leave_f(moddata);
/* EXIT */
mod->refcount--;
if (!mod->refcount) {
XBT_VERB("Exit module %s", name);
- (*mod->exit_f) ();
+ mod->exit_f();
/* Don't remove the module for real, sets don't allow to