+ sg_comm_wait_all_for(comms, count, -1);
+}
+
+size_t sg_comm_wait_all_for(sg_comm_t* comms, size_t count, double timeout)
+{
+ std::vector<simgrid::s4u::CommPtr> 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();
+ return pos;
+}
+
+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);
+ for (unsigned i = 0; i < count; i++) {
+ if (pos != -1 && static_cast<unsigned>(pos) != i)
+ s4u_comms[i]->add_ref();
+ }
+ return pos;