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;
} 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;
}
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;
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 *************************** */
+void sg_comm_detach(sg_comm_t comm, void (*clean_function)(void*))
+{
+ 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();
return finished;
}
-void sg_comm_wait(sg_comm_t comm)
+sg_error_t sg_comm_wait(sg_comm_t comm)
{
- comm->wait_for(-1);
- comm->unref();
+ 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]);
+ s4u_comms.emplace_back(comms[i], false);
simgrid::s4u::Comm::wait_all(&s4u_comms);
- for (unsigned int i = 0; i < count; i++)
- s4u_comms[i]->unref();
}
int sg_comm_wait_any(sg_comm_t* comms, size_t count)
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]);
- }
+ 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)
- s4u_comms[pos]->unref();
+ for (unsigned i = 0; i < count; i++) {
+ if (pos != -1 && static_cast<unsigned>(pos) != i)
+ s4u_comms[i]->add_ref();
+ }
return pos;
}