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)
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;
});
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");
});
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");
});
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");
});
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");
});
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()
{
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;
});
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");
});
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");
});
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");
});
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;
});
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;
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;
});
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 {
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);
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();
* 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<std::function<void()>>(test_exec));
run_test("exec killed at start", test_exec_kill_begin);