Fix copyright headers

[simgrid.git] / examples / msg / masterslave / masterslave_failure.c

diff --git a/examples/msg/masterslave/masterslave_failure.c b/examples/msg/masterslave/masterslave_failure.c
index 53d1116..330250d 100644 (file)
--- a/examples/msg/masterslave/masterslave_failure.c
+++ b/examples/msg/masterslave/masterslave_failure.c
@@ -1,6 +1,5 @@
-/*     $Id$     */
-
-/* Copyright (c) 2002,2003,2004 Arnaud Legrand. All rights reserved.        */
+/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+ * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -86,6 +85,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) {
+      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 +111,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) {
+      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);
@@ -172,10 +181,9 @@ MSG_error_t test_all(const char *platform_file, const char *application_file)
 {
   MSG_error_t res = MSG_OK;
 
-  /* MSG_config("workstation_model","KCCFLN05"); */
+  /* MSG_config("workstation/model","KCCFLN05"); */
   {                             /*  Simulation setting */
     MSG_set_channel_number(MAX_CHANNEL);
-    MSG_paje_output("msg_test.trace");
     MSG_create_environment(platform_file);
   }
   {                             /*   Application deployment */