-/* Copyright (c) 2006-2019. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2006-2020. 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. */
Comm::~Comm()
{
- if (state_ == State::STARTED && not detached_ && (pimpl_ == nullptr || pimpl_->state_ == SIMIX_RUNNING)) {
+ 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_);
if (pimpl_ != nullptr)
- XBT_INFO("pimpl_->state: %d", pimpl_->state_);
+ XBT_INFO("pimpl_->state: %d", static_cast<int>(pimpl_->state_));
else
XBT_INFO("pimpl_ is null");
xbt_backtrace_display_current();
}
}
-int Comm::wait_any_for(std::vector<CommPtr>* comms, double timeout)
+int Comm::wait_any_for(const std::vector<CommPtr>* comms, double timeout)
{
std::unique_ptr<kernel::activity::CommImpl* []> rcomms(new kernel::activity::CommImpl*[comms->size()]);
std::transform(begin(*comms), end(*comms), rcomms.get(),
[](const CommPtr& comm) { return static_cast<kernel::activity::CommImpl*>(comm->pimpl_.get()); });
- return simcall_comm_waitany(rcomms.get(), comms->size(), timeout);
+ int changed_pos = simcall_comm_waitany(rcomms.get(), comms->size(), timeout);
+ if (changed_pos != -1)
+ comms->at(changed_pos)->release_dependencies();
+ return changed_pos;
}
-void Comm::wait_all(std::vector<CommPtr>* comms)
+void Comm::wait_all(const std::vector<CommPtr>* comms)
{
// TODO: this should be a simcall or something
// TODO: we are missing a version with timeout
src_buff_size_ = size;
return this;
}
+
CommPtr Comm::set_dst_data(void** buff)
{
xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)",
Comm* Comm::start()
{
- xbt_assert(get_state() == State::INITED, "You cannot use %s() once your communication started (not implemented)",
- __FUNCTION__);
+ xbt_assert(get_state() == State::INITED || get_state() == State::STARTING,
+ "You cannot use %s() once your communication started (not implemented)", __FUNCTION__);
if (src_buff_ != nullptr) { // Sender side
on_sender_start(*Actor::self());
case State::FINISHED:
break;
- case State::INITED: // It's not started yet. Do it in one simcall
+ case State::INITED:
+ case State::STARTING: // 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_,
get_user_data(), timeout, rate_);
}
state_ = State::FINISHED;
+ this->release_dependencies();
break;
case State::STARTED:
simcall_comm_wait(pimpl_, timeout);
on_completion(*Actor::self());
state_ = State::FINISHED;
+ this->release_dependencies();
break;
case State::CANCELED:
}
return this;
}
-int Comm::test_any(std::vector<CommPtr>* comms)
+
+int Comm::test_any(const std::vector<CommPtr>* comms)
{
std::unique_ptr<kernel::activity::CommImpl* []> rcomms(new kernel::activity::CommImpl*[comms->size()]);
std::transform(begin(*comms), end(*comms), rcomms.get(),
[](const CommPtr& comm) { return static_cast<kernel::activity::CommImpl*>(comm->pimpl_.get()); });
- return simcall_comm_testany(rcomms.get(), comms->size());
+ int changed_pos = simcall_comm_testany(rcomms.get(), comms->size());
+ if (changed_pos != -1)
+ comms->at(changed_pos)->release_dependencies();
+ return changed_pos;
}
Comm* Comm::detach()
__FUNCTION__);
xbt_assert(src_buff_ != nullptr && src_buff_size_ != 0, "You can only detach sends, not recvs");
detached_ = true;
- return start();
+ vetoable_start();
+ return this;
}
Comm* Comm::cancel()
if (state_ == State::FINISHED)
return true;
- if (state_ == State::INITED)
- this->start();
+ if (state_ == State::INITED || state_ == State::STARTING)
+ this->vetoable_start();
if (simcall_comm_test(pimpl_)) {
state_ = State::FINISHED;
+ this->release_dependencies();
return true;
}
return false;
return sender_ ? sender_->ciface() : nullptr;
}
-void intrusive_ptr_release(simgrid::s4u::Comm* c)
-{
- if (c->refcount_.fetch_sub(1, std::memory_order_release) == 1) {
- std::atomic_thread_fence(std::memory_order_acquire);
- delete c;
- }
-}
-void intrusive_ptr_add_ref(simgrid::s4u::Comm* c)
-{
- c->refcount_.fetch_add(1, std::memory_order_relaxed);
-}
} // namespace s4u
} // namespace simgrid