cosmetic changes

diff --git a/examples/c/async-wait/async-wait.c b/examples/c/async-wait/async-wait.c
index 0e1fc40..994485f 100644 (file)
--- a/examples/c/async-wait/async-wait.c
+++ b/examples/c/async-wait/async-wait.c
@@ -45,16 +45,8 @@ static void sender(int argc, char* argv[])
     }
   }
 
-  sg_comm_t comm = sg_mailbox_put_async(mailbox, xbt_strdup("finalize"), 0);
   XBT_INFO("Send 'finalize' to 'receiver'");
-
-  if (sleep_test_time > 0) {
-    while (sg_comm_test(comm) == 0) {
-      sg_actor_sleep_for(sleep_test_time);
-    }
-  } else {
-    sg_comm_wait(comm);
-  }
+  sg_mailbox_put(mailbox, xbt_strdup("finalize"), 0);
 }
 
 /* Receiver process expects 3 arguments: */

diff --git a/examples/c/async-wait/async-wait.tesh b/examples/c/async-wait/async-wait.tesh
index 2a4e632..1761f88 100644 (file)
--- a/examples/c/async-wait/async-wait.tesh
+++ b/examples/c/async-wait/async-wait.tesh
@@ -7,13 +7,13 @@ $ ${bindir:=.}/async-wait-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=
 > [  0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.100000
 > [  1.000000] (2:receiver@Ruby) Wait for my first message
 > [  5.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver'
-> [  6.100000] (2:receiver@Ruby) I got a 'Message 0'.
-> [  6.100000] (1:sender@Tremblay) Send 'Message 1' to 'receiver'
-> [  7.200000] (2:receiver@Ruby) I got a 'Message 1'.
-> [  7.200000] (1:sender@Tremblay) Send 'Message 2' to 'receiver'
-> [  8.300000] (2:receiver@Ruby) I got a 'Message 2'.
-> [  8.300000] (1:sender@Tremblay) Send 'finalize' to 'receiver'
-> [  8.400000] (2:receiver@Ruby) I got a 'finalize'.
+> [  6.000000] (2:receiver@Ruby) I got a 'Message 0'.
+> [  6.000000] (1:sender@Tremblay) Send 'Message 1' to 'receiver'
+> [  7.000000] (2:receiver@Ruby) I got a 'Message 1'.
+> [  7.000000] (1:sender@Tremblay) Send 'Message 2' to 'receiver'
+> [  8.000000] (2:receiver@Ruby) I got a 'Message 2'.
+> [  8.000000] (1:sender@Tremblay) Send 'finalize' to 'receiver'
+> [  8.100000] (2:receiver@Ruby) I got a 'finalize'.
 
 p Test2 sg_comm_test() with Sleep_sender < Sleep_receiver
 
@@ -22,13 +22,13 @@ $ ${bindir:=.}/async-wait-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=
 > [  0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.100000
 > [  1.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver'
 > [  5.000000] (2:receiver@Ruby) Wait for my first message
-> [  6.100000] (2:receiver@Ruby) I got a 'Message 0'.
-> [  6.100000] (1:sender@Tremblay) Send 'Message 1' to 'receiver'
-> [  7.200000] (2:receiver@Ruby) I got a 'Message 1'.
-> [  7.200000] (1:sender@Tremblay) Send 'Message 2' to 'receiver'
-> [  8.300000] (2:receiver@Ruby) I got a 'Message 2'.
-> [  8.300000] (1:sender@Tremblay) Send 'finalize' to 'receiver'
-> [  8.400000] (2:receiver@Ruby) I got a 'finalize'.
+> [  6.000000] (2:receiver@Ruby) I got a 'Message 0'.
+> [  6.000000] (1:sender@Tremblay) Send 'Message 1' to 'receiver'
+> [  7.000000] (2:receiver@Ruby) I got a 'Message 1'.
+> [  7.000000] (1:sender@Tremblay) Send 'Message 2' to 'receiver'
+> [  8.000000] (1:sender@Tremblay) Send 'finalize' to 'receiver'
+> [  8.000000] (2:receiver@Ruby) I got a 'Message 2'.
+> [  8.100000] (2:receiver@Ruby) I got a 'finalize'.
 
 p Test1 sg_comm_wait() with Sleep_sender > Sleep_receiver
 
@@ -37,13 +37,13 @@ $ ${bindir:=.}/async-wait-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=
 > [  0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.000000
 > [  1.000000] (2:receiver@Ruby) Wait for my first message
 > [  5.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver'
-> [  6.032879] (2:receiver@Ruby) I got a 'Message 0'.
-> [  6.032879] (1:sender@Tremblay) Send 'Message 1' to 'receiver'
-> [  7.065759] (2:receiver@Ruby) I got a 'Message 1'.
-> [  7.065759] (1:sender@Tremblay) Send 'Message 2' to 'receiver'
-> [  8.098638] (2:receiver@Ruby) I got a 'Message 2'.
-> [  8.098638] (1:sender@Tremblay) Send 'finalize' to 'receiver'
-> [  8.100590] (2:receiver@Ruby) I got a 'finalize'.
+> [  6.000000] (2:receiver@Ruby) I got a 'Message 0'.
+> [  6.000000] (1:sender@Tremblay) Send 'Message 1' to 'receiver'
+> [  7.000000] (2:receiver@Ruby) I got a 'Message 1'.
+> [  7.000000] (1:sender@Tremblay) Send 'Message 2' to 'receiver'
+> [  8.000000] (2:receiver@Ruby) I got a 'Message 2'.
+> [  8.000000] (1:sender@Tremblay) Send 'finalize' to 'receiver'
+> [  8.001951] (2:receiver@Ruby) I got a 'finalize'.
 
 p Test2 sg_comm_wait() with Sleep_sender < Sleep_receiver
 
@@ -52,10 +52,10 @@ $ ${bindir:=.}/async-wait-c ${platfdir:=.}/small_platform_fatpipe.xml ${srcdir:=
 > [  0.000000] (2:receiver@Ruby) sleep_start_time : 5.000000 , sleep_test_time : 0.000000
 > [  1.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver'
 > [  5.000000] (2:receiver@Ruby) Wait for my first message
-> [  6.032879] (2:receiver@Ruby) I got a 'Message 0'.
-> [  6.032879] (1:sender@Tremblay) Send 'Message 1' to 'receiver'
-> [  7.065759] (2:receiver@Ruby) I got a 'Message 1'.
-> [  7.065759] (1:sender@Tremblay) Send 'Message 2' to 'receiver'
-> [  8.098638] (2:receiver@Ruby) I got a 'Message 2'.
-> [  8.098638] (1:sender@Tremblay) Send 'finalize' to 'receiver'
-> [  8.100590] (2:receiver@Ruby) I got a 'finalize'.
+> [  6.000000] (2:receiver@Ruby) I got a 'Message 0'.
+> [  6.000000] (1:sender@Tremblay) Send 'Message 1' to 'receiver'
+> [  7.000000] (2:receiver@Ruby) I got a 'Message 1'.
+> [  7.000000] (1:sender@Tremblay) Send 'Message 2' to 'receiver'
+> [  8.000000] (1:sender@Tremblay) Send 'finalize' to 'receiver'
+> [  8.000000] (2:receiver@Ruby) I got a 'Message 2'.
+> [  8.001951] (2:receiver@Ruby) I got a 'finalize'.

diff --git a/examples/c/async-wait/async-wait2_d.xml b/examples/c/async-wait/async-wait2_d.xml
index 25a58b7..59a4d58 100644 (file)
--- a/examples/c/async-wait/async-wait2_d.xml
+++ b/examples/c/async-wait/async-wait2_d.xml
@@ -4,7 +4,7 @@
   <!-- The master actor (with some arguments) -->
   <actor host="Tremblay" function="sender">
     <argument value="3"/>       <!-- Number of messages -->
-    <argument value="498E6"/> <!-- message size -->
+    <argument value="482117300"/> <!-- message size -->
     <argument value="1"/>       <!-- Sleep_start_time -->
     <argument value="0.1"/>     <!-- Time for test -->
   </actor>

diff --git a/examples/c/async-wait/async-wait3_d.xml b/examples/c/async-wait/async-wait3_d.xml
index 77b755a..d5f3e5f 100644 (file)
--- a/examples/c/async-wait/async-wait3_d.xml
+++ b/examples/c/async-wait/async-wait3_d.xml
@@ -4,7 +4,7 @@
   <!-- The master actor (with some arguments) -->
   <actor host="Tremblay" function="sender">
     <argument value="3"/>       <!-- Number of tasks -->
-    <argument value="498E6"/> <!-- Communication size of tasks -->
+    <argument value="482117300"/> <!-- Communication size of tasks -->
     <argument value="5"/>       <!-- Sleep_start_time -->
     <argument value="0"/>       <!-- Time for test -->
   </actor>

diff --git a/examples/c/async-wait/async-wait4_d.xml b/examples/c/async-wait/async-wait4_d.xml
index a8dfbf6..10e2968 100644 (file)
--- a/examples/c/async-wait/async-wait4_d.xml
+++ b/examples/c/async-wait/async-wait4_d.xml
@@ -4,7 +4,7 @@
   <!-- The master actor (with some arguments) -->
   <actor host="Tremblay" function="sender">
     <argument value="3"/>       <!-- Number of tasks -->
-    <argument value="498E6"/> <!-- Communication size of tasks -->
+    <argument value="482117300"/> <!-- Communication size of tasks -->
     <argument value="1"/>       <!-- Sleep_start_time -->
     <argument value="0"/>       <!-- Time for test -->
   </actor>

diff --git a/examples/c/async-wait/async-wait_d.xml b/examples/c/async-wait/async-wait_d.xml
index f46d5df..671064f 100644 (file)
--- a/examples/c/async-wait/async-wait_d.xml
+++ b/examples/c/async-wait/async-wait_d.xml
@@ -4,7 +4,7 @@
   <!-- The master actor (with some arguments) -->
   <actor host="Tremblay" function="sender">
     <argument value="3"/>     <!-- Number of messages -->
-    <argument value="498E6"/> <!-- message size -->
+    <argument value="482117300"/> <!-- message size -->
     <argument value="5"/>     <!-- Sleep_start_time -->
     <argument value="0.1"/>   <!-- Time for test -->
   </actor>

diff --git a/examples/s4u/async-wait/s4u-async-wait.cpp b/examples/s4u/async-wait/s4u-async-wait.cpp
index 1270435..0673125 100644 (file)
--- a/examples/s4u/async-wait/s4u-async-wait.cpp
+++ b/examples/s4u/async-wait/s4u-async-wait.cpp
@@ -37,10 +37,9 @@ static void sender(int argc, char** argv)
     // It will be destroyed when this actor leaves the loop, ie before the receiver gets the data
     std::string* payload = new std::string(msg_content);
 
-    XBT_INFO("Send '%s' to '%s'", msg_content.c_str(), mbox->get_cname());
-
     /* Create a communication representing the ongoing communication and then */
     simgrid::s4u::CommPtr comm = mbox->put_async(payload, msg_size);
+    XBT_INFO("Send '%s' to '%s'", msg_content.c_str(), mbox->get_cname());
 
     if (sleep_test_time > 0) {   /* - "test_time" is set to 0, wait */
       while (not comm->test()) { /* - Call test() every "sleep_test_time" otherwise */

diff --git a/examples/s4u/async-wait/s4u-async-wait.tesh b/examples/s4u/async-wait/s4u-async-wait.tesh
index b09045d..f79c703 100644 (file)
--- a/examples/s4u/async-wait/s4u-async-wait.tesh
+++ b/examples/s4u/async-wait/s4u-async-wait.tesh
@@ -7,10 +7,10 @@ $ ${bindir:=.}/s4u-async-wait ${platfdir}/small_platform_fatpipe.xml s4u-async-w
 > [  0.000000] (2:receiver@Ruby) sleep_start_time : 1.000000 , sleep_test_time : 0.100000
 > [  1.000000] (2:receiver@Ruby) Wait for my first message
 > [  5.000000] (1:sender@Tremblay) Send 'Message 0' to 'receiver'
-> [  6.032879] (1:sender@Tremblay) Send 'Message 1' to 'receiver'
-> [  6.100000] (2:receiver@Ruby) I got a 'Message 0'.
-> [  7.132879] (1:sender@Tremblay) Send 'Message 2' to 'receiver'
-> [  7.200000] (2:receiver@Ruby) I got a 'Message 1'.
-> [  8.232879] (1:sender@Tremblay) Send 'finalize' to 'receiver'
-> [  8.300000] (2:receiver@Ruby) I got a 'Message 2'.
-> [  8.400000] (2:receiver@Ruby) I got a 'finalize'.
\ No newline at end of file
+> [  6.000000] (2:receiver@Ruby) I got a 'Message 0'.
+> [  6.000000] (1:sender@Tremblay) Send 'Message 1' to 'receiver'
+> [  7.000000] (2:receiver@Ruby) I got a 'Message 1'.
+> [  7.000000] (1:sender@Tremblay) Send 'Message 2' to 'receiver'
+> [  8.000000] (1:sender@Tremblay) Send 'finalize' to 'receiver'
+> [  8.000000] (2:receiver@Ruby) I got a 'Message 2'.
+> [  8.100000] (2:receiver@Ruby) I got a 'finalize'.

diff --git a/examples/s4u/async-wait/s4u-async-wait_d.xml b/examples/s4u/async-wait/s4u-async-wait_d.xml
index e32b86c..eb1320e 100644 (file)
--- a/examples/s4u/async-wait/s4u-async-wait_d.xml
+++ b/examples/s4u/async-wait/s4u-async-wait_d.xml
@@ -4,7 +4,7 @@
   <!-- The sender actor (with some arguments) -->
   <actor host="Tremblay" function="sender">
     <argument value="3"/>       <!-- Number of messages -->
-    <argument value="498E6"/>  <!-- Message size -->
+    <argument value="482117300"/>  <!-- Message size -->
   </actor>
   <!-- The receiver actor -->
   <actor host="Ruby" function="receiver">