X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e542387cf6c22f2cf646faede87320040dbaa884..dc3c3416c4cca30fef7c29422d45094687f59893:/examples/msg/token_ring/ring_call.c
diff --git a/examples/msg/token_ring/ring_call.c b/examples/msg/token_ring/ring_call.c
index 8cdf4e9d3a..fc6092508a 100644
--- a/examples/msg/token_ring/ring_call.c
+++ b/examples/msg/token_ring/ring_call.c
@@ -12,18 +12,28 @@
int host(int argc, char *argv[]);
unsigned int task_comp_size = 50000000;
unsigned int task_comm_size = 1000000;
-int number_of_hosts;
+
+int nb_hosts; /* All declared hosts */
XBT_LOG_NEW_DEFAULT_CATEGORY(ring,
"Messages specific for this msg example");
+/** @addtogroup MSG_examples
+ *
+ * @section MSG_ex_apps Examples of full applications
+ *
+ * - token_ring/ring_call.c: Classical token ring
+ * communication, where a token is exchanged along a ring to reach
+ * every participant.
+ *
+ */
+
int host(int argc, char *argv[])
{
int host_number = atoi(MSG_process_get_name(MSG_process_self()));
char mailbox[256];
- m_task_t task = NULL;
+ msg_task_t task = NULL;
_XBT_GNUC_UNUSED int res;
-
if (host_number == 0){ //master send then receive
sprintf(mailbox, "%d", host_number+1);
task = MSG_task_create("Token", task_comp_size, task_comm_size, NULL);
@@ -40,7 +50,7 @@ int host(int argc, char *argv[])
xbt_assert(res == MSG_OK, "MSG_task_get failed");
XBT_INFO("Host \"%d\" received \"%s\"",host_number, MSG_task_get_name(task));
- if(host_number+1 == number_of_hosts )
+ if(host_number+1 == nb_hosts)
sprintf(mailbox, "0");
else
sprintf(mailbox, "%d", host_number+1);
@@ -50,33 +60,26 @@ int host(int argc, char *argv[])
return 0;
}
-typedef enum {
- PORT_22 = 20,
- MAX_CHANNEL
-} channel_t;
-
int main(int argc, char **argv)
{
- int i,res;
- MSG_global_init(&argc, argv);
- MSG_set_channel_number(MAX_CHANNEL);
+ int i,res;
+ MSG_init(&argc, argv);
MSG_create_environment(argv[1]);
- m_host_t *host_table = MSG_get_host_table();
- number_of_hosts = MSG_get_host_number();
+ xbt_dynar_t hosts = MSG_hosts_as_dynar();
+ nb_hosts = xbt_dynar_length(hosts);
MSG_function_register("host", host);
- XBT_INFO("Number of host '%d'",number_of_hosts);
- for(i = 0 ; i