X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cfb3987654b857620ba388fab9883a095debeb72..09392faf42646e631a4e42553e901410eb3e488e:/src/s4u/s4u_Comm.cpp diff --git a/src/s4u/s4u_Comm.cpp b/src/s4u/s4u_Comm.cpp index 404321acd1..aec421bfa9 100644 --- a/src/s4u/s4u_Comm.cpp +++ b/src/s4u/s4u_Comm.cpp @@ -214,7 +214,7 @@ Host* Comm::get_destination() const CommPtr Comm::set_rate(double rate) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); rate_ = rate; return this; } @@ -222,7 +222,7 @@ CommPtr Comm::set_rate(double rate) CommPtr Comm::set_mailbox(Mailbox* mailbox) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); mailbox_ = mailbox; return this; } @@ -230,7 +230,7 @@ CommPtr Comm::set_mailbox(Mailbox* mailbox) CommPtr Comm::set_src_data(void* buff) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); xbt_assert(dst_buff_ == nullptr, "Cannot set the src and dst buffers at the same time"); src_buff_ = buff; return this; @@ -239,7 +239,7 @@ CommPtr Comm::set_src_data(void* buff) CommPtr Comm::set_src_data_size(size_t size) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); src_buff_size_ = size; return this; } @@ -247,7 +247,7 @@ CommPtr Comm::set_src_data_size(size_t size) CommPtr Comm::set_src_data(void* buff, size_t size) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); xbt_assert(dst_buff_ == nullptr, "Cannot set the src and dst buffers at the same time"); src_buff_ = buff; @@ -258,7 +258,7 @@ CommPtr Comm::set_src_data(void* buff, size_t size) CommPtr Comm::set_dst_data(void** buff) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); xbt_assert(src_buff_ == nullptr, "Cannot set the src and dst buffers at the same time"); dst_buff_ = buff; return this; @@ -267,7 +267,7 @@ CommPtr Comm::set_dst_data(void** buff) CommPtr Comm::set_dst_data(void** buff, size_t size) { xbt_assert(state_ == State::INITED, "You cannot use %s() once your communication started (not implemented)", - __FUNCTION__); + __func__); xbt_assert(src_buff_ == nullptr, "Cannot set the src and dst buffers at the same time"); dst_buff_ = buff; @@ -317,7 +317,7 @@ bool Comm::is_assigned() const Comm* Comm::do_start() { xbt_assert(get_state() == State::INITED || get_state() == State::STARTING, - "You cannot use %s() once your communication started (not implemented)", __FUNCTION__); + "You cannot use %s() once your communication started (not implemented)", __func__); auto myself = kernel::actor::ActorImpl::self(); @@ -388,19 +388,28 @@ Comm* Comm::do_start() Comm* Comm::detach() { xbt_assert(state_ == State::INITED || state_ == State::STARTING, - "You cannot use %s() once your communication is %s (not implemented)", __FUNCTION__, get_state_str()); + "You cannot use %s() once your communication is %s (not implemented)", __func__, get_state_str()); xbt_assert(dst_buff_ == nullptr && dst_buff_size_ == 0, "You can only detach sends, not recvs"); detached_ = true; start(); return this; } -ssize_t Comm::test_any(const std::vector& comms) +ssize_t Comm::test_any(const std::vector& comms) // XBT_ATTRIB_DEPRECATED_v339 { - std::vector activities; - for (const auto& comm : comms) - activities.push_back(boost::dynamic_pointer_cast(comm)); - return Activity::test_any(activities); + std::vector ractivities(comms.size()); + std::transform(begin(comms), end(comms), begin(ractivities), [](const CommPtr& act) { return act->pimpl_.get(); }); + + kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); + kernel::actor::ActivityTestanySimcall observer{issuer, ractivities, "test_any"}; + ssize_t changed_pos = kernel::actor::simcall_answered( + [&observer] { + return kernel::activity::ActivityImpl::test_any(observer.get_issuer(), observer.get_activities()); + }, + &observer); + if (changed_pos != -1) + comms.at(changed_pos)->complete(State::FINISHED); + return changed_pos; } /** @brief Block the calling actor until the communication is finished, or until timeout @@ -461,52 +470,52 @@ Comm* Comm::wait_for(double timeout) return this; } -ssize_t Comm::wait_any_for(const std::vector& comms, double timeout) +ssize_t Comm::deprecated_wait_any_for(const std::vector& comms, double timeout) // XBT_ATTRIB_DEPRECATED_v339 { - std::vector activities; + if (comms.empty()) + return -1; + ActivitySet set; for (const auto& comm : comms) - activities.push_back(boost::dynamic_pointer_cast(comm)); - ssize_t changed_pos; + set.push(comm); try { - changed_pos = Activity::wait_any_for(activities, timeout); + auto* ret = set.wait_any_for(timeout).get(); + for (size_t i = 0; i < comms.size(); i++) + if (comms[i].get() == ret) + return i; + + } catch (TimeoutException& e) { + return -1; } catch (const NetworkFailureException& e) { - changed_pos = -1; - for (auto c : comms) { - if (c->pimpl_->get_state() == kernel::activity::State::FAILED) { + for (auto c : comms) + if (c->pimpl_->get_state() == kernel::activity::State::FAILED) c->complete(State::FAILED); - } - } + e.rethrow_nested(XBT_THROW_POINT, boost::core::demangle(typeid(e).name()) + " raised in kernel mode."); } - return changed_pos; + return -1; } -void Comm::wait_all(const std::vector& comms) +void Comm::wait_all(const std::vector& comms) // XBT_ATTRIB_DEPRECATED_v339 { // TODO: this should be a simcall or something for (const auto& comm : comms) comm->wait(); } -size_t Comm::wait_all_for(const std::vector& comms, double timeout) +size_t Comm::wait_all_for(const std::vector& comms, double timeout) // XBT_ATTRIB_DEPRECATED_v339 { if (timeout < 0.0) { - wait_all(comms); + for (const auto& comm : comms) + comm->wait(); return comms.size(); } - double deadline = Engine::get_clock() + timeout; - std::vector waited_comm(1, nullptr); - for (size_t i = 0; i < comms.size(); i++) { - double wait_timeout = std::max(0.0, deadline - Engine::get_clock()); - waited_comm[0] = comms[i]; - // Using wait_any_for() here (and not wait_for) because we don't want comms to be invalidated on timeout - if (wait_any_for(waited_comm, wait_timeout) == -1) { - XBT_DEBUG("Timeout (%g): i = %zu", wait_timeout, i); - return i; - } - } - return comms.size(); + ActivitySet set; + for (auto comm : comms) + set.push(comm); + set.wait_all_for(timeout); + + return set.size(); } } // namespace simgrid::s4u /* **************************** Public C interface *************************** */ @@ -554,35 +563,36 @@ sg_error_t sg_comm_wait_for(sg_comm_t comm, double timeout) return status; } -void sg_comm_wait_all(sg_comm_t* comms, size_t count) +void sg_comm_wait_all(sg_comm_t* comms, size_t count) // XBT_ATTRIB_DEPRECATED_v339 { - sg_comm_wait_all_for(comms, count, -1); + simgrid::s4u::ActivitySet as; + for (size_t i = 0; i < count; i++) + as.push(comms[i]); + + as.wait_all(); } -size_t sg_comm_wait_all_for(sg_comm_t* comms, size_t count, double timeout) +ssize_t sg_comm_wait_any(sg_comm_t* comms, size_t count) // XBT_ATTRIB_DEPRECATED_v339 { std::vector s4u_comms; for (size_t i = 0; i < count; i++) s4u_comms.emplace_back(comms[i], false); - size_t pos = simgrid::s4u::Comm::wait_all_for(s4u_comms, timeout); - for (size_t i = pos; i < count; i++) - s4u_comms[i]->add_ref(); + ssize_t pos = simgrid::s4u::Comm::deprecated_wait_any_for(s4u_comms, -1); + for (size_t i = 0; i < count; i++) { + if (pos != -1 && static_cast(pos) != i) + s4u_comms[i]->add_ref(); + } return pos; } -ssize_t sg_comm_wait_any(sg_comm_t* comms, size_t count) -{ - return sg_comm_wait_any_for(comms, count, -1); -} - -ssize_t sg_comm_wait_any_for(sg_comm_t* comms, size_t count, double timeout) +ssize_t sg_comm_wait_any_for(sg_comm_t* comms, size_t count, double timeout) // XBT_ATTRIB_DEPRECATED_v339 { std::vector s4u_comms; for (size_t i = 0; i < count; i++) s4u_comms.emplace_back(comms[i], false); - ssize_t pos = simgrid::s4u::Comm::wait_any_for(s4u_comms, timeout); + ssize_t pos = simgrid::s4u::Comm::deprecated_wait_any_for(s4u_comms, timeout); for (size_t i = 0; i < count; i++) { if (pos != -1 && static_cast(pos) != i) s4u_comms[i]->add_ref();