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

diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c
index a9ce28af0c..c882244eea 100644
--- a/examples/msg/masterslave/masterslave_failure.c
+++ b/examples/msg/masterslave/masterslave_failure.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  */
@@ -35,16 +30,15 @@ int master(int argc, char *argv[])
   int number_of_tasks = 0;
   double task_comp_size = 0;
   double task_comm_size = 0;
-
-
   int i;
+  _XBT_GNUC_UNUSED int read;
 
-  xbt_assert1(sscanf(argv[1], "%d", &number_of_tasks),
-              "Invalid argument %s\n", argv[1]);
-  xbt_assert1(sscanf(argv[2], "%lg", &task_comp_size),
-              "Invalid argument %s\n", argv[2]);
-  xbt_assert1(sscanf(argv[3], "%lg", &task_comm_size),
-              "Invalid argument %s\n", argv[3]);
+  read = sscanf(argv[1], "%d", &number_of_tasks);
+  xbt_assert(read, "Invalid argument %s\n", argv[1]);
+  read = sscanf(argv[2], "%lg", &task_comp_size);
+  xbt_assert(read, "Invalid argument %s\n", argv[2]);
+  read = sscanf(argv[3], "%lg", &task_comm_size);
+  xbt_assert(read, "Invalid argument %s\n", argv[3]);
 
   {                             /* Process organisation */
     slaves_count = argc - 4;
@@ -53,17 +47,17 @@ int master(int argc, char *argv[])
     for (i = 4; i < argc; i++) {
       slaves[i - 4] = MSG_get_host_by_name(argv[i]);
       if (slaves[i - 4] == NULL) {
-        INFO1("Unknown host %s. Stopping Now! ", argv[i]);
+        XBT_INFO("Unknown host %s. Stopping Now! ", argv[i]);
         abort();
       }
     }
   }
 
-  INFO1("Got %d slave(s) :", slaves_count);
+  XBT_INFO("Got %d slave(s) :", slaves_count);
   for (i = 0; i < slaves_count; i++)
-    INFO1("%s", slaves[i]->name);
+    XBT_INFO("%s", slaves[i]->name);
 
-  INFO1("Got %d task to process :", number_of_tasks);
+  XBT_INFO("Got %d task to process :", number_of_tasks);
 
   for (i = 0; i < number_of_tasks; i++) {
     m_task_t task = MSG_task_create("Task", task_comp_size, task_comm_size,
@@ -71,65 +65,64 @@ int master(int argc, char *argv[])
     int a;
     *((double *) task->data) = MSG_get_clock();
 
-    a = MSG_task_put_with_timeout(task, slaves[i % slaves_count], PORT_22,
-                                  10.0);
+    a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i % slaves_count]),10.0);
+
     if (a == MSG_OK) {
-      INFO0("Send completed");
+      XBT_INFO("Send completed");
     } else if (a == MSG_HOST_FAILURE) {
-      INFO0
+      XBT_INFO
           ("Gloups. The cpu on which I'm running just turned off!. See you!");
       free(task->data);
       MSG_task_destroy(task);
       free(slaves);
       return 0;
     } else if (a == MSG_TRANSFER_FAILURE) {
-      INFO1
+      XBT_INFO
           ("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!",
            slaves[i % slaves_count]->name);
       free(task->data);
       MSG_task_destroy(task);
     } else if (a == MSG_TIMEOUT) {
-      INFO1
+      XBT_INFO
           ("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!",
            slaves[i % slaves_count]->name);
       free(task->data);
       MSG_task_destroy(task);
     } else {
-      INFO0("Hey ?! What's up ? ");
-      xbt_assert0(0, "Unexpected behavior");
+      XBT_INFO("Hey ?! What's up ? ");
+      xbt_die( "Unexpected behavior");
     }
   }
 
-  INFO0
+  XBT_INFO
       ("All tasks have been dispatched. Let's tell everybody the computation is over.");
   for (i = 0; i < slaves_count; i++) {
     m_task_t task = MSG_task_create("finalize", 0, 0, FINALIZE);
-    int a = MSG_task_put_with_timeout(task, slaves[i], PORT_22, 1.0);
+    int a = MSG_task_send_with_timeout(task,MSG_host_get_name(slaves[i]),1.0);
     if (a == MSG_OK)
       continue;
     if (a == MSG_HOST_FAILURE) {
-      INFO0
+      XBT_INFO
           ("Gloups. The cpu on which I'm running just turned off!. See you!");
       MSG_task_destroy(task);
       free(slaves);
       return 0;
     } else if (a == MSG_TRANSFER_FAILURE) {
-      INFO1("Mmh. Can't reach '%s'! Nevermind. Let's keep going!",
+      XBT_INFO("Mmh. Can't reach '%s'! Nevermind. Let's keep going!",
             slaves[i]->name);
       MSG_task_destroy(task);
     } else if (a == MSG_TIMEOUT) {
-      INFO1
+      XBT_INFO
           ("Mmh. Got timeouted while speaking to '%s'. Nevermind. Let's keep going!",
            slaves[i % slaves_count]->name);
       MSG_task_destroy(task);
     } else {
-      INFO0("Hey ?! What's up ? ");
-      xbt_assert2(0, "Unexpected behavior with '%s': %d", slaves[i]->name,
-                  a);
+      XBT_INFO("Hey ?! What's up ? ");
+      xbt_die("Unexpected behavior with '%s': %d", slaves[i]->name, a);
     }
   }
 
-  INFO0("Goodbye now!");
+  XBT_INFO("Goodbye now!");
   free(slaves);
   return 0;
 }                               /* end_of_master */
@@ -143,43 +136,43 @@ int slave(int argc, char *argv[])
     double time1, time2;
 
     time1 = MSG_get_clock();
-    a = MSG_task_get(&(task), PORT_22);
+    a = MSG_task_receive( &(task), MSG_host_get_name(MSG_host_self()) );
     time2 = MSG_get_clock();
     if (a == MSG_OK) {
-      INFO1("Received \"%s\"", MSG_task_get_name(task));
+      XBT_INFO("Received \"%s\"", MSG_task_get_name(task));
       if (MSG_task_get_data(task) == FINALIZE) {
         MSG_task_destroy(task);
         break;
       }
       if (time1 < *((double *) task->data))
         time1 = *((double *) task->data);
-      INFO1("Communication time : \"%f\"", time2 - time1);
-      INFO1("Processing \"%s\"", MSG_task_get_name(task));
+      XBT_INFO("Communication time : \"%f\"", time2 - time1);
+      XBT_INFO("Processing \"%s\"", MSG_task_get_name(task));
       a = MSG_task_execute(task);
       if (a == MSG_OK) {
-        INFO1("\"%s\" done", MSG_task_get_name(task));
+        XBT_INFO("\"%s\" done", MSG_task_get_name(task));
         free(task->data);
         MSG_task_destroy(task);
       } else if (a == MSG_HOST_FAILURE) {
-        INFO0
+        XBT_INFO
             ("Gloups. The cpu on which I'm running just turned off!. See you!");
         return 0;
       } else {
-        INFO0("Hey ?! What's up ? ");
-        xbt_assert0(0, "Unexpected behavior");
+        XBT_INFO("Hey ?! What's up ? ");
+        xbt_die("Unexpected behavior");
       }
     } else if (a == MSG_HOST_FAILURE) {
-      INFO0
+      XBT_INFO
           ("Gloups. The cpu on which I'm running just turned off!. See you!");
       return 0;
     } else if (a == MSG_TRANSFER_FAILURE) {
-      INFO0("Mmh. Something went wrong. Nevermind. Let's keep going!");
+      XBT_INFO("Mmh. Something went wrong. Nevermind. Let's keep going!");
     } else {
-      INFO0("Hey ?! What's up ? ");
-      xbt_assert0(0, "Unexpected behavior");
+      XBT_INFO("Hey ?! What's up ? ");
+      xbt_die("Unexpected behavior");
     }
   }
-  INFO0("I'm done. See you!");
+  XBT_INFO("I'm done. See you!");
   return 0;
 }                               /* end_of_slave */
 
@@ -191,7 +184,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 */
@@ -201,7 +193,7 @@ MSG_error_t test_all(const char *platform_file,
   }
   res = MSG_main();
 
-  INFO1("Simulation time %g", MSG_get_clock());
+  XBT_INFO("Simulation time %g", MSG_get_clock());
   return res;
 }                               /* end_of_test_all */