-/* $Id$ */
-
/* amok peer management - servers main loop and remote peer stopping */
-/* Copyright (c) 2006 Martin Quinson. All rights reserved. */
+/* Copyright (c) 2006, 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
xbt_dict_t groups;
} s_amok_pm_moddata_t, *amok_pm_moddata_t;
-/* Payload of join message */
-typedef struct {
- char *group;
- int rank;
-} s_amok_pm_msg_join_t, *amok_pm_msg_join_t;
-
/* Message callbacks */
static int amok_pm_cb_kill(gras_msg_cb_ctx_t ctx, void *payload_data)
{
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);
- amok_pm_msg_join_t msg = *(amok_pm_msg_join_t *) payload;
- xbt_dynar_t group = xbt_dict_get(g->groups, msg->group);
+ char *group_name = *(char **) payload;
+ 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_peer_t previous = NULL;
-
- if (msg->rank >= 0 && xbt_dynar_length(group) >= msg->rank + 1)
- xbt_dynar_get_cpy(group, msg->rank, &previous);
-
- VERB3("Contacted by %s:%d for rank %d", dude->name, dude->port, msg->rank);
- if (msg->rank < 0) {
- xbt_dynar_push(group, &dude);
- } else {
- if (previous)
- THROW4(arg_error, 0,
- "You wanted to get rank %d of group %s, but %s:%d is already there",
- msg->rank, msg->group, previous->name, previous->port);
- xbt_dynar_set(group, msg->rank, &dude);
- }
- gras_msg_rpcreturn(10, ctx, NULL);
- free(msg->group);
- free(msg);
+ rank = xbt_dynar_length(group);
+ xbt_dynar_push(group, &dude);
+ XBT_VERB("Contacted by %s:%d. Give it rank #%d", dude->name, dude->port,
+ rank);
+
+ gras_msg_rpcreturn(10, ctx, &rank);
+ free(group_name);
return 0;
}
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;
}
/** \brief add current peer to the given remote group
*
- * You should provide rank only when you want to force the order of members
- * (for example in strict test cases). Give -1 to leave the system choose it for you.
+ * Returns the rank of the process in the group.
*/
-void amok_pm_group_join(gras_socket_t master, const char *group_name,
- int rank)
+int amok_pm_group_join(gras_socket_t master, const char *group_name)
{
- amok_pm_msg_join_t msg = xbt_new(s_amok_pm_msg_join_t, 1);
- msg->group = (char *) group_name;
- msg->rank = rank;
- VERB4("Join group '%s' on %s:%d (at rank %d)",
- group_name, gras_socket_peer_name(master),
- gras_socket_peer_port(master), rank);
- gras_msg_rpccall(master, 30, "amok_pm_join", &msg, NULL);
- free(msg);
- VERB3("Joined group '%s' on %s:%d",
+ int rank;
+ 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);
+ 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;
}
/** \brief remove current peer from the given remote group if found
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));
}
/* 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_datadesc_type_t msg_join_t =
- gras_datadesc_struct("s_amok_pm_moddata_t");
- gras_datadesc_struct_append(msg_join_t, "group",
- gras_datadesc_by_name("string"));
- gras_datadesc_struct_append(msg_join_t, "rank",
- gras_datadesc_by_name("int"));
- gras_datadesc_struct_close(msg_join_t);
- msg_join_t =
- gras_datadesc_ref("amok_pm_moddata_t",
- gras_datadesc_by_name("s_amok_pm_moddata_t"));
+ 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"), pm_group_type);
- gras_msgtype_declare_rpc("amok_pm_join", msg_join_t, NULL);
+ gras_msgtype_declare_rpc("amok_pm_join", gras_datadesc_by_name("string"),
+ gras_datadesc_by_name("int"));
gras_msgtype_declare_rpc("amok_pm_leave",
gras_datadesc_by_name("string"), NULL);
void amok_pm_modulecreate()
{
- gras_module_add("amok_pm", sizeof(s_amok_pm_moddata_t), &amok_pm_moddata_id,
- _amok_pm_init, _amok_pm_exit, _amok_pm_join,
- _amok_pm_leave);
+ gras_module_add("amok_pm", sizeof(s_amok_pm_moddata_t),
+ &amok_pm_moddata_id, _amok_pm_init, _amok_pm_exit,
+ _amok_pm_join, _amok_pm_leave);
}
