xbt_dynar_t group = xbt_dict_get(g->groups, group_name);
int rank;
- gras_socket_t exp = gras_msg_cb_ctx_from(ctx);
- xbt_peer_t dude = xbt_peer_new(gras_socket_peer_name(exp),
- gras_socket_peer_port(exp));
+ xbt_socket_t exp = gras_msg_cb_ctx_from(ctx);
+ xbt_peer_t dude = xbt_peer_new(xbt_socket_peer_name(exp),
+ xbt_socket_peer_port(exp));
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);
char *name = *(void **) payload;
xbt_dynar_t group = xbt_dict_get(g->groups, name);
- gras_socket_t exp = gras_msg_cb_ctx_from(ctx);
- xbt_peer_t dude = xbt_peer_new(gras_socket_peer_name(exp),
- gras_socket_peer_port(exp));
+ xbt_socket_t exp = gras_msg_cb_ctx_from(ctx);
+ xbt_peer_t dude = xbt_peer_new(xbt_socket_peer_name(exp),
+ xbt_socket_peer_port(exp));
unsigned int cpt;
xbt_peer_t peer_it;
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:
/** \brief kill a buddy identified by its peername and port. Note that it is not removed from any group it may belong to. */
void amok_pm_kill_hp(char *name, int port)
{
- gras_socket_t sock = gras_socket_client(name, port);
+ xbt_socket_t sock = gras_socket_client(name, port);
amok_pm_kill(sock);
gras_socket_close(sock);
}
/** \brief kill a buddy to which we have a socket already. Note that it is not removed from any group it may belong to. */
-void amok_pm_kill(gras_socket_t buddy)
+void amok_pm_kill(xbt_socket_t buddy)
{
gras_msg_send(buddy, "amok_pm_kill", NULL);
}
/** \brief kill syncronously a buddy (do not return before its death). Note that it is not removed from any group it may belong to. */
-void amok_pm_kill_sync(gras_socket_t buddy)
+void amok_pm_kill_sync(xbt_socket_t buddy)
{
gras_msg_rpccall(buddy, 30, "amok_pm_killrpc", NULL, NULL);
}
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;
}
/** \brief retrieve all members of the given remote group */
-xbt_dynar_t amok_pm_group_get(gras_socket_t master, const char *group_name)
+xbt_dynar_t amok_pm_group_get(xbt_socket_t master, const char *group_name)
{
xbt_dynar_t res;
*
* Returns the rank of the process in the group.
*/
-int amok_pm_group_join(gras_socket_t master, const char *group_name)
+int amok_pm_group_join(xbt_socket_t master, const char *group_name)
{
int rank;
- VERB3("Join group '%s' on %s:%d",
- group_name, gras_socket_peer_name(master),
- gras_socket_peer_port(master));
+ XBT_VERB("Join group '%s' on %s:%d",
+ group_name, xbt_socket_peer_name(master),
+ xbt_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",
- group_name, gras_socket_peer_name(master),
- gras_socket_peer_port(master), rank);
+ XBT_VERB("Joined group '%s' on %s:%d. Got rank %d",
+ group_name, xbt_socket_peer_name(master),
+ xbt_socket_peer_port(master), rank);
return rank;
}
*
* If not found, call is ignored
*/
-void amok_pm_group_leave(gras_socket_t master, const char *group_name)
+void amok_pm_group_leave(xbt_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",
- group_name, gras_socket_peer_name(master),
- gras_socket_peer_port(master));
+ XBT_VERB("Leaved group '%s' on %s:%d",
+ group_name, xbt_socket_peer_name(master),
+ xbt_socket_peer_port(master));
}
/** \brief stops all members of the given local group */
}
/** \brief stops all members of the given remote group */
-void amok_pm_group_shutdown_remote(gras_socket_t master,
+void amok_pm_group_shutdown_remote(xbt_socket_t master,
const char *group_name)
{
gras_msg_rpccall(master, 30, "amok_pm_shutdown", &group_name, NULL);
{
/* no world-wide globals */
/* Datatype and message declarations */
- gras_datadesc_type_t pm_group_type =
- gras_datadesc_dynar(gras_datadesc_by_name("xbt_peer_t"),
+ xbt_datadesc_type_t pm_group_type =
+ xbt_datadesc_dynar(xbt_datadesc_by_name("xbt_peer_t"),
xbt_peer_free_voidp);
gras_msgtype_declare("amok_pm_kill", NULL);
gras_msgtype_declare_rpc("amok_pm_killrpc", NULL, NULL);
gras_msgtype_declare_rpc("amok_pm_get",
- gras_datadesc_by_name("string"), pm_group_type);
- gras_msgtype_declare_rpc("amok_pm_join", gras_datadesc_by_name("string"),
- gras_datadesc_by_name("int"));
+ xbt_datadesc_by_name("string"), pm_group_type);
+ gras_msgtype_declare_rpc("amok_pm_join", xbt_datadesc_by_name("string"),
+ xbt_datadesc_by_name("int"));
gras_msgtype_declare_rpc("amok_pm_leave",
- gras_datadesc_by_name("string"), NULL);
+ xbt_datadesc_by_name("string"), NULL);
gras_msgtype_declare_rpc("amok_pm_shutdown",
- gras_datadesc_by_name("string"), NULL);
+ xbt_datadesc_by_name("string"), NULL);
}
static void _amok_pm_join(void *p)
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);
