X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8816765fafedb6fe7a30a663d1fd2eb3955c06f5..c6d6e5b87aed9c7080c981b11f91f2d0205623c3:/include/simgrid/s4u/Io.hpp

diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp
index 0a502aa6f3..3cca8a7991 100644
--- a/include/simgrid/s4u/Io.hpp
+++ b/include/simgrid/s4u/Io.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2019. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2023. 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. */
@@ -9,7 +9,6 @@
 #include <simgrid/forward.h>
 #include <simgrid/s4u/Activity.hpp>
 
-#include <atomic>
 #include <string>
 
 namespace simgrid {
@@ -17,43 +16,55 @@ namespace s4u {
 
 /** I/O Activity, representing the asynchronous disk access.
  *
- * They are generated from Storage::io_init() or Storage::read() and Storage::write().
+ * They are generated from Disk::io_init(), Disk::read() Disk::read_async(), Disk::write() and Disk::write_async().
  */
 
-class XBT_PUBLIC Io : public Activity {
+class XBT_PUBLIC Io : public Activity_T<Io> {
+#ifndef DOXYGEN
+  friend kernel::activity::IoImpl;
+  friend kernel::EngineImpl;
+#endif
+
+  static xbt::signal<void(Io const&)> on_start;
+
+protected:
+  explicit Io(kernel::activity::IoImplPtr pimpl);
+  Io* do_start() override;
+
 public:
   enum class OpType { READ, WRITE };
 
-private:
-  Storage* storage_ = nullptr;
-  sg_size_t size_   = 0;
-  OpType type_      = OpType::READ;
-  std::string name_ = "";
-  std::atomic_int_fast32_t refcount_{0};
+  static void on_start_cb(const std::function<void(Io const&)>& cb) { on_start.connect(cb); }
+  void fire_this_completion() const { on_completion(*this); }
 
-  explicit Io(sg_storage_t storage, sg_size_t size, OpType type);
+  static IoPtr init();
+  /*! 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);
 
-public:
-  friend XBT_PUBLIC void intrusive_ptr_release(simgrid::s4u::Io* i);
-  friend XBT_PUBLIC void intrusive_ptr_add_ref(simgrid::s4u::Io* i);
-  friend simgrid::s4u::Storage; // Factory of IOs
+  double get_remaining() const override;
+  sg_size_t get_performed_ioops() const;
+  IoPtr set_disk(const_sg_disk_t disk);
+  IoPtr set_priority(double priority);
+  IoPtr set_size(sg_size_t size);
+  IoPtr set_op_type(OpType type);
 
-  ~Io() = default;
+  static IoPtr streamto_init(Host* from, const Disk* from_disk, Host* to, const Disk* to_disk);
+  static IoPtr streamto_async(Host* from, const Disk* from_disk, Host* to, const Disk* to_disk,
+                              uint64_t simulated_size_in_bytes);
+  static void streamto(Host* from, const Disk* from_disk, Host* to, const Disk* to_disk,
+                       uint64_t simulated_size_in_bytes);
 
-  Io* start() override;
-  Io* wait() override;
-  Io* wait_for(double timeout) override;
-  Io* cancel() override;
-  bool test() override;
+  IoPtr set_source(Host* from, const Disk* from_disk);
+  IoPtr set_destination(Host* to, const Disk* to_disk);
 
-  double get_remaining() override;
-  sg_size_t get_performed_ioops();
+  IoPtr update_priority(double priority);
 
-#ifndef DOXYGEN
-  XBT_ATTRIB_DEPRECATED_v324("Please use Io::wait_for()") void wait(double t) override { wait_for(t); }
-#endif
+  bool is_assigned() const override;
+};
 
-}; // class
 } // namespace s4u
 } // namespace simgrid