namespace simgrid {
namespace s4u {
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Comm::on_sender_start;
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Comm::on_receiver_start;
+simgrid::xbt::signal<void(simgrid::s4u::ActorPtr)> s4u::Comm::on_completion;
+
Comm::~Comm()
{
if (state_ == State::STARTED && not detached_ && (pimpl_ == nullptr || pimpl_->state_ == SIMIX_RUNNING)) {
{
// TODO: this should be a simcall or something
// TODO: we are missing a version with timeout
- for (CommPtr comm : *comms) {
+ for (CommPtr comm : *comms)
comm->wait();
- }
}
Activity* Comm::set_rate(double rate)
xbt_assert(state_ == State::INITED);
if (src_buff_ != nullptr) { // Sender side
+ on_sender_start(Actor::self());
pimpl_ = simcall_comm_isend(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
clean_fun_, copy_data_function_, user_data_, detached_);
} else if (dst_buff_ != nullptr) { // Receiver side
xbt_assert(not detached_, "Receive cannot be detached");
+ on_receiver_start(Actor::self());
pimpl_ = simcall_comm_irecv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_,
copy_data_function_, user_data_, rate_);
/** @brief Block the calling actor until the communication is finished */
Activity* Comm::wait()
{
- return this->wait(-1);
+ return this->wait_for(-1);
}
/** @brief Block the calling actor until the communication is finished, or until timeout
*
* @param timeout the amount of seconds to wait for the comm termination.
* Negative values denote infinite wait times. 0 as a timeout returns immediately. */
-Activity* Comm::wait(double timeout)
+Activity* Comm::wait_for(double timeout)
{
switch (state_) {
case State::FINISHED:
case State::INITED: // It's not started yet. Do it in one simcall
if (src_buff_ != nullptr) {
+ on_sender_start(Actor::self());
simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
copy_data_function_, user_data_, timeout);
+
} else { // Receiver
+ on_receiver_start(Actor::self());
simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_,
user_data_, timeout, rate_);
}
case State::STARTED:
simcall_comm_wait(pimpl_, timeout);
+ on_completion(Actor::self());
state_ = State::FINISHED;
return this;