X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/937f2eb5b429c3c03fc989a25fbc26fabd0cf529..9f5732b35067b725950b05551481179bbb378ea1:/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp

diff --git a/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp b/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp
index 47e132a9e1..cc861427e3 100644
--- a/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp
+++ b/teshsuite/s4u/actor-autorestart/actor-autorestart.cpp
@@ -1,36 +1,43 @@
-/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-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/s4u.hpp"
-#include <xbt/ex.hpp>
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example");
 
 static void dummy()
 {
   XBT_INFO("I start");
-  try {
     simgrid::s4u::this_actor::sleep_for(200);
     XBT_INFO("I stop");
-  } catch (xbt_ex& e) {
-    if (e.category == host_error) {
-      XBT_DEBUG("The host has died ... as expected. This actor silently stops");
-    } else {
-      XBT_ERROR("An unexpected exception has been raised.");
-      throw;
-    }
+}
+
+static void dummy_daemon()
+{
+  simgrid::s4u::Actor::self()->daemonize();
+  while (1) {
+    XBT_INFO("Hello from the infinite loop");
+    simgrid::s4u::this_actor::sleep_for(80.0);
   }
 }
 
 static void autostart()
 {
   simgrid::s4u::Host* host = simgrid::s4u::Host::by_name("Fafard");
-  XBT_INFO("starting a dummy process on %s ", host->get_cname());
 
+  XBT_INFO("starting a dummy process on %s", host->get_cname());
   simgrid::s4u::ActorPtr dummy_actor = simgrid::s4u::Actor::create("Dummy", host, dummy);
+  dummy_actor->on_exit([](bool) { XBT_INFO("On_exit callback set before autorestart"); });
   dummy_actor->set_auto_restart(true);
+  dummy_actor->on_exit([](bool) { XBT_INFO("On_exit callback set after autorestart"); });
+
+  XBT_INFO("starting a daemon process on %s", host->get_cname());
+  simgrid::s4u::ActorPtr daemon_actor = simgrid::s4u::Actor::create("Daemon", host, dummy_daemon);
+  daemon_actor->on_exit([](bool) { XBT_INFO("On_exit callback set before autorestart"); });
+  daemon_actor->set_auto_restart(true);
+  daemon_actor->on_exit([](bool) { XBT_INFO("On_exit callback set after autorestart"); });
 
   simgrid::s4u::this_actor::sleep_for(50);