Prefer a reference for first parameter of {test,wait}_{all,any}.

[simgrid.git] / include / simgrid / s4u / Io.hpp

diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp
index 2f3f6562f079f37c0ba88177b911e5f66d56e87e..dbcff8e0943d4b72c30f4a7100832cf3ab53a301 100644 (file)
--- a/include/simgrid/s4u/Io.hpp
+++ b/include/simgrid/s4u/Io.hpp
@@ -20,10 +20,12 @@ namespace s4u {
  */
 
 class XBT_PUBLIC Io : public Activity_T<Io> {
-#ifndef DOXYGEN
-  friend Disk;    // Factory of IOs
-#endif
-  Io();
+  friend kernel::activity::IoImpl;
+
+protected:
+  explicit Io(kernel::activity::IoImplPtr pimpl);
+
+  void complete(Activity::State state) override;
 
 public:
   enum class OpType { READ, WRITE };
@@ -33,13 +35,15 @@ public:
 
   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 int 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 int 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);