amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id);
g->done = 1;
- return 1;
+ return 0;
}
static int amok_pm_cb_killrpc(gras_msg_cb_ctx_t ctx,
void *payload_data) {
amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id);
g->done = 1;
gras_msg_rpcreturn(30,ctx,NULL);
- return 1;
+ return 0;
}
static int amok_pm_cb_get(gras_msg_cb_ctx_t ctx, void *payload) {
xbt_dynar_t res = xbt_dict_get(g->groups, name);
gras_msg_rpcreturn(30, ctx, &res);
- return 1;
+ return 0;
}
static int amok_pm_cb_join(gras_msg_cb_ctx_t ctx, void *payload) {
amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id);
gras_msg_rpcreturn(10, ctx, NULL);
free(name);
- return 1;
+ return 0;
}
static int amok_pm_cb_leave(gras_msg_cb_ctx_t ctx, void *payload) {
amok_pm_moddata_t g=gras_moddata_by_id(amok_pm_moddata_id);
end:
gras_msg_rpcreturn(30, ctx, NULL);
- return 1;
+ return 0;
}
static int amok_pm_cb_shutdown(gras_msg_cb_ctx_t ctx, void *payload) {
amok_pm_group_shutdown(name);
gras_msg_rpcreturn(30, ctx, NULL);
- return 1;
+ return 0;
}
/** \brief Enter the main loop of the program. It won't return until we get a kill message. */
}
}
-/** \brief kill a buddy identified by its peername and port */
+/** \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);
amok_pm_kill(sock);
gras_socket_close(sock);
}
-/** \brief kill a buddy to which we have a socket already */
+/** \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) {
- gras_msg_send(buddy,gras_msgtype_by_name("amok_pm_kill"),NULL);
+ gras_msg_send(buddy,"amok_pm_kill",NULL);
}
-/** \brief kill syncronously a buddy (do not return before its death) */
+/** \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) {
- gras_msg_rpccall(buddy,30,gras_msgtype_by_name("amok_pm_killrpc"),NULL,NULL);
+ gras_msg_rpccall(buddy,30,"amok_pm_killrpc",NULL,NULL);
}
xbt_assert0(amok_pm_moddata_id != -1,"Run amok_pm_init first!");
g=gras_moddata_by_id(amok_pm_moddata_id);
- INFO1("retrieved groups=%p",g->groups);
+ DEBUG1("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_dynar_t amok_pm_group_get(gras_socket_t master, const char *group_name) {
xbt_dynar_t res;
- gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_pm_get"),
- &group_name,&res);
+ gras_msg_rpccall(master,30,"amok_pm_get", &group_name,&res);
return res;
}
void amok_pm_group_join(gras_socket_t master, const char *group_name) {
VERB3("Join group '%s' on %s:%d",
group_name,gras_socket_peer_name(master),gras_socket_peer_port(master));
- gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_pm_join"),
- &group_name,NULL);
+ gras_msg_rpccall(master,30,"amok_pm_join", &group_name,NULL);
VERB3("Joined group '%s' on %s:%d",
group_name,gras_socket_peer_name(master),gras_socket_peer_port(master));
}
* If not found, call is ignored
*/
void amok_pm_group_leave(gras_socket_t master, const char *group_name) {
- gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_pm_leave"),
- &group_name,NULL);
+ 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));
}
}
/** \brief stops all members of the given remote group */
void amok_pm_group_shutdown_remote(gras_socket_t master, const char *group_name){
- gras_msg_rpccall(master,30,gras_msgtype_by_name("amok_pm_shutdown"),
- &group_name,NULL);
+ gras_msg_rpccall(master,30,"amok_pm_shutdown", &group_name,NULL);
}
static void _amok_pm_init(void) {
/* 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_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"),
- gras_datadesc_by_name("xbt_dynar_t"));
+ pm_group_type);
gras_msgtype_declare_rpc("amok_pm_join",
gras_datadesc_by_name("string"),
NULL);
static void _amok_pm_join(void *p) {
/* moddata management */
amok_pm_moddata_t mod = (amok_pm_moddata_t)p;
+
+ mod->groups = NULL;
mod->done = 0;
mod->groups = xbt_dict_new();
- INFO1("groups=%p",mod->groups);
/* callbacks */
- gras_cb_register(gras_msgtype_by_name("amok_pm_kill"),
- &amok_pm_cb_kill);
- gras_cb_register(gras_msgtype_by_name("amok_pm_killrpc"),
- &amok_pm_cb_killrpc);
-
- gras_cb_register(gras_msgtype_by_name("amok_pm_get"),
- &amok_pm_cb_get);
- gras_cb_register(gras_msgtype_by_name("amok_pm_join"),
- &amok_pm_cb_join);
- gras_cb_register(gras_msgtype_by_name("amok_pm_leave"),
- &amok_pm_cb_leave);
- gras_cb_register(gras_msgtype_by_name("amok_pm_shutdown"),
- &amok_pm_cb_shutdown);
+ gras_cb_register("amok_pm_kill", &amok_pm_cb_kill);
+ gras_cb_register("amok_pm_killrpc",&amok_pm_cb_killrpc);
+
+ gras_cb_register("amok_pm_get", &amok_pm_cb_get);
+ gras_cb_register("amok_pm_join", &amok_pm_cb_join);
+ gras_cb_register("amok_pm_leave", &amok_pm_cb_leave);
+ gras_cb_register("amok_pm_shutdown", &amok_pm_cb_shutdown);
}
static void _amok_pm_exit(void) {
- /* no world-wide globals */
+ /* no world-wide globals */
}
static void _amok_pm_leave(void *p) {
/* moddata */
amok_pm_moddata_t mod = (amok_pm_moddata_t)p;
- xbt_dict_free(&mod->groups);
+ if (mod->groups)
+ xbt_dict_free(&mod->groups);
/* callbacks */
- gras_cb_unregister(gras_msgtype_by_name("amok_pm_kill"),
- &amok_pm_cb_kill);
- gras_cb_unregister(gras_msgtype_by_name("amok_pm_killrpc"),
- &amok_pm_cb_killrpc);
-
- gras_cb_unregister(gras_msgtype_by_name("amok_pm_get"),
- &amok_pm_cb_get);
- gras_cb_unregister(gras_msgtype_by_name("amok_pm_join"),
- &amok_pm_cb_join);
- gras_cb_unregister(gras_msgtype_by_name("amok_pm_leave"),
- &amok_pm_cb_leave);
-
- gras_cb_unregister(gras_msgtype_by_name("amok_pm_shutdown"),
- &amok_pm_cb_shutdown);
+ gras_cb_unregister("amok_pm_kill", &amok_pm_cb_kill);
+ gras_cb_unregister("amok_pm_killrpc",&amok_pm_cb_killrpc);
+
+ gras_cb_unregister("amok_pm_get", &amok_pm_cb_get);
+ gras_cb_unregister("amok_pm_join", &amok_pm_cb_join);
+ gras_cb_unregister("amok_pm_leave", &amok_pm_cb_leave);
+ gras_cb_unregister("amok_pm_shutdown", &amok_pm_cb_shutdown);
}
void amok_pm_modulecreate() {
