X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/934b99618c47f4cb4b0761aa80a8147672108f58..0f04bc651ecbb1b743345364ee076aa8e68b4f4e:/include/simgrid/s4u/Io.hpp

diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp
index 854bee65c5..1e7825bddd 100644
--- a/include/simgrid/s4u/Io.hpp
+++ b/include/simgrid/s4u/Io.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2020. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2021. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
@@ -20,36 +20,36 @@ namespace s4u {
  */
 
 class XBT_PUBLIC Io : public Activity_T<Io> {
-public:
-  enum class OpType { READ, WRITE };
+#ifndef DOXYGEN
+  friend kernel::activity::IoImpl;
+#endif
 
-private:
-  Storage* storage_ = nullptr;
-  Disk* disk_       = nullptr;
-  sg_size_t size_   = 0;
-  OpType type_      = OpType::READ;
+protected:
+  explicit Io(kernel::activity::IoImplPtr pimpl);
 
-  explicit Io(sg_storage_t storage, sg_size_t size, OpType type);
-  explicit Io(sg_disk_t disk, sg_size_t size, OpType type);
+  void complete(Activity::State state) override;
 
 public:
-#ifndef DOXYGEN
-  friend Disk;    // Factory of IOs
-  friend Storage; // 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(const_sg_disk_t disk);
+  IoPtr set_size(sg_size_t size);
+  IoPtr set_op_type(OpType type);
+
+  bool is_assigned() const override;
 };
 
 } // namespace s4u