X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/640e6f6494f5e1151f6436aea0e0c515da2c144b..3ad41a910feecc815ecd91d5cfceaa740068d7b4:/include/simgrid/s4u/Io.hpp diff --git a/include/simgrid/s4u/Io.hpp b/include/simgrid/s4u/Io.hpp index 8ac60403f2..73593abf41 100644 --- a/include/simgrid/s4u/Io.hpp +++ b/include/simgrid/s4u/Io.hpp @@ -26,17 +26,22 @@ public: private: Storage* storage_ = nullptr; + Disk* disk_ = 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); + 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; @@ -48,10 +53,6 @@ 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 }; } // namespace s4u