-/* Copyright (c) 2010-2022. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2010-2023. The SimGrid Team. All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
-#include "catch_simgrid.hpp"
+#include "teshsuite/catch_simgrid.hpp"
#include <array>
static void test_link_off_helper(double delay)
simgrid::s4u::this_actor::sleep_for(1.5);
};
-static simgrid::s4u::ActorPtr sender_basic(bool& ending_boolean, bool expected_success, double duration)
+static simgrid::s4u::ActorPtr sender_basic(bool& ending_boolean, bool expected_success, double duration,
+ double delay = -1.0)
{
- return simgrid::s4u::Actor::create("sender", all_hosts[1], [&ending_boolean, expected_success, duration]() {
+ return simgrid::s4u::Actor::create("sender", all_hosts[1], [&ending_boolean, expected_success, duration, delay]() {
assert_exit(expected_success, duration);
// Encapsulate the payload in a std::unique_ptr so that it is correctly free'd if/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);
+ if (delay > 0.0) {
+ simgrid::s4u::this_actor::sleep_for(delay / 2.0);
+ auto comm = simgrid::s4u::Mailbox::by_name("mb")->put_init(payload.get(), 5000);
+ simgrid::s4u::this_actor::sleep_for(delay / 2.0);
+ comm->wait();
+ } else {
+ simgrid::s4u::Mailbox::by_name("mb")->put(payload.get(), 5000);
+ }
payload.release();
ending_boolean = true;
});
}
-static simgrid::s4u::ActorPtr receiver_basic(bool& ending_boolean, bool expected_success, double duration)
+static simgrid::s4u::ActorPtr receiver_basic(bool& ending_boolean, bool expected_success, double duration,
+ double delay = -1.0)
{
- return simgrid::s4u::Actor::create("receiver", all_hosts[2], [&ending_boolean, expected_success, duration]() {
+ return simgrid::s4u::Actor::create("receiver", all_hosts[2], [&ending_boolean, expected_success, duration, delay]() {
assert_exit(expected_success, duration);
- char* payload = simgrid::s4u::Mailbox::by_name("mb")->get<char>();
+ char* payload;
+ if (delay > 0.0) {
+ simgrid::s4u::this_actor::sleep_for(delay / 2.0);
+ auto comm = simgrid::s4u::Mailbox::by_name("mb")->get_init()->set_dst_data(reinterpret_cast<void**>(&payload),
+ sizeof(void*));
+ simgrid::s4u::this_actor::sleep_for(delay / 2.0);
+ comm->wait();
+ } else {
+ payload = simgrid::s4u::Mailbox::by_name("mb")->get<char>();
+ }
xbt_free(payload);
ending_boolean = true;
});
END_SECTION;
}
+ BEGIN_SECTION("comm (delayed send)")
+ {
+ XBT_INFO("Launch a communication with a delay for the send");
+ bool send_done = false;
+ bool recv_done = false;
+
+ sender_basic(send_done, true, 6, 1); // cover Comm::send
+ receiver_basic(recv_done, true, 6);
+
+ simgrid::s4u::this_actor::sleep_for(9);
+ INFO("Sender or receiver killed somehow. It shouldn't");
+ REQUIRE(send_done);
+ REQUIRE(recv_done);
+
+ END_SECTION;
+ }
+
+ BEGIN_SECTION("comm (delayed recv)")
+ {
+ XBT_INFO("Launch a communication with a delay for the recv");
+ bool send_done = false;
+ bool recv_done = false;
+
+ sender_basic(send_done, true, 6);
+ receiver_basic(recv_done, true, 6, 1); // cover Comm::recv
+
+ simgrid::s4u::this_actor::sleep_for(9);
+ INFO("Sender or receiver killed somehow. It shouldn't");
+ REQUIRE(send_done);
+ REQUIRE(recv_done);
+
+ END_SECTION;
+ }
+
BEGIN_SECTION("comm dsend and quit (put before get)")
{
XBT_INFO("Launch a detached communication and end right after");
simgrid::s4u::this_actor::sleep_for(2);
receiver_basic(recv_done, true, 1);
- // Sleep long enough to let the test ends by itself. 1 + surf_precision should be enough.
+ // Sleep long enough to let the test ends by itself. 1 + precision_timing should be enough.
simgrid::s4u::this_actor::sleep_for(4);
INFO("Sender or receiver killed somehow. It shouldn't");
REQUIRE(dsend_done);
simgrid::s4u::this_actor::sleep_for(2);
sender_dtach(dsend_done, true, 0);
- // Sleep long enough to let the test ends by itself. 3 + surf_precision should be enough.
+ // Sleep long enough to let the test ends by itself. 3 + precision_timing should be enough.
simgrid::s4u::this_actor::sleep_for(4);
INFO("Sender or receiver killed somehow. It shouldn't");
REQUIRE(dsend_done);
bool send_done = false;
bool recv_done = false;
- simgrid::s4u::ActorPtr sender = simgrid::s4u::Actor::create("sender", all_hosts[1], [&send_done]() {
- assert_exit(false, 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::ActorPtr sender = sender_basic(send_done, false, 2);
simgrid::s4u::Actor::create("receiver", all_hosts[2], [&recv_done]() {
assert_exit(true, 2);
simgrid::s4u::this_actor::sleep_for(2);
sender->kill();
- // let the test ends by itself. waiting for surf_precision should be enough.
+ // let the test ends by itself. waiting for precision_timing should be enough.
simgrid::s4u::this_actor::sleep_for(0.00001);
INFO("Sender was not killed properly or receiver killed somehow. It shouldn't");