X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ee7e9c2e455536ab817ae0136acfbb53822eecd..65820b2b3a3ce25fb8df2321530644a22eaf9e76:/examples/msg/masterslave/masterslave_forwarder.c

diff --git a/examples/msg/masterslave/masterslave_forwarder.c b/examples/msg/masterslave/masterslave_forwarder.c
index efcb433585..b428b60ff6 100644
--- a/examples/msg/masterslave/masterslave_forwarder.c
+++ b/examples/msg/masterslave/masterslave_forwarder.c
@@ -20,11 +20,6 @@ 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  */
@@ -39,12 +34,12 @@ int master(int argc, char *argv[])
 
   int i;
 
-  int res = sscanf(argv[1], "%d", &number_of_tasks);
-  xbt_assert1(res,"Invalid argument %s\n", argv[1]);
+  _XBT_GNUC_UNUSED int res = sscanf(argv[1], "%d", &number_of_tasks);
+  xbt_assert(res,"Invalid argument %s\n", argv[1]);
   res = sscanf(argv[2], "%lg", &task_comp_size);
-  xbt_assert1(res, "Invalid argument %s\n", argv[2]);
+  xbt_assert(res, "Invalid argument %s\n", argv[2]);
   res = sscanf(argv[3], "%lg", &task_comm_size);
-  xbt_assert1(res, "Invalid argument %s\n", argv[3]);
+  xbt_assert(res, "Invalid argument %s\n", argv[3]);
 
   {                             /*  Task creation */
     char sprintf_buffer[64];
@@ -65,7 +60,7 @@ int master(int argc, char *argv[])
 
     for (i = 4; i < argc; i++) {
       slaves[i - 4] = MSG_get_host_by_name(argv[i]);
-      xbt_assert1(slaves[i - 4] != NULL, "Unknown host %s. Stopping Now! ",
+      xbt_assert(slaves[i - 4] != NULL, "Unknown host %s. Stopping Now! ",
                   argv[i]);
     }
   }
@@ -82,7 +77,7 @@ int master(int argc, char *argv[])
       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 +85,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!");
@@ -103,10 +98,10 @@ int master(int argc, char *argv[])
 int slave(int argc, char *argv[])
 {
   m_task_t task = NULL;
-  int res;
+  _XBT_GNUC_UNUSED int res;
   while (1) {
-    res = MSG_task_get(&(task), PORT_22);
-    xbt_assert0(res == MSG_OK, "MSG_task_get failed");
+    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));
     if (!strcmp(MSG_task_get_name(task), "finalize")) {
@@ -148,25 +143,25 @@ 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_send(task, MSG_host_get_name(slaves[i % slaves_count]));
       i++;
     } else {
       XBT_INFO("Hey ?! What's up ? ");
-      xbt_assert0(0, "Unexpected behavior");
+      xbt_die("Unexpected behavior");
     }
   }
   xbt_free(slaves);
@@ -183,7 +178,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 */