Adapt tests to the fact that we can now detect that there was a timeout during commun...

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

diff --git a/examples/msg/masterslave/masterslave_cpu_ti.tesh b/examples/msg/masterslave/masterslave_cpu_ti.tesh
index 1990b02..d651592 100644 (file)
--- a/examples/msg/masterslave/masterslave_cpu_ti.tesh
+++ b/examples/msg/masterslave/masterslave_cpu_ti.tesh
@@ -292,7 +292,7 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 > [Jupiter:slave:(3) 0.165962] [msg_test/INFO] Processing "Task"
 > [Jupiter:slave:(3) 0.821304] [msg_test/INFO] "Task" done
 > [Jupiter:slave:(3) 1.100000] [msg_test/INFO] Gloups. The cpu on which I'm running just turned off!. See you!
-> [Tremblay:master:(1) 10.165962] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 10.165962] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [Ginette:slave:(4) 10.306421] [msg_test/INFO] Received "Task"
 > [Ginette:slave:(4) 10.306421] [msg_test/INFO] Communication time : "0.140460"
 > [Ginette:slave:(4) 10.306421] [msg_test/INFO] Processing "Task"
@@ -308,8 +308,8 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 > [Tremblay:slave:(2) 11.034342] [msg_test/INFO] "Task" done
 > [Ginette:slave:(4) 11.337519] [msg_test/INFO] "Task" done
 > [Bourassa:slave:(5) 11.553392] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 20.524632] [msg_test/INFO] Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
-> [Tremblay:master:(1) 30.524632] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 20.524632] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 30.524632] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [Ginette:slave:(4) 30.524632] [msg_test/INFO] Mmh. Something went wrong. Nevermind. Let's keep going!
 > [Tremblay:master:(1) 30.524632] [msg_test/INFO] Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!
 > [Bourassa:slave:(5) 30.740505] [msg_test/INFO] Received "Task"
@@ -322,8 +322,8 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 > [Tremblay:master:(1) 30.742843] [msg_test/INFO] Send completed
 > [Tremblay:slave:(2) 31.252553] [msg_test/INFO] "Task" done
 > [Bourassa:slave:(5) 31.771603] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 40.742843] [msg_test/INFO] Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
-> [Tremblay:master:(1) 50.742843] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 40.742843] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 50.742843] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [Ginette:slave:(4) 50.883303] [msg_test/INFO] Received "Task"
 > [Ginette:slave:(4) 50.883303] [msg_test/INFO] Communication time : "0.140460"
 > [Ginette:slave:(4) 50.883303] [msg_test/INFO] Processing "Task"
@@ -339,8 +339,8 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 > [Tremblay:slave:(2) 51.611224] [msg_test/INFO] "Task" done
 > [Ginette:slave:(4) 51.914401] [msg_test/INFO] "Task" done
 > [Bourassa:slave:(5) 52.130273] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 61.101514] [msg_test/INFO] Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
-> [Tremblay:master:(1) 71.101514] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 61.101514] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 71.101514] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [Ginette:slave:(4) 71.241973] [msg_test/INFO] Received "Task"
 > [Ginette:slave:(4) 71.241973] [msg_test/INFO] Communication time : "0.140460"
 > [Ginette:slave:(4) 71.241973] [msg_test/INFO] Processing "Task"
@@ -356,9 +356,9 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 > [Tremblay:master:(1) 71.460184] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
 > [Tremblay:slave:(2) 71.969894] [msg_test/INFO] "Task" done
 > [Ginette:slave:(4) 72.273071] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 72.460184] [msg_test/INFO] Mmh. Can't reach 'Jupiter'! Nevermind. Let's keep going!
+> [Tremblay:master:(1) 72.460184] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
 > [Bourassa:slave:(5) 72.488944] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 73.460184] [msg_test/INFO] Mmh. Can't reach 'Fafard'! Nevermind. Let's keep going!
+> [Tremblay:master:(1) 73.460184] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [Ginette:slave:(4) 73.473416] [msg_test/INFO] Received "finalize"
 > [Ginette:slave:(4) 73.473416] [msg_test/INFO] I'm done. See you!
 > [Bourassa:slave:(5) 73.493752] [msg_test/INFO] Received "finalize"

diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c
index 53d1116..dae8413 100644 (file)
--- a/examples/msg/masterslave/masterslave_failure.c
+++ b/examples/msg/masterslave/masterslave_failure.c
@@ -86,6 +86,11 @@ int master(int argc, char *argv[])
         ("Mmh. Something went wrong with '%s'. Nevermind. Let's keep going!",
          slaves[i % slaves_count]->name);
       MSG_task_destroy(task);
+    } else if (a == MSG_TIMEOUT_FAILURE) {
+      INFO1
+        ("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_assert0(0, "Unexpected behavior");
@@ -107,6 +112,11 @@ int master(int argc, char *argv[])
       INFO1("Mmh. Can't reach '%s'! Nevermind. Let's keep going!",
             slaves[i]->name);
       MSG_task_destroy(task);
+    } else if (a == MSG_TIMEOUT_FAILURE) {
+      INFO1
+        ("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);

diff --git a/examples/msg/masterslave/masterslave_failure.tesh b/examples/msg/masterslave/masterslave_failure.tesh
index 582b8c8..c72f58b 100644 (file)
--- a/examples/msg/masterslave/masterslave_failure.tesh
+++ b/examples/msg/masterslave/masterslave_failure.tesh
@@ -17,7 +17,7 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 > [Jupiter:slave:(3) 0.165962] [msg_test/INFO] Processing "Task"
 > [Jupiter:slave:(3) 0.821304] [msg_test/INFO] "Task" done
 > [Jupiter:slave:(3) 1.100000] [msg_test/INFO] Gloups. The cpu on which I'm running just turned off!. See you!
-> [Tremblay:master:(1) 10.165962] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 10.165962] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [Ginette:slave:(4) 10.306421] [msg_test/INFO] Received "Task"
 > [Ginette:slave:(4) 10.306421] [msg_test/INFO] Communication time : "0.140460"
 > [Ginette:slave:(4) 10.306421] [msg_test/INFO] Processing "Task"
@@ -33,8 +33,8 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 > [Tremblay:slave:(2) 11.034342] [msg_test/INFO] "Task" done
 > [Ginette:slave:(4) 11.337519] [msg_test/INFO] "Task" done
 > [Bourassa:slave:(5) 11.553392] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 20.524632] [msg_test/INFO] Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
-> [Tremblay:master:(1) 30.524632] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 20.524632] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 30.524632] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [Ginette:slave:(4) 30.524632] [msg_test/INFO] Mmh. Something went wrong. Nevermind. Let's keep going!
 > [Tremblay:master:(1) 30.524632] [msg_test/INFO] Mmh. Something went wrong with 'Ginette'. Nevermind. Let's keep going!
 > [Bourassa:slave:(5) 30.740505] [msg_test/INFO] Received "Task"
@@ -47,8 +47,8 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 > [Tremblay:master:(1) 30.742843] [msg_test/INFO] Send completed
 > [Tremblay:slave:(2) 31.252553] [msg_test/INFO] "Task" done
 > [Bourassa:slave:(5) 31.771603] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 40.742843] [msg_test/INFO] Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
-> [Tremblay:master:(1) 50.742843] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 40.742843] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 50.742843] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [Ginette:slave:(4) 50.883303] [msg_test/INFO] Received "Task"
 > [Ginette:slave:(4) 50.883303] [msg_test/INFO] Communication time : "0.140460"
 > [Ginette:slave:(4) 50.883303] [msg_test/INFO] Processing "Task"
@@ -64,8 +64,8 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 > [Tremblay:slave:(2) 51.611224] [msg_test/INFO] "Task" done
 > [Ginette:slave:(4) 51.914401] [msg_test/INFO] "Task" done
 > [Bourassa:slave:(5) 52.130273] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 61.101514] [msg_test/INFO] Mmh. Something went wrong with 'Jupiter'. Nevermind. Let's keep going!
-> [Tremblay:master:(1) 71.101514] [msg_test/INFO] Mmh. Something went wrong with 'Fafard'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 61.101514] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
+> [Tremblay:master:(1) 71.101514] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [Ginette:slave:(4) 71.241973] [msg_test/INFO] Received "Task"
 > [Ginette:slave:(4) 71.241973] [msg_test/INFO] Communication time : "0.140460"
 > [Ginette:slave:(4) 71.241973] [msg_test/INFO] Processing "Task"
@@ -81,9 +81,9 @@ $ masterslave/masterslave_failure$EXEEXT --log=xbt_cfg.thres:critical --log=no_l
 > [Tremblay:master:(1) 71.460184] [msg_test/INFO] All tasks have been dispatched. Let's tell everybody the computation is over.
 > [Tremblay:slave:(2) 71.969894] [msg_test/INFO] "Task" done
 > [Ginette:slave:(4) 72.273071] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 72.460184] [msg_test/INFO] Mmh. Can't reach 'Jupiter'! Nevermind. Let's keep going!
+> [Tremblay:master:(1) 72.460184] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Jupiter'. Nevermind. Let's keep going!
 > [Bourassa:slave:(5) 72.488944] [msg_test/INFO] "Task" done
-> [Tremblay:master:(1) 73.460184] [msg_test/INFO] Mmh. Can't reach 'Fafard'! Nevermind. Let's keep going!
+> [Tremblay:master:(1) 73.460184] [msg_test/INFO] Mmh. Got timeouted while speaking to 'Fafard'. Nevermind. Let's keep going!
 > [Ginette:slave:(4) 73.473416] [msg_test/INFO] Received "finalize"
 > [Ginette:slave:(4) 73.473416] [msg_test/INFO] I'm done. See you!
 > [Bourassa:slave:(5) 73.493752] [msg_test/INFO] Received "finalize"