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

diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp
index 72b5ea2296..0a502aa6f3 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. */
@@ -17,7 +17,7 @@ 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 Storage::io_init() or Storage::read() and Storage::write().
  */
 
 class XBT_PUBLIC Io : public Activity {
@@ -25,30 +25,36 @@ public:
   enum class OpType { READ, WRITE };
 
 private:
-  explicit Io(sg_size_t size, OpType type) : Activity(), size_(size), type_(type) {}
+  Storage* storage_ = nullptr;
+  sg_size_t size_   = 0;
+  OpType type_      = OpType::READ;
+  std::string name_ = "";
+  std::atomic_int_fast32_t refcount_{0};
+
+  explicit Io(sg_storage_t storage, 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 Storage; // Factory of IOs
+  friend simgrid::s4u::Storage; // Factory of IOs
 
   ~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::string name_     = "";
-  OpType type_          = OpType::READ;
-  std::atomic_int_fast32_t refcount_{0};
+#ifndef DOXYGEN
+  XBT_ATTRIB_DEPRECATED_v324("Please use Io::wait_for()") void wait(double t) override { wait_for(t); }
+#endif
+
 }; // class
-}
-}; // Namespace simgrid::s4u
+} // namespace s4u
+} // namespace simgrid
 
 #endif /* SIMGRID_S4U_IO_HPP */