-/* Copyright (c) 2006-2021. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2022. 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. */
namespace simgrid {
namespace s4u {
-xbt::signal<void(Comm const&, bool is_sender)> Comm::on_start;
+xbt::signal<void(Comm const&)> Comm::on_send;
+xbt::signal<void(Comm const&)> Comm::on_recv;
xbt::signal<void(Comm const&)> Comm::on_completion;
-void Comm::complete(Activity::State state)
-{
- Activity::complete(state);
- on_completion(*this);
-}
-
Comm::~Comm()
{
if (state_ == State::STARTED && not detached_ &&
- (pimpl_ == nullptr || pimpl_->state_ == kernel::activity::State::RUNNING)) {
+ (pimpl_ == nullptr || pimpl_->get_state() == kernel::activity::State::RUNNING)) {
XBT_INFO("Comm %p freed before its completion. Did you forget to detach it? (state: %s)", this, get_state_str());
if (pimpl_ != nullptr)
XBT_INFO("pimpl_->state: %s", pimpl_->get_state_str());
changed_pos = simcall_comm_waitany(rcomms.data(), rcomms.size(), timeout);
} catch (const NetworkFailureException& e) {
for (auto c : comms) {
- if (c->pimpl_->state_ == kernel::activity::State::FAILED) {
+ if (c->pimpl_->get_state() == kernel::activity::State::FAILED) {
c->complete(State::FAILED);
}
}
return comms.size();
}
+CommPtr Comm::set_source(Host* from)
+{
+ xbt_assert(state_ == State::INITED || state_ == State::STARTING,
+ "Cannot change the source of a Comm once it's started (state: %s)", to_c_str(state_));
+ from_ = from;
+ // Setting 'from_' may allow to start the activity, let's try
+ vetoable_start();
+
+ return this;
+}
+
+CommPtr Comm::set_destination(Host* to)
+{
+ xbt_assert(state_ == State::INITED || state_ == State::STARTING,
+ "Cannot change the destination of a Comm once it's started (state: %s)", to_c_str(state_));
+ to_ = to;
+ // Setting 'to_' may allow to start the activity, let's try
+ vetoable_start();
+
+ return this;
+}
+
CommPtr Comm::set_rate(double rate)
{
xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
return this;
}
-CommPtr Comm::sendto_init(Host* from, Host* to)
+CommPtr Comm::sendto_init()
{
CommPtr res(new Comm());
+ res->sender_ = kernel::actor::ActorImpl::self();
+ return res;
+}
+
+CommPtr Comm::sendto_init(Host* from, Host* to)
+{
+ auto res = Comm::sendto_init();
res->from_ = from;
res->to_ = to;
});
} else if (src_buff_ != nullptr) { // Sender side
- on_start(*this, true /* is_sender*/);
+ on_send(*this);
pimpl_ = simcall_comm_isend(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
- clean_fun_, copy_data_function_, get_user_data(), detached_);
+ clean_fun_, copy_data_function_, get_data<void>(), detached_);
} else if (dst_buff_ != nullptr) { // Receiver side
xbt_assert(not detached_, "Receive cannot be detached");
- on_start(*this, false /*is_sender*/);
+ on_recv(*this);
pimpl_ = simcall_comm_irecv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_,
- copy_data_function_, get_user_data(), rate_);
+ copy_data_function_, get_data<void>(), rate_);
} else {
xbt_die("Cannot start a communication before specifying whether we are the sender or the receiver");
if (suspended_)
pimpl_->suspend();
+ if (not detached_) {
+ pimpl_->set_iface(this);
+ pimpl_->set_actor(sender_);
+ }
+
state_ = State::STARTED;
return this;
}
if (from_ != nullptr || to_ != nullptr) {
return vetoable_start()->wait_for(timeout); // In the case of host2host comm, do it in two simcalls
} else if (src_buff_ != nullptr) {
- on_start(*this, true /*is_sender*/);
+ on_send(*this);
simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
- copy_data_function_, get_user_data(), timeout);
+ copy_data_function_, get_data<void>(), timeout);
} else { // Receiver
- on_start(*this, false /*is_sender*/);
+ on_recv(*this);
simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_,
- get_user_data(), timeout, rate_);
+ get_data<void>(), timeout, rate_);
}
break;