X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd05fcfa9ff6df9b054060937165d422a536bd99..831de10adaaf8910940aa280e2ac2dd075b5ffe5:/include/simgrid/s4u/comm.hpp

diff --git a/include/simgrid/s4u/comm.hpp b/include/simgrid/s4u/comm.hpp
index 471543520e..891d3000bd 100644
--- a/include/simgrid/s4u/comm.hpp
+++ b/include/simgrid/s4u/comm.hpp
@@ -8,13 +8,17 @@
 #define SIMGRID_S4U_COMM_HPP
 
 #include <xbt/base.h>
+
 #include <simgrid/s4u/Activity.hpp>
 #include <simgrid/s4u/forward.hpp>
 #include <simgrid/s4u/mailbox.hpp>
+#include <simgrid/forward.h>
+
 
 namespace simgrid {
 namespace s4u {
 
+
 /** @brief Communication async
  *
  * Represents all asynchronous communications, that you can test or wait onto.
@@ -25,13 +29,62 @@ public:
   ~Comm() override;
 
 public:
-  /** Creates (but don't start) an async send to the mailbox #dest */
+  
+  /*! tanke a range of s4u::Comm* (last excluded) and return when one of them is finished. The return value is an iterator on the finished Comms. */
+  template<class I> static
+  I wait_any(I first, I last)
+  {
+    // Map to dynar<Synchro*>:
+    xbt_dynar_t comms = xbt_dynar_new(sizeof(simgrid::simix::Synchro*), NULL);
+    for(I iter = first; iter != last; iter++) {
+      Comm& comm = **iter;
+      if (comm.state_ == inited)
+        comm.start();
+      xbt_assert(comm.state_ == started);
+      xbt_dynar_push_as(comms, simgrid::simix::Synchro*, comm.pimpl_);
+    }
+    // Call the underlying simcall:
+    int idx = simcall_comm_waitany(comms, -1);
+    xbt_dynar_free(&comms);
+    // Not found:
+    if (idx == -1)
+      return last;
+    // Lift the index to the corresponding iterator:
+    auto res = std::next(first, idx);
+    (*res)->state_ = finished;
+    return res;
+  }
+  /*! Same as wait_any, but with a timeout. If wait_any_for return because of the timeout last is returned.*/
+  template<class I> static
+  I wait_any_for(I first, I last, double timeout)
+  {
+    // Map to dynar<Synchro*>:
+    xbt_dynar_t comms = xbt_dynar_new(sizeof(simgrid::simix::Synchro*), NULL);
+    for(I iter = first; iter != last; iter++) {
+      Comm& comm = **iter;
+      if (comm.state_ == inited)
+        comm.start();
+      xbt_assert(comm.state_ == started);
+      xbt_dynar_push_as(comms, simgrid::simix::Synchro*, comm.pimpl_);
+    }
+    // Call the underlying simcall:
+    int idx = simcall_comm_waitany(comms, timeout);
+    xbt_dynar_free(&comms);
+    // Not found:
+    if (idx == -1)
+      return last;
+    // Lift the index to the corresponding iterator:
+    auto res = std::next(first, idx);
+    (*res)->state_ = finished;
+    return res;
+  }
+  /** Creates (but don't start) an async send to the mailbox @p dest */
   static Comm &send_init(Mailbox &dest);
-  /** Creates and start an async send to the mailbox #dest */
+  /** Creates and start an async send to the mailbox @p dest */
   static Comm &send_async(Mailbox &dest, void *data, int simulatedByteAmount);
-    /** Creates (but don't start) an async recv onto the mailbox #from */
+    /** Creates (but don't start) an async recv onto the mailbox @p from */
   static Comm &recv_init(Mailbox &from);
-  /** Creates and start an async recv to the mailbox #from */
+  /** Creates and start an async recv to the mailbox @p from */
   static Comm &recv_async(Mailbox &from, void **data);
 
   void start() override;
@@ -55,6 +108,8 @@ public:
   /** Retrieve the size of the received data */
   size_t getDstDataSize();
 
+  bool test();
+
 
 private:
   double rate_ = -1;