X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1a64ca4c11a1eb7ba2ecd102f877ac571486a034..575da6eb0c35cfee471dcdce960cc4b30440532d:/include/simgrid/s4u/Io.hpp

diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp
index 832631d656..2ed2ca8f1b 100644
--- a/include/simgrid/s4u/Io.hpp
+++ b/include/simgrid/s4u/Io.hpp
@@ -20,39 +20,34 @@ namespace s4u {
  */
 
 class XBT_PUBLIC Io : public Activity_T<Io> {
-public:
-  enum class OpType { READ, WRITE };
+  friend kernel::activity::IoImpl;
 
-private:
-  Disk* disk_       = nullptr;
-  sg_size_t size_   = 0;
-  OpType type_      = OpType::READ;
+protected:
+  explicit Io(kernel::activity::IoImplPtr pimpl);
 
-  Io();
+  void complete(Activity::State state) override;
 
 public:
-#ifndef DOXYGEN
-  friend Disk;    // Factory of IOs
-
-  ~Io() override = default;
-#endif
+  enum class OpType { READ, WRITE };
 
   static xbt::signal<void(Io const&)> on_start;
   static xbt::signal<void(Io const&)> on_completion;
 
   static IoPtr init();
   Io* start() override;
-  Io* wait() override;
-  Io* wait_for(double timeout) override;
-  Io* cancel() override;
+  /*! take a vector of s4u::IoPtr and return when one of them is finished.
+   * The return value is the rank of the first finished IoPtr. */
+  static ssize_t wait_any(const std::vector<IoPtr>& ios) { return wait_any_for(ios, -1); }
+  /*! Same as wait_any, but with a timeout. If the timeout occurs, parameter last is returned.*/
+  static ssize_t wait_any_for(const std::vector<IoPtr>& ios, double timeout);
 
   double get_remaining() const override;
   sg_size_t get_performed_ioops() const;
-  IoPtr set_disk(sg_disk_t disk);
+  IoPtr set_disk(const_sg_disk_t disk);
   IoPtr set_size(sg_size_t size);
   IoPtr set_op_type(OpType type);
 
-  bool is_assigned() const override { return disk_ != nullptr; }
+  bool is_assigned() const override;
 };
 
 } // namespace s4u