namespace simgrid {
namespace s4u {
-xbt::signal<void(Actor const&)> Comm::on_sender_start;
-xbt::signal<void(Actor const&)> Comm::on_receiver_start;
-xbt::signal<void(Actor const&)> Comm::on_completion;
+xbt::signal<void(Comm const&, bool is_sender)> Comm::on_start;
+xbt::signal<void(Comm const&)> Comm::on_completion;
Comm::~Comm()
{
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(),
+ std::vector<kernel::activity::CommImpl*> rcomms(comms->size());
+ std::transform(begin(*comms), end(*comms), begin(rcomms),
[](const CommPtr& comm) { return static_cast<kernel::activity::CommImpl*>(comm->pimpl_.get()); });
- int changed_pos = simcall_comm_waitany(rcomms.get(), comms->size(), timeout);
+ int changed_pos = simcall_comm_waitany(rcomms.data(), rcomms.size(), timeout);
if (changed_pos != -1)
comms->at(changed_pos)->release_dependencies();
return changed_pos;
return this;
}
-size_t Comm::get_dst_data_size()
+size_t Comm::get_dst_data_size() const
{
xbt_assert(state_ == State::FINISHED, "You cannot use %s before your communication terminated", __FUNCTION__);
return dst_buff_size_;
return this;
}
-CommPtr Comm::set_tracing_category(const std::string& category)
-{
- xbt_assert(state_ == State::INITED, "Cannot change the tracing category of an exec after its start");
- tracing_category_ = category;
- return this;
-}
-
Comm* Comm::start()
{
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());
+ on_start(*this, true /* is_sender*/);
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_);
} else if (dst_buff_ != nullptr) { // Receiver side
xbt_assert(not detached_, "Receive cannot be detached");
- on_receiver_start(*Actor::self());
+ on_start(*this, false /*is_sender*/);
pimpl_ = simcall_comm_irecv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_,
copy_data_function_, get_user_data(), rate_);
} else {
xbt_die("Cannot start a communication before specifying whether we are the sender or the receiver");
}
+
+ if (suspended_)
+ pimpl_->suspend();
+
state_ = State::STARTED;
return this;
}
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());
+ on_start(*this, true /*is_sender*/);
simcall_comm_send(sender_, mailbox_->get_impl(), remains_, rate_, src_buff_, src_buff_size_, match_fun_,
copy_data_function_, get_user_data(), timeout);
} else { // Receiver
- on_receiver_start(*Actor::self());
+ on_start(*this, false /*is_sender*/);
simcall_comm_recv(receiver_, mailbox_->get_impl(), dst_buff_, &dst_buff_size_, match_fun_, copy_data_function_,
get_user_data(), timeout, rate_);
}
break;
case State::STARTED:
- simcall_comm_wait(pimpl_, timeout);
- on_completion(*Actor::self());
+ simcall_comm_wait(get_impl(), timeout);
state_ = State::FINISHED;
this->release_dependencies();
break;
default:
THROW_IMPOSSIBLE;
}
+ on_completion(*this);
return this;
}
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(),
+ std::vector<kernel::activity::CommImpl*> rcomms(comms->size());
+ std::transform(begin(*comms), end(*comms), begin(rcomms),
[](const CommPtr& comm) { return static_cast<kernel::activity::CommImpl*>(comm->pimpl_.get()); });
- int changed_pos = simcall_comm_testany(rcomms.get(), comms->size());
+ int changed_pos = simcall_comm_testany(rcomms.data(), rcomms.size());
if (changed_pos != -1)
comms->at(changed_pos)->release_dependencies();
return changed_pos;
bool Comm::test()
{
- xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::FINISHED);
+ xbt_assert(state_ == State::INITED || state_ == State::STARTED || state_ == State::STARTING ||
+ state_ == State::FINISHED);
if (state_ == State::FINISHED)
return true;
if (state_ == State::INITED || state_ == State::STARTING)
this->vetoable_start();
- if (simcall_comm_test(pimpl_)) {
+ if (simcall_comm_test(get_impl())) {
state_ = State::FINISHED;
this->release_dependencies();
return true;
return false;
}
-Mailbox* Comm::get_mailbox()
+Mailbox* Comm::get_mailbox() const
{
return mailbox_;
}
-Actor* Comm::get_sender()
+Actor* Comm::get_sender() const
{
- return sender_ ? sender_->ciface() : nullptr;
+ kernel::actor::ActorImplPtr sender = nullptr;
+ if (pimpl_)
+ sender = boost::static_pointer_cast<kernel::activity::CommImpl>(pimpl_)->src_actor_;
+ return sender ? sender->get_ciface() : nullptr;
}
} // namespace s4u
} // namespace simgrid
/* **************************** Public C interface *************************** */
-int sg_comm_wait_any_for(const xbt_dynar_t comms, double timeout)
+void sg_comm_detach(sg_comm_t comm, void (*clean_function)(void*))
{
- std::vector<simgrid::s4u::CommPtr> s4u_comms;
- unsigned int i;
- sg_comm_t comm;
- xbt_dynar_foreach (comms, i, comm) {
- s4u_comms.emplace_back(comm);
+ comm->detach(clean_function);
+ comm->unref();
+}
+void sg_comm_unref(sg_comm_t comm)
+{
+ comm->unref();
+}
+int sg_comm_test(sg_comm_t comm)
+{
+ bool finished = comm->test();
+ if (finished)
+ comm->unref();
+ return finished;
+}
+
+sg_error_t sg_comm_wait(sg_comm_t comm)
+{
+ sg_error_t status = SG_OK;
+
+ simgrid::s4u::CommPtr s4u_comm(comm, false);
+ try {
+ s4u_comm->wait_for(-1);
+ } catch (const simgrid::TimeoutException&) {
+ status = SG_ERROR_TIMEOUT;
+ } catch (const simgrid::CancelException&) {
+ status = SG_ERROR_CANCELED;
+ } catch (const simgrid::NetworkFailureException&) {
+ status = SG_ERROR_NETWORK;
+ }
+ return status;
+}
+
+sg_error_t sg_comm_wait_for(sg_comm_t comm, double timeout)
+{
+ sg_error_t status = SG_OK;
+
+ simgrid::s4u::CommPtr s4u_comm(comm, false);
+ try {
+ s4u_comm->wait_for(timeout);
+ } catch (const simgrid::TimeoutException&) {
+ status = SG_ERROR_TIMEOUT;
+ } catch (const simgrid::CancelException&) {
+ status = SG_ERROR_CANCELED;
+ } catch (const simgrid::NetworkFailureException&) {
+ status = SG_ERROR_NETWORK;
}
+ return status;
+}
+
+void sg_comm_wait_all(sg_comm_t* comms, size_t count)
+{
+ std::vector<simgrid::s4u::CommPtr> s4u_comms;
+ for (unsigned int i = 0; i < count; i++)
+ s4u_comms.emplace_back(comms[i], false);
+
+ simgrid::s4u::Comm::wait_all(&s4u_comms);
+}
+
+int sg_comm_wait_any(sg_comm_t* comms, size_t count)
+{
+ return sg_comm_wait_any_for(comms, count, -1);
+}
+
+int sg_comm_wait_any_for(sg_comm_t* comms, size_t count, double timeout)
+{
+ std::vector<simgrid::s4u::CommPtr> s4u_comms;
+ for (unsigned int i = 0; i < count; i++)
+ s4u_comms.emplace_back(comms[i], false);
+
int pos = simgrid::s4u::Comm::wait_any_for(&s4u_comms, timeout);
- if (pos != -1)
- intrusive_ptr_release(xbt_dynar_get_as(comms, pos, sg_comm_t));
+ for (unsigned i = 0; i < count; i++) {
+ if (pos != -1 && static_cast<unsigned>(pos) != i)
+ s4u_comms[i]->add_ref();
+ }
return pos;
}
