Cleanup the example, and revalidate the outputs accordingly

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5108 48e7efb5-ca39-0410-a469-dd3cf9ba447f

diff --git a/examples/msg/masterslave/masterslave.tesh b/examples/msg/masterslave/masterslave.tesh
index 7e2f5d4..d2fb324 100644 (file)
--- a/examples/msg/masterslave/masterslave.tesh
+++ b/examples/msg/masterslave/masterslave.tesh
@@ -2,133 +2,107 @@
 
 p Testing a simple master/slave example application
 
-$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml 
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 5 slave(s) :
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Jupiter
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Fafard
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Ginette
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Bourassa
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Tremblay
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 20 task to process :
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_0"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_1"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_2"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_3"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_4"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_5"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_6"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_7"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_8"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_9"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_10"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_11"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_12"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_13"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_14"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_15"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_16"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_17"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_18"
-> [Tremblay:master:(1) 0.000000] [msg_test/INFO] "Task_19"
+$ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/small_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave.xml
+> [Tremblay:master:(1) 0.000000] [msg_test/INFO] Got 5 slaves and 20 tasks to process
 > [Tremblay:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" to "Jupiter"
-> [Tremblay:master:(1) 0.147613] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 0.147613] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 0.147613] [msg_test/INFO] Sending "Task_1" to "Fafard"
 > [Jupiter:slave:(3) 0.147613] [msg_test/INFO] Received "Task_0"
 > [Jupiter:slave:(3) 0.147613] [msg_test/INFO] Processing "Task_0"
-> [Tremblay:master:(1) 0.347192] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 0.347192] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 0.347192] [msg_test/INFO] Sending "Task_2" to "Ginette"
 > [Fafard:slave:(4) 0.347192] [msg_test/INFO] Received "Task_1"
 > [Fafard:slave:(4) 0.347192] [msg_test/INFO] Processing "Task_1"
-> [Tremblay:master:(1) 0.475692] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 0.475692] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 0.475692] [msg_test/INFO] Sending "Task_3" to "Bourassa"
 > [Ginette:slave:(5) 0.475692] [msg_test/INFO] Received "Task_2"
 > [Ginette:slave:(5) 0.475692] [msg_test/INFO] Processing "Task_2"
-> [Tremblay:master:(1) 0.673184] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 0.673184] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 0.673184] [msg_test/INFO] Sending "Task_4" to "Tremblay"
 > [Tremblay:master:(1) 0.673184] [msg_test/INFO] Hey ! It's me ! :)
 > [Bourassa:slave:(6) 0.673184] [msg_test/INFO] Received "Task_3"
 > [Bourassa:slave:(6) 0.673184] [msg_test/INFO] Processing "Task_3"
-> [Tremblay:master:(1) 0.675207] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 0.675207] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 0.675207] [msg_test/INFO] Sending "Task_5" to "Jupiter"
 > [Tremblay:slave:(2) 0.675207] [msg_test/INFO] Received "Task_4"
 > [Tremblay:slave:(2) 0.675207] [msg_test/INFO] Processing "Task_4"
 > [Jupiter:slave:(3) 0.802956] [msg_test/INFO] "Task_0" done
-> [Tremblay:master:(1) 0.950569] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 0.950569] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 0.950569] [msg_test/INFO] Sending "Task_6" to "Fafard"
 > [Jupiter:slave:(3) 0.950569] [msg_test/INFO] Received "Task_5"
 > [Jupiter:slave:(3) 0.950569] [msg_test/INFO] Processing "Task_5"
 > [Fafard:slave:(4) 1.002534] [msg_test/INFO] "Task_1" done
 > [Tremblay:slave:(2) 1.184917] [msg_test/INFO] "Task_4" done
-> [Tremblay:master:(1) 1.202113] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 1.202113] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 1.202113] [msg_test/INFO] Sending "Task_7" to "Ginette"
 > [Fafard:slave:(4) 1.202113] [msg_test/INFO] Received "Task_6"
 > [Fafard:slave:(4) 1.202113] [msg_test/INFO] Processing "Task_6"
 > [Ginette:slave:(5) 1.506790] [msg_test/INFO] "Task_2" done
 > [Jupiter:slave:(3) 1.605911] [msg_test/INFO] "Task_5" done
-> [Tremblay:master:(1) 1.635290] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 1.635290] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 1.635290] [msg_test/INFO] Sending "Task_8" to "Bourassa"
 > [Ginette:slave:(5) 1.635290] [msg_test/INFO] Received "Task_7"
 > [Ginette:slave:(5) 1.635290] [msg_test/INFO] Processing "Task_7"
 > [Bourassa:slave:(6) 1.704282] [msg_test/INFO] "Task_3" done
 > [Fafard:slave:(4) 1.857455] [msg_test/INFO] "Task_6" done
-> [Tremblay:master:(1) 1.901774] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 1.901774] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 1.901774] [msg_test/INFO] Sending "Task_9" to "Tremblay"
 > [Tremblay:master:(1) 1.901774] [msg_test/INFO] Hey ! It's me ! :)
 > [Bourassa:slave:(6) 1.901774] [msg_test/INFO] Received "Task_8"
 > [Bourassa:slave:(6) 1.901774] [msg_test/INFO] Processing "Task_8"
-> [Tremblay:master:(1) 1.903797] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 1.903797] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 1.903797] [msg_test/INFO] Sending "Task_10" to "Jupiter"
 > [Tremblay:slave:(2) 1.903797] [msg_test/INFO] Received "Task_9"
 > [Tremblay:slave:(2) 1.903797] [msg_test/INFO] Processing "Task_9"
-> [Tremblay:master:(1) 2.051410] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 2.051410] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 2.051410] [msg_test/INFO] Sending "Task_11" to "Fafard"
 > [Jupiter:slave:(3) 2.051410] [msg_test/INFO] Received "Task_10"
 > [Jupiter:slave:(3) 2.051410] [msg_test/INFO] Processing "Task_10"
-> [Tremblay:master:(1) 2.250988] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 2.250988] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 2.250988] [msg_test/INFO] Sending "Task_12" to "Ginette"
 > [Fafard:slave:(4) 2.250988] [msg_test/INFO] Received "Task_11"
 > [Fafard:slave:(4) 2.250988] [msg_test/INFO] Processing "Task_11"
 > [Tremblay:slave:(2) 2.413507] [msg_test/INFO] "Task_9" done
 > [Ginette:slave:(5) 2.666388] [msg_test/INFO] "Task_7" done
 > [Jupiter:slave:(3) 2.706752] [msg_test/INFO] "Task_10" done
-> [Tremblay:master:(1) 2.794888] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 2.794888] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 2.794888] [msg_test/INFO] Sending "Task_13" to "Bourassa"
 > [Ginette:slave:(5) 2.794888] [msg_test/INFO] Received "Task_12"
 > [Ginette:slave:(5) 2.794888] [msg_test/INFO] Processing "Task_12"
 > [Fafard:slave:(4) 2.906331] [msg_test/INFO] "Task_11" done
 > [Bourassa:slave:(6) 2.932871] [msg_test/INFO] "Task_8" done
-> [Tremblay:master:(1) 3.130363] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 3.130363] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 3.130363] [msg_test/INFO] Sending "Task_14" to "Tremblay"
 > [Tremblay:master:(1) 3.130363] [msg_test/INFO] Hey ! It's me ! :)
 > [Bourassa:slave:(6) 3.130363] [msg_test/INFO] Received "Task_13"
 > [Bourassa:slave:(6) 3.130363] [msg_test/INFO] Processing "Task_13"
-> [Tremblay:master:(1) 3.132386] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 3.132386] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 3.132386] [msg_test/INFO] Sending "Task_15" to "Jupiter"
 > [Tremblay:slave:(2) 3.132386] [msg_test/INFO] Received "Task_14"
 > [Tremblay:slave:(2) 3.132386] [msg_test/INFO] Processing "Task_14"
-> [Tremblay:master:(1) 3.280000] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 3.280000] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 3.280000] [msg_test/INFO] Sending "Task_16" to "Fafard"
 > [Jupiter:slave:(3) 3.280000] [msg_test/INFO] Received "Task_15"
 > [Jupiter:slave:(3) 3.280000] [msg_test/INFO] Processing "Task_15"
-> [Tremblay:master:(1) 3.479578] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 3.479578] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 3.479578] [msg_test/INFO] Sending "Task_17" to "Ginette"
 > [Fafard:slave:(4) 3.479578] [msg_test/INFO] Received "Task_16"
 > [Fafard:slave:(4) 3.479578] [msg_test/INFO] Processing "Task_16"
 > [Tremblay:slave:(2) 3.642096] [msg_test/INFO] "Task_14" done
 > [Ginette:slave:(5) 3.825986] [msg_test/INFO] "Task_12" done
 > [Jupiter:slave:(3) 3.935342] [msg_test/INFO] "Task_15" done
-> [Tremblay:master:(1) 3.954486] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 3.954486] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 3.954486] [msg_test/INFO] Sending "Task_18" to "Bourassa"
 > [Ginette:slave:(5) 3.954486] [msg_test/INFO] Received "Task_17"
 > [Ginette:slave:(5) 3.954486] [msg_test/INFO] Processing "Task_17"
 > [Fafard:slave:(4) 4.134920] [msg_test/INFO] "Task_16" done
 > [Bourassa:slave:(6) 4.161461] [msg_test/INFO] "Task_13" done
-> [Tremblay:master:(1) 4.358953] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 4.358953] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 4.358953] [msg_test/INFO] Sending "Task_19" to "Tremblay"
 > [Tremblay:master:(1) 4.358953] [msg_test/INFO] Hey ! It's me ! :)
 > [Bourassa:slave:(6) 4.358953] [msg_test/INFO] Received "Task_18"
 > [Bourassa:slave:(6) 4.358953] [msg_test/INFO] Processing "Task_18"
-> [Tremblay:master:(1) 4.360976] [msg_test/INFO] Send completed
+> [Tremblay:master:(1) 4.360976] [msg_test/INFO] Sent
 > [Tremblay:master:(1) 4.360976] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
 > [Tremblay:slave:(2) 4.360976] [msg_test/INFO] Received "Task_19"
 > [Tremblay:slave:(2) 4.360976] [msg_test/INFO] Processing "Task_19"

diff --git a/examples/msg/masterslave/masterslave_forwarder.c b/examples/msg/masterslave/masterslave_forwarder.c
index bd26a6f..e3a44db 100644 (file)
--- a/examples/msg/masterslave/masterslave_forwarder.c
+++ b/examples/msg/masterslave/masterslave_forwarder.c
@@ -63,21 +63,13 @@ 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]);
-       abort();
-      }
+      xbt_assert1(slaves[i-4]!=NULL, "Unknown host %s. Stopping Now! ", argv[i]);
     }
   }
 
-  INFO1("Got %d slave(s) :", slaves_count);
+  INFO2("Got %d slaves and %d tasks to process", slaves_count,number_of_tasks);
   for (i = 0; i < slaves_count; i++)
-    INFO1("%s", slaves[i]->name);
-
-  INFO1("Got %d task to process :", number_of_tasks);
-
-  for (i = 0; i < number_of_tasks; i++)
-    INFO1("\"%s\"", todo[i]->name);
+    DEBUG1("%s", slaves[i]->name);
 
   for (i = 0; i < number_of_tasks; i++) {
     INFO2("Sending \"%s\" to \"%s\"",
@@ -89,7 +81,7 @@ int master(int argc, char *argv[])
 
     MSG_task_put(todo[i], slaves[i % slaves_count],
                  PORT_22);
-    INFO0("Send completed");
+    INFO0("Sent");
   }
   
   INFO0("All tasks have been dispatched. Let's tell everybody the computation is over.");
@@ -106,24 +98,23 @@ int master(int argc, char *argv[])
 /** Receiver function  */
 int slave(int argc, char *argv[])
 {
+  m_task_t task = NULL;
+  int res;
   while(1) {
-    m_task_t task = NULL;
-    int a;
-    a = MSG_task_get(&(task), PORT_22);
-    if (a == MSG_OK) {
-      INFO1("Received \"%s\"", MSG_task_get_name(task));
-      if(MSG_task_get_data(task)==FINALIZE) {
+    res = MSG_task_get(&(task), PORT_22);
+    xbt_assert0(res == MSG_OK, "MSG_task_get failed");
+
+    INFO1("Received \"%s\"", MSG_task_get_name(task));
+    if (!strcmp(MSG_task_get_name(task),"finalize")) {
        MSG_task_destroy(task);
        break;
-      }
-      INFO1("Processing \"%s\"", MSG_task_get_name(task));
-      MSG_task_execute(task);
-      INFO1("\"%s\" done", MSG_task_get_name(task));
-      MSG_task_destroy(task);
-    } else {
-      INFO0("Hey ?! What's up ? ");
-      xbt_assert0(0,"Unexpected behavior");
     }
+     
+    INFO1("Processing \"%s\"", MSG_task_get_name(task));
+    MSG_task_execute(task);
+    INFO1("\"%s\" done", MSG_task_get_name(task));
+    MSG_task_destroy(task);
+    task = NULL;
   }
   INFO0("I'm done. See you!");
   return 0;

diff --git a/examples/msg/masterslave/masterslave_forwarder.tesh b/examples/msg/masterslave/masterslave_forwarder.tesh
index fe7cfeb..1bb5d20 100644 (file)
--- a/examples/msg/masterslave/masterslave_forwarder.tesh
+++ b/examples/msg/masterslave/masterslave_forwarder.tesh
@@ -3,44 +3,18 @@
 p Testing a master/slave example application with a forwarder module
 
 $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platform.xml ${srcdir:=.}/masterslave/deployment_masterslave_forwarder.xml 
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Got 5 slave(s) :
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] iRMX
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Casavant
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Bousquet
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Soucy
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Jackson
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Got 20 task to process :
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_0"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_1"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_2"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_3"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_4"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_5"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_6"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_7"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_8"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_9"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_10"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_11"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_12"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_13"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_14"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_15"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_16"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_17"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_18"
-> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] "Task_19"
+> [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Got 5 slaves and 20 tasks to process
 > [Jacquelin:master:(1) 0.000000] [msg_test/INFO] Sending "Task_0" to "iRMX"
-> [Jacquelin:master:(1) 2.573423] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 2.573423] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 2.573423] [msg_test/INFO] Sending "Task_1" to "Casavant"
 > [iRMX:slave:(4) 2.573423] [msg_test/INFO] Received "Task_0"
 > [iRMX:slave:(4) 2.573423] [msg_test/INFO] Processing "Task_0"
 > [iRMX:slave:(4) 2.646238] [msg_test/INFO] "Task_0" done
-> [Jacquelin:master:(1) 3.720777] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 3.720777] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 3.720777] [msg_test/INFO] Sending "Task_2" to "Bousquet"
 > [Casavant:forwarder:(3) 3.720777] [msg_test/INFO] Received "Task_1"
 > [Casavant:forwarder:(3) 3.720777] [msg_test/INFO] Sending "Task_1" to "Robert"
-> [Jacquelin:master:(1) 4.578692] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 4.578692] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 4.578692] [msg_test/INFO] Sending "Task_3" to "Soucy"
 > [Bousquet:slave:(5) 4.578692] [msg_test/INFO] Received "Task_2"
 > [Bousquet:slave:(5) 4.578692] [msg_test/INFO] Processing "Task_2"
@@ -48,86 +22,86 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platf
 > [Robert:slave:(10) 4.993433] [msg_test/INFO] Received "Task_1"
 > [Robert:slave:(10) 4.993433] [msg_test/INFO] Processing "Task_1"
 > [Robert:slave:(10) 5.029841] [msg_test/INFO] "Task_1" done
-> [Jacquelin:master:(1) 5.799333] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 5.799333] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 5.799333] [msg_test/INFO] Sending "Task_4" to "Jackson"
 > [Soucy:slave:(6) 5.799333] [msg_test/INFO] Received "Task_3"
 > [Soucy:slave:(6) 5.799333] [msg_test/INFO] Processing "Task_3"
 > [Soucy:slave:(6) 5.835741] [msg_test/INFO] "Task_3" done
-> [Jacquelin:master:(1) 6.519248] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 6.519248] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 6.519248] [msg_test/INFO] Sending "Task_5" to "iRMX"
 > [Jackson:forwarder:(2) 6.519248] [msg_test/INFO] Received "Task_4"
 > [Jackson:forwarder:(2) 6.519248] [msg_test/INFO] Sending "Task_4" to "Kuenning"
 > [Kuenning:slave:(7) 6.592332] [msg_test/INFO] Received "Task_4"
 > [Kuenning:slave:(7) 6.592332] [msg_test/INFO] Processing "Task_4"
 > [Kuenning:slave:(7) 6.650585] [msg_test/INFO] "Task_4" done
-> [Jacquelin:master:(1) 9.092671] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 9.092671] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 9.092671] [msg_test/INFO] Sending "Task_6" to "Casavant"
 > [iRMX:slave:(4) 9.092671] [msg_test/INFO] Received "Task_5"
 > [iRMX:slave:(4) 9.092671] [msg_test/INFO] Processing "Task_5"
 > [iRMX:slave:(4) 9.165486] [msg_test/INFO] "Task_5" done
-> [Jacquelin:master:(1) 10.240026] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 10.240026] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 10.240026] [msg_test/INFO] Sending "Task_7" to "Bousquet"
 > [Casavant:forwarder:(3) 10.240026] [msg_test/INFO] Received "Task_6"
 > [Casavant:forwarder:(3) 10.240026] [msg_test/INFO] Sending "Task_6" to "Sirois"
 > [Sirois:slave:(11) 10.672854] [msg_test/INFO] Received "Task_6"
 > [Sirois:slave:(11) 10.672854] [msg_test/INFO] Processing "Task_6"
 > [Sirois:slave:(11) 10.716544] [msg_test/INFO] "Task_6" done
-> [Jacquelin:master:(1) 11.097940] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 11.097940] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 11.097940] [msg_test/INFO] Sending "Task_8" to "Soucy"
 > [Bousquet:slave:(5) 11.097940] [msg_test/INFO] Received "Task_7"
 > [Bousquet:slave:(5) 11.097940] [msg_test/INFO] Processing "Task_7"
 > [Bousquet:slave:(5) 11.214444] [msg_test/INFO] "Task_7" done
-> [Jacquelin:master:(1) 12.318581] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 12.318581] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 12.318581] [msg_test/INFO] Sending "Task_9" to "Jackson"
 > [Soucy:slave:(6) 12.318581] [msg_test/INFO] Received "Task_8"
 > [Soucy:slave:(6) 12.318581] [msg_test/INFO] Processing "Task_8"
 > [Soucy:slave:(6) 12.354989] [msg_test/INFO] "Task_8" done
-> [Jacquelin:master:(1) 13.038497] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 13.038497] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 13.038497] [msg_test/INFO] Sending "Task_10" to "iRMX"
 > [Jackson:forwarder:(2) 13.038497] [msg_test/INFO] Received "Task_9"
 > [Jackson:forwarder:(2) 13.038497] [msg_test/INFO] Sending "Task_9" to "Browne"
 > [Browne:slave:(8) 14.564178] [msg_test/INFO] Received "Task_9"
 > [Browne:slave:(8) 14.564178] [msg_test/INFO] Processing "Task_9"
 > [Browne:slave:(8) 14.600586] [msg_test/INFO] "Task_9" done
-> [Jacquelin:master:(1) 15.611920] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 15.611920] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 15.611920] [msg_test/INFO] Sending "Task_11" to "Casavant"
 > [iRMX:slave:(4) 15.611920] [msg_test/INFO] Received "Task_10"
 > [iRMX:slave:(4) 15.611920] [msg_test/INFO] Processing "Task_10"
 > [iRMX:slave:(4) 15.684735] [msg_test/INFO] "Task_10" done
-> [Jacquelin:master:(1) 16.759274] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 16.759274] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 16.759274] [msg_test/INFO] Sending "Task_12" to "Bousquet"
 > [Casavant:forwarder:(3) 16.759274] [msg_test/INFO] Received "Task_11"
 > [Casavant:forwarder:(3) 16.759274] [msg_test/INFO] Sending "Task_11" to "Monique"
 > [Monique:slave:(12) 17.509646] [msg_test/INFO] Received "Task_11"
 > [Monique:slave:(12) 17.509646] [msg_test/INFO] Processing "Task_11"
 > [Monique:slave:(12) 17.553336] [msg_test/INFO] "Task_11" done
-> [Jacquelin:master:(1) 17.617188] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 17.617188] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 17.617188] [msg_test/INFO] Sending "Task_13" to "Soucy"
 > [Bousquet:slave:(5) 17.617188] [msg_test/INFO] Received "Task_12"
 > [Bousquet:slave:(5) 17.617188] [msg_test/INFO] Processing "Task_12"
 > [Bousquet:slave:(5) 17.733692] [msg_test/INFO] "Task_12" done
-> [Jacquelin:master:(1) 18.837830] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 18.837830] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 18.837830] [msg_test/INFO] Sending "Task_14" to "Jackson"
 > [Soucy:slave:(6) 18.837830] [msg_test/INFO] Received "Task_13"
 > [Soucy:slave:(6) 18.837830] [msg_test/INFO] Processing "Task_13"
 > [Soucy:slave:(6) 18.874238] [msg_test/INFO] "Task_13" done
-> [Jacquelin:master:(1) 19.557745] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 19.557745] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 19.557745] [msg_test/INFO] Sending "Task_15" to "iRMX"
 > [Jackson:forwarder:(2) 19.557745] [msg_test/INFO] Received "Task_14"
 > [Jackson:forwarder:(2) 19.557745] [msg_test/INFO] Sending "Task_14" to "Stephen"
 > [Stephen:slave:(9) 21.842696] [msg_test/INFO] Received "Task_14"
 > [Stephen:slave:(9) 21.842696] [msg_test/INFO] Processing "Task_14"
 > [Stephen:slave:(9) 21.915511] [msg_test/INFO] "Task_14" done
-> [Jacquelin:master:(1) 22.131168] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 22.131168] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 22.131168] [msg_test/INFO] Sending "Task_16" to "Casavant"
 > [iRMX:slave:(4) 22.131168] [msg_test/INFO] Received "Task_15"
 > [iRMX:slave:(4) 22.131168] [msg_test/INFO] Processing "Task_15"
 > [iRMX:slave:(4) 22.203983] [msg_test/INFO] "Task_15" done
-> [Jacquelin:master:(1) 23.278522] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 23.278522] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 23.278522] [msg_test/INFO] Sending "Task_17" to "Bousquet"
 > [Casavant:forwarder:(3) 23.278522] [msg_test/INFO] Received "Task_16"
 > [Casavant:forwarder:(3) 23.278522] [msg_test/INFO] Sending "Task_16" to "Robert"
-> [Jacquelin:master:(1) 24.136436] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 24.136436] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 24.136436] [msg_test/INFO] Sending "Task_18" to "Soucy"
 > [Bousquet:slave:(5) 24.136436] [msg_test/INFO] Received "Task_17"
 > [Bousquet:slave:(5) 24.136436] [msg_test/INFO] Processing "Task_17"
@@ -135,12 +109,12 @@ $ $SG_TEST_EXENV masterslave/masterslave_forwarder$EXEEXT ${srcdir:=.}/msg_platf
 > [Robert:slave:(10) 24.551178] [msg_test/INFO] Received "Task_16"
 > [Robert:slave:(10) 24.551178] [msg_test/INFO] Processing "Task_16"
 > [Robert:slave:(10) 24.587586] [msg_test/INFO] "Task_16" done
-> [Jacquelin:master:(1) 25.357078] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 25.357078] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 25.357078] [msg_test/INFO] Sending "Task_19" to "Jackson"
 > [Soucy:slave:(6) 25.357078] [msg_test/INFO] Received "Task_18"
 > [Soucy:slave:(6) 25.357078] [msg_test/INFO] Processing "Task_18"
 > [Soucy:slave:(6) 25.393486] [msg_test/INFO] "Task_18" done
-> [Jacquelin:master:(1) 26.076993] [msg_test/INFO] Send completed
+> [Jacquelin:master:(1) 26.076993] [msg_test/INFO] Sent
 > [Jacquelin:master:(1) 26.076993] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
 > [Jackson:forwarder:(2) 26.076993] [msg_test/INFO] Received "Task_19"
 > [Jackson:forwarder:(2) 26.076993] [msg_test/INFO] Sending "Task_19" to "Kuenning"