X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/65a65222d323e2f8927a1e6738edda6f4673af0c..0564c942642d204173fe46bbc110489adfe3579d:/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 e29d62a150..26da7744bb 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<simgrid::s4u::Host*> 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<void()> test)
+static void run_test(const char* test_name, const std::function<void()>& test)
 {
   simgrid::s4u::Actor::create(test_name, all_hosts[0], test);
   simgrid::s4u::this_actor::sleep_for(10);
@@ -57,11 +55,11 @@ 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;
   });
-  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?");
 }
 
@@ -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");
   });
@@ -124,13 +122,14 @@ 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(0, 5);
+    assert_exit(false, 5);
     simgrid::s4u::this_actor::sleep_for(5);
     sleeper_done = true;
   });
@@ -140,21 +139,22 @@ static void test_sleep_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(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__);
   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;
   });
-  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?");
 }
 
@@ -163,7 +163,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 +177,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 +207,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");
   });
@@ -217,13 +217,14 @@ 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__);
   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;
   });
@@ -233,7 +234,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");
 }
@@ -245,50 +246,69 @@ 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;
   });
 
-  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");
 }
 
-static void test_comm_dsend_and_quit()
+static void test_comm_dsend_and_quit_put_before_get()
 {
   XBT_INFO("%s: Launch a detached communication and end right after", __func__);
   bool dsend_done = false;
   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;
-    return;
   });
 
   simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
-    assert_exit(0, 3);
-    bool got_exception = false;
+    assert_exit(false, 3);
     simgrid::s4u::this_actor::sleep_for(2);
-    try {
-      void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
-      xbt_free(payload);
-    } catch (xbt_ex const& e) {
-      got_exception = true;
-    }
+    void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
+    xbt_free(payload);
+    recv_done = true;
+  });
+
+  // Sleep long enough to let the test ends by itself. 3 + surf_precision should be enough.
+  simgrid::s4u::this_actor::sleep_for(4);
+  xbt_assert(dsend_done, "Sender killed somehow. It shouldn't");
+  xbt_assert(recv_done, "Receiver killed somehow. It shouldn't");
+}
+
+static void test_comm_dsend_and_quit_get_before_put()
+{
+  XBT_INFO("%s: Launch a detached communication and end right after", __func__);
+  bool dsend_done = false;
+  bool recv_done  = false;
+
+  simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[1], [&dsend_done]() {
+    assert_exit(false, 2);
+    char* payload = xbt_strdup("toto");
+    simgrid::s4u::this_actor::sleep_for(2);
+    simgrid::s4u::Mailbox::by_name("mb")->put_init(payload, 1000)->detach();
+    dsend_done = true;
+  });
+
+  simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
+    assert_exit(false, 3);
+    void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
+    xbt_free(payload);
     recv_done = true;
-    xbt_assert(not got_exception);
-    return;
   });
 
   // Sleep long enough to let the test ends by itself. 3 + surf_precision should be enough.
@@ -297,6 +317,7 @@ static void test_comm_dsend_and_quit()
   xbt_assert(recv_done, "Receiver killed somehow. It shouldn't");
 }
 
+
 static void test_comm_killsend()
 {
   XBT_INFO("%s: Launch a communication and kill the sender", __func__);
@@ -304,7 +325,7 @@ 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<char, decltype(&xbt_free_f)> payload(xbt_strdup("toto"), &xbt_free_f);
@@ -313,7 +334,7 @@ static void test_comm_killsend()
     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();
@@ -334,28 +355,215 @@ 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;
+  bool send_done               = 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 {
+         simgrid::s4u::Mailbox::by_name("mb")->get();
+       } catch (simgrid::NetworkFailureException const&) {
+         // Shouldn't get in here
+         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) { in_on_exit = true; });
+
+  simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[2], [&send_done]() {
+    assert_exit(false, 1);
+    bool got_exception = false;
+    try {
+      int data = 42;
+      simgrid::s4u::Mailbox::by_name("mb")->put(&data, 100000);
+    } catch (simgrid::NetworkFailureException const&) {
+      got_exception = true;
+    }
+    xbt_assert(got_exception);
+    send_done = true;
+  });
+
+  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");
+  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<simgrid::s4u::CommPtr> 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()
 {
-  run_test("sleep", static_cast<std::function<void()>>(test_sleep));
+  run_test("sleep", test_sleep);
   run_test("sleep killed at start", test_sleep_kill_begin);
   run_test("sleep killed in middle", test_sleep_kill_middle);
   /* We cannot kill right at the end of the action because killer actors are always rescheduled to the end of the round
    * 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 in middle", test_sleep_restart_middle);
   run_test("sleep restarted at end", test_sleep_restart_end);
 
-  run_test("exec", static_cast<std::function<void()>>(test_exec));
+  run_test("exec", test_exec);
   run_test("exec killed at start", test_exec_kill_begin);
   run_test("exec killed in middle", test_exec_kill_middle);
   run_test("exec restarted at start", test_exec_restart_begin);
-  run_test("exec restarted at middle", test_exec_restart_middle);
+  run_test("exec restarted in middle", test_exec_restart_middle);
   run_test("exec restarted at end", test_exec_restart_end);
 
   run_test("comm", test_comm);
-  run_test("comm dsend and quit", test_comm_dsend_and_quit);
+  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);
   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[])