/** 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 {
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:
+#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 simgrid::s4u::Storage; // Factory of IOs
+ friend Storage; // Factory of IOs
+#endif
~Io() = default;
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 */