From 9d93f1f7008b6be219673d74a52e409210a0ddfc Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 24 Jun 2019 17:02:29 +0200 Subject: [PATCH] Add test for FG simgrid/simgrid#26. --- .../activity-lifecycle/activity-lifecycle.cpp | 34 +++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp index f324b173df..d5ae2d2834 100644 --- a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp +++ b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp @@ -394,6 +394,7 @@ static void test_host_off_while_receive() // Note: If we don't sleep here, we don't "see" the bug simgrid::s4u::this_actor::sleep_for(1); + receiver->get_host()->turn_on(); // switch host on again xbt_assert(in_on_exit, "Receiver's on_exit function was never called"); @@ -406,6 +407,38 @@ static void test_host_off_while_receive() xbt_assert(send_done, "Sender killed somehow. It shouldn't"); } +static void test_link_off() +{ + XBT_INFO("%s: Launch an actor that waits on a recv, turn communicating link off", __func__); + bool sender_got_exception = false; + bool receiver_got_exception = false; + + simgrid::s4u::ActorPtr receiver = simgrid::s4u::Actor::create("receiver", all_hosts[1], [&receiver_got_exception]() { + assert_exit(false, 1); + try { + simgrid::s4u::Mailbox::by_name("mb")->get(); + } catch (simgrid::NetworkFailureException const&) { + receiver_got_exception = true; + } + }); + + simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[2], [&sender_got_exception]() { + assert_exit(false, 1); + try { + int data = 42; + simgrid::s4u::Mailbox::by_name("mb")->put(&data, 100000); + } catch (simgrid::NetworkFailureException const&) { + sender_got_exception = true; + } + }); + + simgrid::s4u::this_actor::sleep_for(1); + simgrid::s4u::Link::by_name("link1")->turn_off(); + simgrid::s4u::Link::by_name("link1")->turn_on(); + xbt_assert(receiver_got_exception, "Receiver should have caught a NetworkFailureException"); + xbt_assert(sender_got_exception, "Sender should have caught a NetworkFailureException"); +} + /* We need an extra actor here, so that it can sleep until the end of each test */ static void main_dispatcher() { @@ -431,6 +464,7 @@ 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", test_link_off); } int main(int argc, char* argv[]) -- 2.20.1