rank = xbt_dynar_length(group);
xbt_dynar_push(group, &dude);
- VERB3("Contacted by %s:%d. Give it rank #%d", dude->name, dude->port,
+ XBT_VERB("Contacted by %s:%d. Give it rank #%d", dude->name, dude->port,
rank);
gras_msg_rpcreturn(10, ctx, &rank);
goto end;
}
}
- WARN3("Asked to remove %s:%d from group '%s', but not found. Ignoring",
+ XBT_WARN("Asked to remove %s:%d from group '%s', but not found. Ignoring",
dude->name, dude->port, name);
end:
xbt_dynar_t res = xbt_dynar_new(sizeof(xbt_peer_t),
xbt_peer_free_voidp);
- xbt_assert0(amok_pm_moddata_id != -1, "Run amok_pm_init first!");
+ xbt_assert(amok_pm_moddata_id != -1, "Run amok_pm_init first!");
g = gras_moddata_by_id(amok_pm_moddata_id);
- DEBUG1("retrieved groups=%p", g->groups);
+ XBT_DEBUG("retrieved groups=%p", g->groups);
xbt_dict_set(g->groups, group_name, res, NULL); /*FIXME: leaking xbt_dynar_free_voidp); */
- VERB1("Group %s created", group_name);
+ XBT_VERB("Group %s created", group_name);
return res;
}
int amok_pm_group_join(gras_socket_t master, const char *group_name)
{
int rank;
- VERB3("Join group '%s' on %s:%d",
+ XBT_VERB("Join group '%s' on %s:%d",
group_name, gras_socket_peer_name(master),
gras_socket_peer_port(master));
gras_msg_rpccall(master, 30, "amok_pm_join", &group_name, &rank);
- VERB4("Joined group '%s' on %s:%d. Got rank %d",
+ XBT_VERB("Joined group '%s' on %s:%d. Got rank %d",
group_name, gras_socket_peer_name(master),
gras_socket_peer_port(master), rank);
return rank;
void amok_pm_group_leave(gras_socket_t master, const char *group_name)
{
gras_msg_rpccall(master, 30, "amok_pm_leave", &group_name, NULL);
- VERB3("Leaved group '%s' on %s:%d",
+ XBT_VERB("Leaved group '%s' on %s:%d",
group_name, gras_socket_peer_name(master),
gras_socket_peer_port(master));
}
mod->groups = NULL;
mod->done = 0;
- mod->groups = xbt_dict_new();
+ mod->groups = xbt_dict_new_homogeneous(NULL);
/* callbacks */
gras_cb_register("amok_pm_kill", &amok_pm_cb_kill);
/* moddata */
amok_pm_moddata_t mod = (amok_pm_moddata_t) p;
- if (mod->groups)
- xbt_dict_free(&mod->groups);
+ xbt_dict_free(&mod->groups);
/* callbacks */
gras_cb_unregister("amok_pm_kill", &amok_pm_cb_kill);