X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/939476f1fc7630eb237535b07ed0deef77ce1b24..cdf6a962eb4e88efbed3df9c41343adabcf09e6c:/include/simgrid/s4u/Io.hpp

diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp
index 6e3df222a4..c9d55d65c9 100644
--- a/include/simgrid/s4u/Io.hpp
+++ b/include/simgrid/s4u/Io.hpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2017-2018. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2017-2019. 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. */
@@ -10,32 +10,51 @@
 #include <simgrid/s4u/Activity.hpp>
 
 #include <atomic>
+#include <string>
 
 namespace simgrid {
 namespace s4u {
 
-class XBT_PUBLIC Io : public Activity {
-  Io() : Activity() {}
+/** I/O Activity, representing the asynchronous disk access.
+ *
+ * They are generated from Disk::io_init(), Disk::read() Disk::read_async(), Disk::write() and Disk::write_async().
+ */
+
+class XBT_PUBLIC Io : public Activity_T<Io> {
 public:
+  enum class OpType { READ, WRITE };
+
+private:
+  Storage* storage_ = nullptr;
+  Disk* disk_       = nullptr;
+  sg_size_t size_   = 0;
+  OpType type_      = OpType::READ;
+  std::atomic_int_fast32_t refcount_{0};
+
+  explicit Io(sg_storage_t storage, sg_size_t size, OpType type);
+  explicit Io(sg_disk_t disk, sg_size_t size, OpType type);
+
+public:
+#ifndef DOXYGEN
   friend XBT_PUBLIC void intrusive_ptr_release(simgrid::s4u::Io* i);
   friend XBT_PUBLIC void intrusive_ptr_add_ref(simgrid::s4u::Io* i);
+  friend Disk;    // Factory of IOs
   friend Storage; // Factory of IOs
+#endif
 
   ~Io() = default;
 
-  Activity* start() override;
-  Activity* wait() override;
-  Activity* wait(double timeout) override;
-  Activity* cancel() override;
+  Io* start() override;
+  Io* wait() override;
+  Io* wait_for(double timeout) override;
+  Io* cancel() override;
+  bool test() override;
 
   double get_remaining() override;
+  sg_size_t get_performed_ioops();
+};
 
-private:
-  sg_size_t size_       = 0;
-  sg_storage_t storage_ = nullptr;
-  std::atomic_int_fast32_t refcount_{0};
-}; // class
-}
-}; // Namespace simgrid::s4u
+} // namespace s4u
+} // namespace simgrid
 
 #endif /* SIMGRID_S4U_IO_HPP */