X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bdaaac614d1bb0ee8e034fa76862068d57e362ee..4a6b0a991a67e6f2f67c03fed43529e078da7115:/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 be67d1ccae..06a46488bb 100644
--- a/examples/msg/token_ring/ring_call.c
+++ b/examples/msg/token_ring/ring_call.c
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -6,24 +6,33 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#include "msg/msg.h"
-#include "surf/surf_private.h"
+#include "simgrid/msg.h"
 
 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
+ * 
+ * - <b>token_ring/ring_call.c</b>: 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()));
+  int host_number = xbt_str_parse_int(MSG_process_get_name(MSG_process_self()), "Process name must be an integer but is: %s");
   char mailbox[256];
-  m_task_t task = NULL;
-  _XBT_GNUC_UNUSED int res;
-
+  msg_task_t task = NULL;
+  XBT_ATTRIB_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 +49,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);
@@ -52,28 +61,23 @@ int host(int argc, char *argv[])
 
 int main(int argc, char **argv)
 {
-	int i,res;
-  MSG_global_init(&argc, argv);
+  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<number_of_hosts; i++)
+  XBT_INFO("Number of host '%d'",nb_hosts);
+  for(i = 0 ; i<nb_hosts; i++)
   {
     char* name_host = bprintf("%d",i);
-    MSG_process_create( name_host, host, NULL, host_table[i] );
+    MSG_process_create( name_host, host, NULL, xbt_dynar_get_as(hosts,i,msg_host_t) );
     free(name_host);
   }
-  xbt_free(host_table);
+  xbt_dynar_free(&hosts);
 
   res = MSG_main();
   XBT_INFO("Simulation time %g", MSG_get_clock());
-  MSG_clean();
-  if (res == MSG_OK)
-    return 0;
-  else
-    return 1;
-
+  return res != MSG_OK;
 }