Add test in activity-lifecycle turning off its own host.

[simgrid.git] / teshsuite / s4u / activity-lifecycle / activity-lifecycle.cpp

diff --git a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
index 8443888a522959b18823dd9a920a6c3046f04812..783367f8e376959c8e768f53a12c46eb4d77f247 100644 (file)
--- a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
+++ b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
@@ -59,7 +59,7 @@ static void test_sleep()
     simgrid::s4u::this_actor::sleep_for(5);
     global = true;
   });
-  simgrid::s4u::this_actor::sleep_for(10);
+  simgrid::s4u::this_actor::sleep_for(9);
   xbt_assert(global, "The forked actor did not modify the global after sleeping. Was it killed before?");
 }
 
@@ -122,21 +122,28 @@ static void test_sleep_restart_middle()
   sleeper5->get_host()->turn_on();
   XBT_INFO("Test %s is ending", __func__);
 }
+
 static void test_sleep_restart_end()
 {
   XBT_INFO("%s: Launch a sleep(5), and restart its host right when it stops", __func__);
   bool sleeper_done = false;
 
   simgrid::s4u::Actor::create("sleep5_restarted", all_hosts[1], [&sleeper_done]() {
-    assert_exit(true, 5);
+    assert_exit(false, 5);
     simgrid::s4u::this_actor::sleep_for(5);
-    all_hosts[1]->turn_off(); // kill the host right at the end of this sleep and of this actor
     sleeper_done = true;
   });
-  simgrid::s4u::this_actor::sleep_for(10);
-  xbt_assert(sleeper_done, "Not sure of how the actor survived the shutdown of its host.");
-  all_hosts[1]->turn_on();
+  simgrid::s4u::Actor::create("killer", all_hosts[0], []() {
+    simgrid::s4u::this_actor::sleep_for(5);
+    XBT_INFO("Killer!");
+    all_hosts[1]->turn_off();
+    all_hosts[1]->turn_on();
+  });
+  simgrid::s4u::this_actor::sleep_for(9);
+  xbt_assert(sleeper_done,
+             "Restarted actor was already dead in the scheduling round during which the host_off simcall was issued");
 }
+
 static void test_exec()
 {
   XBT_INFO("%s: Launch a execute(5s), and let it proceed", __func__);
@@ -147,7 +154,7 @@ static void test_exec()
     simgrid::s4u::this_actor::execute(500000000);
     global = true;
   });
-  simgrid::s4u::this_actor::sleep_for(10);
+  simgrid::s4u::this_actor::sleep_for(9);
   xbt_assert(global, "The forked actor did not modify the global after executing. Was it killed before?");
 }
 
@@ -210,6 +217,7 @@ static void test_exec_restart_middle()
   exec5->get_host()->turn_on();
   XBT_INFO("Test %s is ending", __func__);
 }
+
 static void test_exec_restart_end()
 {
   XBT_INFO("%s: Launch a execute(5s), and restart its host right when it stops", __func__);
@@ -226,11 +234,26 @@ static void test_exec_restart_end()
     all_hosts[1]->turn_off();
     all_hosts[1]->turn_on();
   });
-  simgrid::s4u::this_actor::sleep_for(10);
+  simgrid::s4u::this_actor::sleep_for(9);
   xbt_assert(execution_done,
              "Restarted actor was already dead in the scheduling round during which the host_off simcall was issued");
 }
 
+static void test_turn_off_itself()
+{
+  XBT_INFO("%s: Launch a sleep(5), then saw off the branch it's sitting on", __func__);
+
+  simgrid::s4u::Actor::create("sleep5_restarted", all_hosts[1], []() {
+    assert_exit(true, 5);
+    simgrid::s4u::this_actor::sleep_for(5);
+    simgrid::s4u::this_actor::get_host()->turn_off();
+    xbt_die("I should be dead now");
+  });
+  simgrid::s4u::this_actor::sleep_for(9);
+  all_hosts[1]->turn_on();
+  XBT_INFO("Test %s is ending", __func__);
+}
+
 static void test_comm()
 {
   XBT_INFO("%s: Launch a communication", __func__);
@@ -250,7 +273,7 @@ static void test_comm()
     recv_done = true;
   });
 
-  simgrid::s4u::this_actor::sleep_for(10);
+  simgrid::s4u::this_actor::sleep_for(9);
   xbt_assert(send_done, "Sender killed somehow. It shouldn't");
   xbt_assert(recv_done, "Receiver killed somehow. It shouldn't");
 }
@@ -537,7 +560,7 @@ static void main_dispatcher()
    * to avoid that they exit before their victim dereferences their name */
   run_test("sleep restarted at start", test_sleep_restart_begin);
   run_test("sleep restarted in middle", test_sleep_restart_middle);
-  // run_test("sleep restarted at end", test_sleep_restart_end);
+  run_test("sleep restarted at end", test_sleep_restart_end);
 
   run_test("exec", test_exec);
   run_test("exec killed at start", test_exec_kill_begin);
@@ -546,6 +569,8 @@ static void main_dispatcher()
   run_test("exec restarted in middle", test_exec_restart_middle);
   run_test("exec restarted at end", test_exec_restart_end);
 
+  run_test("turn off its own host", test_turn_off_itself);
+
   run_test("comm", test_comm);
   run_test("comm dsend and quit (put before get)", test_comm_dsend_and_quit_put_before_get);
   run_test("comm dsend and quit (get before put)", test_comm_dsend_and_quit_get_before_put);