X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/44435b66a66ee92b51d4ec78793c78ed6940b79b..42afbb18f9de5f512fd9edef52d2676d279f5ef7:/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 84a471f642..08059e8b70 100644 --- a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp +++ b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp @@ -12,20 +12,18 @@ XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_test, "Messages specific for this s4u example") std::vector all_hosts; /* Helper function easing the testing of actor's ending condition */ -static void assert_exit(int status, double duration) +static void assert_exit(bool exp_failed, double duration) { double expected_time = simgrid::s4u::Engine::get_clock() + duration; - simgrid::s4u::this_actor::on_exit( - [status, expected_time](int got_status, void* /*ignored*/) { - xbt_assert(status == got_status, "Exit status mismatch. Expected %d, got %d", status, got_status); - xbt_assert(std::fabs(expected_time - simgrid::s4u::Engine::get_clock()) < 0.001, - "Exit time mismatch. Expected %f", expected_time); - XBT_VERB("Checks on exit successful"); - }, - nullptr); + simgrid::s4u::this_actor::on_exit([exp_failed, expected_time](bool got_failed) { + xbt_assert(exp_failed == got_failed, "Exit failure status mismatch. Expected %d, got %d", exp_failed, got_failed); + xbt_assert(std::fabs(expected_time - simgrid::s4u::Engine::get_clock()) < 0.001, "Exit time mismatch. Expected %f", + expected_time); + XBT_VERB("Checks on exit successful"); + }); } /* Helper function in charge of running a test and doing some sanity checks afterward */ -static void run_test(const char* test_name, std::function test) +static void run_test(const char* test_name, const std::function& test) { simgrid::s4u::Actor::create(test_name, all_hosts[0], test); simgrid::s4u::this_actor::sleep_for(10); @@ -57,7 +55,7 @@ static void test_sleep() bool global = false; simgrid::s4u::ActorPtr sleeper5 = simgrid::s4u::Actor::create("sleep5", all_hosts[1], [&global]() { - assert_exit(0, 5.); + assert_exit(false, 5.); simgrid::s4u::this_actor::sleep_for(5); global = true; }); @@ -70,7 +68,7 @@ static void test_sleep_kill_middle() XBT_INFO("%s: Launch a sleep(5), and kill it after 2 secs", __func__); simgrid::s4u::ActorPtr sleeper5 = simgrid::s4u::Actor::create("sleep5_killed", all_hosts[1], []() { - assert_exit(1, 2); + assert_exit(true, 2); simgrid::s4u::this_actor::sleep_for(5); xbt_die("I should be dead now"); }); @@ -84,7 +82,7 @@ static void test_sleep_kill_begin() XBT_INFO("%s: Launch a sleep(5), and kill it right after start", __func__); simgrid::s4u::ActorPtr sleeper5 = simgrid::s4u::Actor::create("sleep5_killed", all_hosts[1], []() { - assert_exit(1, 0); + assert_exit(true, 0); simgrid::s4u::this_actor::sleep_for(5); xbt_die("I should be dead now"); }); @@ -98,7 +96,7 @@ static void test_sleep_restart_begin() XBT_INFO("%s: Launch a sleep(5), and restart its host right after start", __func__); simgrid::s4u::ActorPtr sleeper5 = simgrid::s4u::Actor::create("sleep5_restarted", all_hosts[1], []() { - assert_exit(1, 0); + assert_exit(true, 0); simgrid::s4u::this_actor::sleep_for(5); xbt_die("I should be dead now"); }); @@ -114,7 +112,7 @@ static void test_sleep_restart_middle() XBT_INFO("%s: Launch a sleep(5), and restart its host after 2 secs", __func__); simgrid::s4u::ActorPtr sleeper5 = simgrid::s4u::Actor::create("sleep5_restarted", all_hosts[1], []() { - assert_exit(1, 2); + assert_exit(true, 2); simgrid::s4u::this_actor::sleep_for(5); xbt_die("I should be dead now"); }); @@ -130,19 +128,14 @@ static void test_sleep_restart_end() bool sleeper_done = false; simgrid::s4u::Actor::create("sleep5_restarted", all_hosts[1], [&sleeper_done]() { - assert_exit(0, 5); + assert_exit(true, 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::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(10); - xbt_assert(sleeper_done, - "Restarted actor was already dead in the scheduling round during which the host_off simcall was issued"); + all_hosts[1]->turn_on(); + xbt_assert(sleeper_done, "Not sure of how the actor survived the shutdown of its host."); } static void test_exec() { @@ -150,7 +143,7 @@ static void test_exec() bool global = false; simgrid::s4u::ActorPtr exec5 = simgrid::s4u::Actor::create("exec5", all_hosts[1], [&global]() { - assert_exit(0, 5.); + assert_exit(false, 5.); simgrid::s4u::this_actor::execute(500000000); global = true; }); @@ -163,7 +156,7 @@ static void test_exec_kill_middle() XBT_INFO("%s: Launch a execute(5s), and kill it after 2 secs", __func__); simgrid::s4u::ActorPtr exec5 = simgrid::s4u::Actor::create("exec5_killed", all_hosts[1], []() { - assert_exit(1, 2); + assert_exit(true, 2); simgrid::s4u::this_actor::execute(500000000); xbt_die("I should be dead now"); }); @@ -177,7 +170,7 @@ static void test_exec_kill_begin() XBT_INFO("%s: Launch a execute(5s), and kill it right after start", __func__); simgrid::s4u::ActorPtr exec5 = simgrid::s4u::Actor::create("exec5_killed", all_hosts[1], []() { - assert_exit(1, 0); + assert_exit(true, 0); simgrid::s4u::this_actor::execute(500000000); xbt_die("I should be dead now"); }); @@ -207,7 +200,7 @@ static void test_exec_restart_middle() XBT_INFO("%s: Launch a execute(5s), and restart its host after 2 secs", __func__); simgrid::s4u::ActorPtr exec5 = simgrid::s4u::Actor::create("exec5_restarted", all_hosts[1], []() { - assert_exit(1, 2); + assert_exit(true, 2); simgrid::s4u::this_actor::execute(500000000); xbt_die("I should be dead now"); }); @@ -223,7 +216,7 @@ static void test_exec_restart_end() bool execution_done = false; simgrid::s4u::Actor::create("exec5_restarted", all_hosts[1], [&execution_done]() { - assert_exit(0, 5); + assert_exit(false, 5); simgrid::s4u::this_actor::execute(500000000); execution_done = true; }); @@ -245,13 +238,13 @@ static void test_comm() bool recv_done = false; simgrid::s4u::Actor::create("sender", all_hosts[1], [&send_done]() { - assert_exit(0, 5); + assert_exit(false, 5); char* payload = xbt_strdup("toto"); simgrid::s4u::Mailbox::by_name("mb")->put(payload, 5000); send_done = true; }); simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() { - assert_exit(0, 5); + assert_exit(false, 5); void* payload = simgrid::s4u::Mailbox::by_name("mb")->get(); xbt_free(payload); recv_done = true; @@ -269,7 +262,7 @@ static void test_comm_dsend_and_quit() bool recv_done = false; simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[1], [&dsend_done]() { - assert_exit(0, 0); + assert_exit(false, 0); char* payload = xbt_strdup("toto"); simgrid::s4u::Mailbox::by_name("mb")->put_init(payload, 1000)->detach(); dsend_done = true; @@ -277,7 +270,7 @@ static void test_comm_dsend_and_quit() }); simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() { - assert_exit(0, 3); + assert_exit(false, 3); bool got_exception = false; simgrid::s4u::this_actor::sleep_for(2); try { @@ -304,14 +297,16 @@ static void test_comm_killsend() bool recv_done = false; simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[1], [&send_done]() { - assert_exit(1, 2); + assert_exit(true, 2); + // Encapsulate the payload in a std::unique_ptr so that it is correctly free'd when the sender is killed during its + // communication (thanks to RAII). The pointer is then released when the communication is over. std::unique_ptr payload(xbt_strdup("toto"), &xbt_free_f); simgrid::s4u::Mailbox::by_name("mb")->put(payload.get(), 5000); payload.release(); send_done = true; }); simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() { - assert_exit(0, 2); + assert_exit(false, 2); bool got_exception = false; try { void* payload = simgrid::s4u::Mailbox::by_name("mb")->get(); @@ -332,6 +327,60 @@ static void test_comm_killsend() xbt_assert(recv_done, "Receiver killed somehow. It shouldn't"); } +static void test_host_off_while_receive() +{ + XBT_INFO("%s: Launch an actor that waits on a recv, kill its host", __func__); + bool in_on_exit = false; + bool returned_from_main = false; + bool in_catch_before_on_exit = false; + bool in_catch_after_on_exit = false; + + simgrid::s4u::ActorPtr receiver = simgrid::s4u::Actor::create( + "receiver", all_hosts[1], + [&in_on_exit, &returned_from_main, &in_catch_before_on_exit, &in_catch_after_on_exit]() { + assert_exit(true, 1); + try { + // void *msg = + simgrid::s4u::Mailbox::by_name("mb")->get(); + } catch (simgrid::HostFailureException const&) { + in_catch_before_on_exit = not in_on_exit; + in_catch_after_on_exit = in_on_exit; + } catch (simgrid::NetworkFailureException const&) { + in_catch_before_on_exit = not in_on_exit; + in_catch_after_on_exit = in_on_exit; + } + returned_from_main = true; + }); + + receiver->on_exit([&in_on_exit](bool failed) { in_on_exit = true; }); + + simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create( + "sender", all_hosts[2], + []() { + try { + int data; + simgrid::s4u::Mailbox::by_name("mb")->put(&data, 100000); + } catch (simgrid::HostFailureException const&) { + } catch (simgrid::NetworkFailureException const&) { + } + }); + + simgrid::s4u::this_actor::sleep_for(1); + receiver->get_host()->turn_off(); + + // Note: If we don't sleep here, we don't "see" the bug + simgrid::s4u::this_actor::sleep_for(1); + + xbt_assert(in_on_exit, + "Receiver's on_exit function was never called"); + xbt_assert(not in_catch_before_on_exit, + "Receiver mistakenly went to catch clause (before the on_exit function was called)"); + xbt_assert(not in_catch_after_on_exit, + "Receiver mistakenly went to catch clause (after the on_exit function was called)"); + xbt_assert(not returned_from_main, + "Receiver returned from main normally even though its host was killed"); +} + /* We need an extra actor here, so that it can sleep until the end of each test */ static void main_dispatcher() { @@ -342,7 +391,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 at 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", static_cast>(test_exec)); run_test("exec killed at start", test_exec_kill_begin); @@ -354,6 +403,8 @@ static void main_dispatcher() run_test("comm", test_comm); run_test("comm dsend and quit", test_comm_dsend_and_quit); run_test("comm kill sender", test_comm_killsend); + + //run_test("comm recv and kill", test_host_off_while_receive); } int main(int argc, char* argv[])