X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b01ad897fbf1aadba693f0d49045ea090bde42ab..9f5732b35067b725950b05551481179bbb378ea1:/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 cb50c68314..f324b173df 100644
--- a/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
+++ b/teshsuite/s4u/activity-lifecycle/activity-lifecycle.cpp
@@ -271,16 +271,10 @@ static void test_comm_dsend_and_quit_put_before_get()
 
   simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
     assert_exit(false, 3);
-    bool got_exception = false;
     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;
-    xbt_assert(not got_exception);
     return;
   });
 
@@ -297,7 +291,7 @@ static void test_comm_dsend_and_quit_get_before_put()
   bool recv_done  = false;
 
   simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[1], [&dsend_done]() {
-    //assert_exit(false, 2);
+    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();
@@ -306,16 +300,10 @@ static void test_comm_dsend_and_quit_get_before_put()
   });
 
   simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
-    //assert_exit(false, 3);
-    bool got_exception = false;
-    try {
-      void* payload = simgrid::s4u::Mailbox::by_name("mb")->get();
-      xbt_free(payload);
-    } catch (xbt_ex const& e) {
-      got_exception = true;
-    }
+    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;
   });
 
@@ -370,6 +358,7 @@ static void test_host_off_while_receive()
   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], 
@@ -377,10 +366,8 @@ static void test_host_off_while_receive()
        assert_exit(true, 1);
        try {
          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&) {
+         // Shouldn't get in here
          in_catch_before_on_exit = not in_on_exit;
          in_catch_after_on_exit = in_on_exit;
        }
@@ -389,12 +376,18 @@ static void test_host_off_while_receive()
 
   receiver->on_exit([&in_on_exit](bool) { in_on_exit = true; });
 
-  simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create(
-    "sender", all_hosts[2], 
-    []() {
-      int data;
+  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();
@@ -410,12 +403,13 @@ static void test_host_off_while_receive()
     "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");
 }
 
 /* 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
@@ -424,7 +418,7 @@ static void main_dispatcher()
   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);
@@ -436,7 +430,7 @@ static void main_dispatcher()
   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 recv and kill", test_host_off_while_receive);
 }
 
 int main(int argc, char* argv[])