X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1b4f0ecf22879a1152f7b5fbcbf7bcdb416d21da..eebc82491dfb1764ca8a9069e5ab662b3ccc70fd:/teshsuite/msg/host_on_off_processes/host_on_off_processes.cpp

diff --git a/teshsuite/msg/host_on_off_processes/host_on_off_processes.cpp b/teshsuite/msg/host_on_off_processes/host_on_off_processes.cpp
index c2ec3201ad..242697bd3f 100644
--- a/teshsuite/msg/host_on_off_processes/host_on_off_processes.cpp
+++ b/teshsuite/msg/host_on_off_processes/host_on_off_processes.cpp
@@ -1,10 +1,10 @@
-/* Copyright (c) 2010-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2010-2019. 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. */
 
+#include "simgrid/Exception.hpp"
 #include "simgrid/msg.h"
-#include <xbt/ex.hpp>
 
 #include <stdio.h> /* sscanf */
 
@@ -19,7 +19,7 @@ static void task_cleanup_handler(void* task)
     MSG_task_destroy(static_cast<msg_task_t>(task));
 }
 
-static int process_daemon(int argc, char* argv[])
+static int process_daemon(int /*argc*/, char** /*argv*/)
 {
   msg_process_t self = MSG_process_self();
   XBT_INFO("  Start daemon on %s (%f)", MSG_host_get_name(MSG_host_self()), MSG_host_get_speed(MSG_host_self()));
@@ -27,26 +27,19 @@ static int process_daemon(int argc, char* argv[])
     msg_task_t task = MSG_task_create("daemon", MSG_host_get_speed(MSG_host_self()), 0, NULL);
     MSG_process_set_data(self, task);
     XBT_INFO("  Execute daemon");
-    MSG_task_execute(task);
-    MSG_process_set_data(self, NULL);
+    msg_error_t res = MSG_task_execute(task);
     MSG_task_destroy(task);
     tasks_done++;
+    if (res == MSG_HOST_FAILURE) {
+      XBT_INFO("Host has died as expected, do nothing else");
+      return 0;
+    }
   }
   XBT_INFO("  daemon done. See you!");
   return 0;
 }
 
-static int process_sleep(int argc, char* argv[])
-{
-  for (;;) {
-    XBT_INFO("  I'm alive but I should sleep");
-    MSG_process_sleep(10);
-  }
-  XBT_INFO("  I'm done. See you!");
-  return 0;
-}
-
-static int commTX(int argc, char* argv[])
+static int commTX(int /*argc*/, char** /*argv*/)
 {
   const char* mailbox = "comm";
   XBT_INFO("  Start TX");
@@ -55,19 +48,14 @@ static int commTX(int argc, char* argv[])
   // We should wait a bit (if not the process will end before the communication, hence an exception on the other side).
   try {
     MSG_process_sleep(30);
-  } catch (xbt_ex& e) {
-    if (e.category == host_error) {
-      XBT_INFO("The host has died ... as expected.");
-    } else {
-      XBT_ERROR("An unexpected exception has been raised.");
-      throw;
-    }
+  } catch (simgrid::HostFailureException& e) {
+    XBT_INFO("The host has died ... as expected.");
   }
   XBT_INFO("  TX done");
   return 0;
 }
 
-static int commRX(int argc, char* argv[])
+static int commRX(int /*argc*/, char** /*argv*/)
 {
   msg_task_t task     = NULL;
   const char* mailbox = "comm";
@@ -79,15 +67,15 @@ static int commRX(int argc, char* argv[])
   } else if (error == MSG_HOST_FAILURE) {
     XBT_INFO("  Receive message: HOST_FAILURE");
   } else if (error == MSG_TRANSFER_FAILURE) {
-    XBT_INFO("  Receive message: TRANSFERT_FAILURE");
+    XBT_INFO("  Receive message: TRANSFER_FAILURE");
   } else {
-    XBT_INFO("  Receive message: %u", error);
+    XBT_INFO("  Receive message: %u", static_cast<unsigned int>(error));
   }
   XBT_INFO("  RX Done");
   return 0;
 }
 
-static int test_launcher(int argc, char* argv[])
+static int test_launcher(int /*argc*/, char** /*argv*/)
 {
   int test = 0;
   char** argvF;
@@ -137,17 +125,7 @@ static int test_launcher(int argc, char* argv[])
   test = 3;
   // Create a process running sucessive sleeps on a host and turn the host off during the execution of the process.
   if (xbt_dynar_search_or_negative(tests, &test) != -1) {
-    XBT_INFO("Test 3:");
-    MSG_host_on(jupiter);
-    argvF    = xbt_new(char*, 2);
-    argvF[0] = xbt_strdup("process_sleep");
-    MSG_process_create_with_arguments("process_sleep", process_sleep, NULL, jupiter, 1, argvF);
-    MSG_process_sleep(100);
-    XBT_INFO("  Turn off");
-    MSG_host_off(jupiter);
-    XBT_INFO("  sleep for 10 seconds");
-    MSG_process_sleep(10000);
-    XBT_INFO("number of Process : %d it should be 1 (i.e. the Test one))", MSG_process_get_number());
+    xbt_die("Test 3 is superseeded by activity-lifecycle");
   }
 
   test = 4;
@@ -247,7 +225,6 @@ int main(int argc, char* argv[])
 
   MSG_create_environment(argv[1]);
 
-  MSG_process_set_data_cleanup(task_cleanup_handler);
   MSG_process_create("test_launcher", test_launcher, NULL, MSG_get_host_by_name("Tremblay"));
 
   res = MSG_main();