xbt::signal<void(Comm const&, bool is_sender)> Comm::on_start;
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)) {
- XBT_INFO("Comm %p freed before its completion. Detached: %d, State: %d", this, detached_, (int)state_);
+ 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: %d", static_cast<int>(pimpl_->state_));
+ XBT_INFO("pimpl_->state: %s", pimpl_->get_state_str());
else
XBT_INFO("pimpl_ is null");
xbt_backtrace_display_current();
[](const CommPtr& comm) { return static_cast<kernel::activity::CommImpl*>(comm->pimpl_.get()); });
int changed_pos = simcall_comm_waitany(rcomms.data(), rcomms.size(), timeout);
if (changed_pos != -1)
- comms->at(changed_pos)->release_dependencies();
+ comms->at(changed_pos)->complete(State::FINISHED);
return changed_pos;
}
dst_buff_size_ = size;
return this;
}
+CommPtr Comm::set_payload_size(double bytes)
+{
+ Activity::set_remaining(bytes);
+ return this;
+}
CommPtr Comm::sendto_init(Host* from, Host* to)
{
return res;
}
+
CommPtr Comm::sendto_async(Host* from, Host* to, double simulated_size_in_bytes)
{
- auto res = Comm::sendto_init(from, to);
- res->set_remaining(simulated_size_in_bytes)->start();
+ auto res = Comm::sendto_init(from, to)->set_payload_size(simulated_size_in_bytes);
+ res->vetoable_start();
return res;
}
+void Comm::sendto(Host* from, Host* to, double simulated_size_in_bytes)
+{
+ sendto_async(from, to, simulated_size_in_bytes)->wait();
+}
+
Comm* Comm::start()
{
xbt_assert(get_state() == State::INITED || get_state() == State::STARTING,
xbt_assert(src_buff_ == nullptr && dst_buff_ == nullptr,
"Direct host-to-host communications cannot carry any data.");
pimpl_ = kernel::actor::simcall([this] {
- auto res = new kernel::activity::CommImpl(this->from_, this->to_, this->get_remaining());
+ kernel::activity::CommImplPtr res(new kernel::activity::CommImpl(this->from_, this->to_, this->get_remaining()));
res->start();
return res;
});
return this;
}
-/** @brief Block the calling actor until the communication is finished */
-Comm* Comm::wait()
-{
- return this->wait_for(-1);
-}
-
/** @brief Block the calling actor until the communication is finished, or until timeout
*
* On timeout, an exception is thrown and the communication is invalidated.
case State::INITED:
case State::STARTING: // It's not started yet. Do it in one simcall if it's a regular communication
if (from_ != nullptr || to_ != nullptr) {
- return start()->wait_for(timeout); // In the case of host2host comm, do it in two simcalls
+ 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*/);
simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_,
get_user_data(), timeout, rate_);
}
- state_ = State::FINISHED;
- this->release_dependencies();
break;
case State::STARTED:
simcall_comm_wait(get_impl(), timeout);
- state_ = State::FINISHED;
- this->release_dependencies();
break;
case State::CANCELED:
default:
THROW_IMPOSSIBLE;
}
- on_completion(*this);
+ complete(State::FINISHED);
return this;
}
[](const CommPtr& comm) { return static_cast<kernel::activity::CommImpl*>(comm->pimpl_.get()); });
int changed_pos = simcall_comm_testany(rcomms.data(), rcomms.size());
if (changed_pos != -1)
- comms->at(changed_pos)->release_dependencies();
+ comms->at(changed_pos)->complete(State::FINISHED);
return changed_pos;
}
Comm* Comm::detach()
{
- xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
- __FUNCTION__);
- xbt_assert(src_buff_ != nullptr && src_buff_size_ != 0, "You can only detach sends, not recvs");
+ xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication is %s (not implemented)",
+ __FUNCTION__, get_state_str());
+ xbt_assert(dst_buff_ == nullptr && dst_buff_size_ == 0, "You can only detach sends, not recvs");
detached_ = true;
vetoable_start();
return this;
}
-Comm* Comm::cancel()
-{
- kernel::actor::simcall([this] {
- if (pimpl_)
- boost::static_pointer_cast<kernel::activity::CommImpl>(pimpl_)->cancel();
- });
- state_ = State::CANCELED;
- return this;
-}
-
-bool Comm::test()
+bool Comm::test() // TODO: merge with Activity::test, once modernized
{
xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::STARTING ||
- state_ == State::FINISHED);
+ state_ == State::CANCELED || state_ == State::FINISHED);
- if (state_ == State::FINISHED)
+ if (state_ == State::CANCELED || state_ == State::FINISHED)
return true;
if (state_ == State::INITED || state_ == State::STARTING)
this->vetoable_start();
if (simcall_comm_test(get_impl())) {
- state_ = State::FINISHED;
- this->release_dependencies();
+ complete(State::FINISHED);
return true;
}
return false;
