X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7a88aaebc691f91b16cd08b2d9ca1595790648b8..97f49b8e3b5b7a086ab06ee41ddc24bcdb3b5a6f:/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 1b83b80c44..97bc3fd608 100644 --- 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?"); } @@ -133,9 +133,9 @@ static void test_sleep_restart_end() 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); - all_hosts[1]->turn_on(); + simgrid::s4u::this_actor::sleep_for(9); xbt_assert(sleeper_done, "Not sure of how the actor survived the shutdown of its host."); + all_hosts[1]->turn_on(); } static void test_exec() { @@ -147,7 +147,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?"); } @@ -226,7 +226,7 @@ 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"); } @@ -250,7 +250,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"); } @@ -266,7 +266,6 @@ static void test_comm_dsend_and_quit_put_before_get() char* payload = xbt_strdup("toto"); simgrid::s4u::Mailbox::by_name("mb")->put_init(payload, 1000)->detach(); dsend_done = true; - return; }); simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() { @@ -275,7 +274,6 @@ static void test_comm_dsend_and_quit_put_before_get() void* payload = simgrid::s4u::Mailbox::by_name("mb")->get(); xbt_free(payload); recv_done = true; - return; }); // Sleep long enough to let the test ends by itself. 3 + surf_precision should be enough. @@ -296,7 +294,6 @@ static void test_comm_dsend_and_quit_get_before_put() simgrid::s4u::this_actor::sleep_for(2); simgrid::s4u::Mailbox::by_name("mb")->put_init(payload, 1000)->detach(); dsend_done = true; - return; }); simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() { @@ -304,7 +301,6 @@ static void test_comm_dsend_and_quit_get_before_put() void* payload = simgrid::s4u::Mailbox::by_name("mb")->get(); xbt_free(payload); recv_done = true; - return; }); // Sleep long enough to let the test ends by itself. 3 + surf_precision should be enough. @@ -366,10 +362,6 @@ static void test_host_off_while_receive() assert_exit(true, 1); try { simgrid::s4u::Mailbox::by_name("mb")->get(); - } catch (simgrid::HostFailureException const&) { - // Shouldn't get in here - in_catch_before_on_exit = not in_on_exit; - in_catch_after_on_exit = in_on_exit; } catch (simgrid::NetworkFailureException const&) { // Shouldn't get in here in_catch_before_on_exit = not in_on_exit; @@ -408,8 +400,133 @@ static void test_host_off_while_receive() xbt_assert(not returned_from_main, "Receiver returned from main normally even though its host was killed"); xbt_assert(send_done, "Sender killed somehow. It shouldn't"); + receiver->get_host()->turn_on(); } +static void test_link_off_helper(double delay) +{ + const double start = simgrid::s4u::Engine::get_clock(); + + simgrid::s4u::ActorPtr receiver = simgrid::s4u::Actor::create("receiver", all_hosts[1], [&start]() { + assert_exit(false, 9); + double milestone[5] = {0.5, 3.5, 4.5, 7.5, 9.0}; + for (int i = 0; i < 5; i++) + milestone[i] += start; + for (int i = 0; i < 4; i++) { + simgrid::s4u::this_actor::sleep_until(milestone[i]); + try { + XBT_VERB("get(%c)", 'A' + i); + simgrid::s4u::Mailbox::by_name("mb")->get(); + return; + } catch (simgrid::NetworkFailureException const&) { + XBT_VERB("got expected NetworkFailureException"); + } + } + simgrid::s4u::this_actor::sleep_until(milestone[4]); + }); + + simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[2], [&start]() { + assert_exit(false, 9); + int data = 42; + double milestone[5] = {1.5, 2.5, 5.5, 6.5, 9.0}; + for (int i = 0; i < 5; i++) + milestone[i] += start; + for (int i = 0; i < 2; i++) { + simgrid::s4u::this_actor::sleep_until(milestone[i]); + XBT_VERB("dsend(%c)", 'A' + i); + simgrid::s4u::Mailbox::by_name("mb")->put_init(&data, 100000)->detach(); + } + for (int i = 2; i < 4; i++) { + simgrid::s4u::this_actor::sleep_until(milestone[i]); + try { + XBT_VERB("put(%c)", 'A' + i); + simgrid::s4u::Mailbox::by_name("mb")->put(&data, 100000); + return; + } catch (simgrid::NetworkFailureException const&) { + XBT_VERB("got expected NetworkFailureException"); + } + } + simgrid::s4u::this_actor::sleep_until(milestone[4]); + }); + + for (int i = 0; i < 4; i++) { + XBT_VERB("##### %d / 4 #####", i + 1); + simgrid::s4u::this_actor::sleep_for(delay); + XBT_VERB("link off"); + simgrid::s4u::Link::by_name("link1")->turn_off(); + simgrid::s4u::this_actor::sleep_for(2.0 - delay); + XBT_VERB("link on"); + simgrid::s4u::Link::by_name("link1")->turn_on(); + } + simgrid::s4u::this_actor::sleep_for(1.5); +} + +static void test_link_off_before_send_recv() +{ + XBT_INFO("%s: try to communicate with communicating link turned off before start", __func__); + test_link_off_helper(0.0); +} +static void test_link_off_between_send_recv() +{ + XBT_INFO("%s: try to communicate with communicating link turned off between send and receive", __func__); + test_link_off_helper(1.0); +} +static void test_link_off_during_transfer() +{ + XBT_INFO("%s: try to communicate with communicating link turned off during transfer", __func__); + test_link_off_helper(2.0); +} + +static void test_link_off_during_wait_any() +{ + simgrid::s4u::ActorPtr receiver = simgrid::s4u::Actor::create("receiver", all_hosts[1], []() { + assert_exit(false, 2); + bool receiver_got_network_failure_execution = false; + bool receiver_got_base_execution = false; + int *data; + std::vector pending_comms; + simgrid::s4u::CommPtr comm = simgrid::s4u::Mailbox::by_name("mb")->get_async((void**)&data); + pending_comms.push_back(comm); + try { + simgrid::s4u::Comm::wait_any(&pending_comms); + } catch (simgrid::NetworkFailureException const&) { + XBT_VERB("got expected NetworkFailureException"); + receiver_got_network_failure_execution = true; + } catch (simgrid::Exception const&) { + XBT_VERB("got unexpected base Exception"); + receiver_got_base_execution = true; + } + xbt_assert(receiver_got_network_failure_execution, "The receiver should have gotten a NetworkFailureException"); + xbt_assert(not receiver_got_base_execution, "The receiver should not have gotten a base Exception"); + }); + + simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[2], []() { + assert_exit(false, 2); + int data = 42; + bool sender_got_network_failure_execution = false; + bool sender_got_base_execution = false; + try { + simgrid::s4u::Mailbox::by_name("mb")->put(&data, 100000); + } catch (simgrid::NetworkFailureException const&) { + XBT_VERB("got expected NetworkFailureException"); + sender_got_network_failure_execution = true; + } catch (simgrid::Exception const&) { + XBT_VERB("got unexpected base Exception"); + sender_got_base_execution = true; + } + xbt_assert(sender_got_network_failure_execution, "The sender should have gotten a NetworkFailureException"); + xbt_assert(not sender_got_base_execution, "The sender should not have gotten a base Exception"); + }); + + simgrid::s4u::this_actor::sleep_for(2.0); + XBT_VERB("link off"); + simgrid::s4u::Link::by_name("link1")->turn_off(); + simgrid::s4u::this_actor::sleep_for(2.0); + XBT_VERB("link on"); + simgrid::s4u::Link::by_name("link1")->turn_on(); +} + + /* We need an extra actor here, so that it can sleep until the end of each test */ static void main_dispatcher() { @@ -435,6 +552,10 @@ static void main_dispatcher() run_test("comm kill sender", test_comm_killsend); run_test("comm recv and kill", test_host_off_while_receive); + run_test("comm turn link off before send/recv", test_link_off_before_send_recv); + run_test("comm turn link off between send/recv", test_link_off_between_send_recv); + run_test("comm turn link off during transfer", test_link_off_during_transfer); + run_test("comm turn link off during wait_any", test_link_off_during_wait_any); } int main(int argc, char* argv[])