X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eadbe829389f23151f79257824f3164d7801bbc7..afa62e573131c8a346d4703b58037ee1ff80e69e:/src/surf/StorageImpl.hpp diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index ff68774eb4..3590cae7ee 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -8,7 +8,6 @@ #include "simgrid/kernel/resource/Resource.hpp" #include "simgrid/s4u/Io.hpp" #include "simgrid/s4u/Storage.hpp" -#include "src/kernel/resource/profile/trace_mgr.hpp" #include "src/surf/PropertyHolder.hpp" #include "surf_interface.hpp" @@ -82,7 +81,7 @@ public: void turn_off() override; void destroy(); // Must be called instead of the destructor - virtual Action* io_start(sg_size_t size, s4u::Io::OpType type) = 0; + virtual StorageAction* io_start(sg_size_t size, s4u::Io::OpType type) = 0; /** * @brief Read a file * @@ -98,17 +97,17 @@ public: * @return The StorageAction corresponding to the writing */ virtual StorageAction* write(sg_size_t size) = 0; - virtual std::string getHost() { return attach_; } + const std::string& get_host() const { return attach_; } - lmm::Constraint* constraintWrite_; /* Constraint for maximum write bandwidth*/ - lmm::Constraint* constraintRead_; /* Constraint for maximum write bandwidth*/ + lmm::Constraint* constraint_write_; /* Constraint for maximum write bandwidth*/ + lmm::Constraint* constraint_read_; /* Constraint for maximum write bandwidth*/ std::string typeId_; - std::string content_name; // Only used at parsing time then goes to the FileSystemExtension + std::string content_name_; // Only used at parsing time then goes to the FileSystemExtension sg_size_t size_; // Only used at parsing time then goes to the FileSystemExtension private: - bool currentlyDestroying_ = false; + bool currently_destroying_ = false; // Name of the host to which this storage is attached. Only used at platform parsing time, then the interface stores // the Host directly. std::string attach_;