X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/2c35f563c1eb2624079c12f7ab27453e809ff599..f5f972472de4503232dcb8658fb650b6f7c40b80:/include/simgrid/s4u/Disk.hpp diff --git a/include/simgrid/s4u/Disk.hpp b/include/simgrid/s4u/Disk.hpp index 70c5bf2366..106da72666 100644 --- a/include/simgrid/s4u/Disk.hpp +++ b/include/simgrid/s4u/Disk.hpp @@ -37,27 +37,22 @@ protected: virtual ~Disk() = default; public: - /** @brief Callback signal fired when a new Storage is created */ + /** @brief Callback signal fired when a new Disk is created */ static xbt::signal on_creation; - /** @brief Callback signal fired when a Storage is destroyed */ + /** @brief Callback signal fired when a Disk is destroyed */ static xbt::signal on_destruction; - /** @brief Callback signal fired when a Storage's state changes */ + /** @brief Callback signal fired when a Disk's state changes */ static xbt::signal on_state_change; - /** @brief Retrieves the name of that storage as a C++ string */ + /** @brief Retrieves the name of that disk as a C++ string */ std::string const& get_name() const { return name_; } - /** @brief Retrieves the name of that storage as a C string */ + /** @brief Retrieves the name of that disk as a C string */ const char* get_cname() const { return name_.c_str(); } - Host* get_host() { return attached_to_; }; - void set_host(Host* host) { attached_to_ = host; } - const std::unordered_map* get_properties() const; const char* get_property(const std::string& key) const; void set_property(const std::string&, const std::string& value); - - void set_data(void* data) { userdata_ = data; } - void* get_data() { return userdata_; } + Host* get_host(); IoPtr io_init(sg_size_t size, s4u::Io::OpType type); @@ -69,10 +64,8 @@ public: kernel::resource::DiskImpl* get_impl() const { return pimpl_; } private: - Host* attached_to_ = nullptr; kernel::resource::DiskImpl* const pimpl_; std::string name_; - void* userdata_ = nullptr; }; } // namespace s4u