X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..ac080087b39ef79ff497d3992ff04b3e20fe40b2:/include/simgrid/s4u/Io.hpp

diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp
index 4e7ae31a54..b4ef0c27b1 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. */
@@ -9,7 +9,6 @@
 #include <simgrid/forward.h>
 #include <simgrid/s4u/Activity.hpp>
 
-#include <atomic>
 #include <string>
 
 namespace simgrid {
@@ -17,19 +16,27 @@ namespace s4u {
 
 /** I/O Activity, representing the asynchronous disk access.
  *
- * They are generated from simgrid::s4u::Storage::read() and simgrid::s4u::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> {
 public:
   enum class OpType { READ, WRITE };
 
 private:
-  explicit Io(sg_size_t size, OpType type) : Activity(), size_(size), type_(type) {}
+  Storage* storage_ = nullptr;
+  Disk* disk_       = nullptr;
+  sg_size_t size_   = 0;
+  OpType type_      = OpType::READ;
+
+  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:
-  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
+#ifndef DOXYGEN
+  friend Disk;    // Factory of IOs
+  friend Storage; // Factory of IOs
+#endif
 
   ~Io() = default;
 
@@ -41,19 +48,9 @@ public:
 
   double get_remaining() override;
   sg_size_t get_performed_ioops();
+};
 
-#ifndef DOXYGEN
-  XBT_ATTRIB_DEPRECATED_v324("Please use Io::wait_for()") void wait(double t) override { wait_for(t); }
-#endif
-
-private:
-  sg_size_t size_       = 0;
-  sg_storage_t storage_ = nullptr;
-  std::string name_     = "";
-  OpType type_          = OpType::READ;
-  std::atomic_int_fast32_t refcount_{0};
-}; // class
-}
-}; // Namespace simgrid::s4u
+} // namespace s4u
+} // namespace simgrid
 
 #endif /* SIMGRID_S4U_IO_HPP */