X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/edde8f7fbc1b74a81551bf9eb7bac1935b999296..693f30b46244c152cd79cdf3ad35d4a79b866c9c:/examples/msg/masterslave/masterslave_forwarder.c

diff --git a/examples/msg/masterslave/masterslave_forwarder.c b/examples/msg/masterslave/masterslave_forwarder.c
index 5978b0e6a5..e0bfee0450 100644
--- a/examples/msg/masterslave/masterslave_forwarder.c
+++ b/examples/msg/masterslave/masterslave_forwarder.c
@@ -14,17 +14,21 @@
 XBT_LOG_NEW_DEFAULT_CATEGORY(msg_test,
                              "Messages specific for this msg example");
 
+/** @addtogroup MSG_examples
+ * 
+ *  - <b>masterslave/masterslave_forwarder.c: Master/slaves
+ *    example</b>. This good old example is also very simple. Its basic
+ *    version is fully commented on this page: \ref MSG_ex_master_slave,
+ *    but several variants can be found in the same directory. 
+ */
+
+
 int master(int argc, char *argv[]);
 int slave(int argc, char *argv[]);
 int forwarder(int argc, char *argv[]);
 MSG_error_t test_all(const char *platform_file,
                      const char *application_file);
 
-typedef enum {
-  PORT_22 = 0,
-  MAX_CHANNEL
-} channel_t;
-
 #define FINALIZE ((void*)221297)        /* a magic number to tell people to stop working */
 
 /** Emitter function  */
@@ -73,16 +77,16 @@ int master(int argc, char *argv[])
   XBT_INFO("Got %d slaves and %d tasks to process", slaves_count,
         number_of_tasks);
   for (i = 0; i < slaves_count; i++)
-    XBT_DEBUG("%s", slaves[i]->name);
+    XBT_DEBUG("%s", MSG_host_get_name(slaves[i]));
 
   for (i = 0; i < number_of_tasks; i++) {
     XBT_INFO("Sending \"%s\" to \"%s\"",
-          todo[i]->name, slaves[i % slaves_count]->name);
+          todo[i]->name, MSG_host_get_name(slaves[i % slaves_count]));
     if (MSG_host_self() == slaves[i % slaves_count]) {
       XBT_INFO("Hey ! It's me ! :)");
     }
 
-    MSG_task_put(todo[i], slaves[i % slaves_count], PORT_22);
+    MSG_task_send(todo[i], MSG_host_get_name(slaves[i % slaves_count]));
     XBT_INFO("Sent");
   }
 
@@ -90,7 +94,7 @@ int master(int argc, char *argv[])
       ("All tasks have been dispatched. Let's tell everybody the computation is over.");
   for (i = 0; i < slaves_count; i++) {
     m_task_t finalize = MSG_task_create("finalize", 0, 0, FINALIZE);
-    MSG_task_put(finalize, slaves[i], PORT_22);
+    MSG_task_send(finalize, MSG_host_get_name(slaves[i]));
   }
 
   XBT_INFO("Goodbye now!");
@@ -105,7 +109,7 @@ int slave(int argc, char *argv[])
   m_task_t task = NULL;
   _XBT_GNUC_UNUSED int res;
   while (1) {
-    res = MSG_task_get(&(task), PORT_22);
+    res = MSG_task_receive(&(task),MSG_host_get_name(MSG_host_self()));
     xbt_assert(res == MSG_OK, "MSG_task_get failed");
 
     XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
@@ -148,21 +152,21 @@ int forwarder(int argc, char *argv[])
   while (1) {
     m_task_t task = NULL;
     int a;
-    a = MSG_task_get(&(task), PORT_22);
+    a = MSG_task_receive(&(task),MSG_host_get_name(MSG_host_self()));
     if (a == MSG_OK) {
       XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
       if (MSG_task_get_data(task) == FINALIZE) {
         XBT_INFO
             ("All tasks have been dispatched. Let's tell everybody the computation is over.");
         for (i = 0; i < slaves_count; i++)
-          MSG_task_put(MSG_task_create("finalize", 0, 0, FINALIZE),
-                       slaves[i], PORT_22);
+          MSG_task_send(MSG_task_create("finalize", 0, 0, FINALIZE),
+              MSG_host_get_name(slaves[i]));
         MSG_task_destroy(task);
         break;
       }
       XBT_INFO("Sending \"%s\" to \"%s\"",
-            MSG_task_get_name(task), slaves[i % slaves_count]->name);
-      MSG_task_put(task, slaves[i % slaves_count], PORT_22);
+            MSG_task_get_name(task), MSG_host_get_name(slaves[i % slaves_count]));
+      MSG_task_send(task, MSG_host_get_name(slaves[i % slaves_count]));
       i++;
     } else {
       XBT_INFO("Hey ?! What's up ? ");
@@ -183,7 +187,6 @@ MSG_error_t test_all(const char *platform_file,
 
   /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
-    MSG_set_channel_number(MAX_CHANNEL);
     MSG_create_environment(platform_file);
   }
   {                             /*   Application deployment */
@@ -204,7 +207,7 @@ int main(int argc, char *argv[])
 {
   MSG_error_t res = MSG_OK;
 
-  MSG_global_init(&argc, argv);
+  MSG_init(&argc, argv);
   if (argc < 3) {
     printf("Usage: %s platform_file deployment_file\n", argv[0]);
     printf("example: %s msg_platform.xml msg_deployment.xml\n", argv[0]);