X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/832a679c3195a9d11796dd2918988362b0f4bc70..07eb08dd092e89871ab3ed9fcf41ad0219598e3b:/src/surf/StorageImpl.hpp diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index 6f1f2b95b3..20ccd5571f 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -32,28 +32,27 @@ class StorageAction; * @brief Callbacks handler which emit the callbacks after Storage creation * * @details Callback functions have the following signature: `void(Storage*)` */ -XBT_PUBLIC_DATA(simgrid::xbt::signal) storageCreatedCallbacks; +XBT_PUBLIC_DATA(simgrid::xbt::signal) storageCreatedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after Storage destruction * * @details Callback functions have the following signature: `void(StoragePtr)` */ -XBT_PUBLIC_DATA(simgrid::xbt::signal) storageDestructedCallbacks; +XBT_PUBLIC_DATA(simgrid::xbt::signal) storageDestructedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after Storage State changed * * @details Callback functions have the following signature: `void(StorageAction *action, int previouslyOn, int * currentlyOn)` */ -XBT_PUBLIC_DATA(simgrid::xbt::signal) storageStateChangedCallbacks; +XBT_PUBLIC_DATA(simgrid::xbt::signal) storageStateChangedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after StorageAction State changed * * @details Callback functions have the following signature: `void(StorageAction *action, simgrid::surf::Action::State * old, simgrid::surf::Action::State current)` */ -XBT_PUBLIC_DATA(simgrid::xbt::signal) +XBT_PUBLIC_DATA(simgrid::xbt::signal) storageActionStateChangedCallbacks; /********* @@ -81,7 +80,7 @@ public: * @brief SURF storage interface class * @details A Storage represent a storage unit (e.g.: hard drive, usb key) */ -class StorageImpl : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder { +class StorageImpl : public kernel::model::Resource, public PropertyHolder { public: /** @brief Storage constructor */ StorageImpl(Model* model, std::string name, lmm_system_t maxminSystem, double bread, double bwrite, @@ -91,7 +90,7 @@ public: /** @brief Public interface */ s4u::Storage piface_; - static StorageImpl* byName(const char* name); + static StorageImpl* byName(std::string name); /** @brief Check if the Storage is used (if an action currently uses its resources) */ bool isUsed() override; @@ -116,43 +115,19 @@ public: * @return The StorageAction corresponding to the writing */ virtual StorageAction* write(sg_size_t size) = 0; - - /** - * @brief Get the content of the current Storage - * - * @return A xbt_dict_t with path as keys and size in bytes as values - */ - virtual std::map* getContent(); - - /** - * @brief Get the available size in bytes of the current Storage - * - * @return The available size in bytes of the current Storage - */ - virtual sg_size_t getFreeSize(); - - /** - * @brief Get the used size in bytes of the current Storage - * - * @return The used size in bytes of the current Storage - */ - virtual sg_size_t getUsedSize(); - virtual sg_size_t getSize() { return size_; } virtual std::string getHost() { return attach_; } - std::map* parseContent(std::string filename); static std::unordered_map* storagesMap() { return StorageImpl::storages; } - lmm_constraint_t constraintWrite_; /* Constraint for maximum write bandwidth*/ - lmm_constraint_t constraintRead_; /* Constraint for maximum write bandwidth*/ + kernel::lmm::Constraint* constraintWrite_; /* Constraint for maximum write bandwidth*/ + kernel::lmm::Constraint* constraintRead_; /* Constraint for maximum write bandwidth*/ std::string typeId_; - sg_size_t usedSize_ = 0; + 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: - sg_size_t size_; static std::unordered_map* storages; - std::map* content_; // 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_; @@ -165,10 +140,10 @@ private: /** @ingroup SURF_storage_interface * @brief The possible type of action for the storage component */ -typedef enum { +enum e_surf_action_storage_type_t { READ = 0, /**< Read a file */ WRITE /**< Write in a file */ -} e_surf_action_storage_type_t; +}; /** @ingroup SURF_storage_interface * @brief SURF storage action interface class @@ -197,7 +172,7 @@ public: * @param storage The Storage associated to this StorageAction * @param type [description] */ - StorageAction(Model* model, double cost, bool failed, lmm_variable_t var, StorageImpl* storage, + StorageAction(Model* model, double cost, bool failed, kernel::lmm::Variable* var, StorageImpl* storage, e_surf_action_storage_type_t type) : Action(model, cost, failed, var), type_(type), storage_(storage){}; @@ -205,7 +180,6 @@ public: e_surf_action_storage_type_t type_; StorageImpl* storage_; - FileImpl* file_ = nullptr; }; class StorageType { @@ -213,10 +187,10 @@ public: std::string id; std::string model; std::string content; - xbt_dict_t properties; + std::map* properties; std::map* model_properties; sg_size_t size; - StorageType(std::string id, std::string model, std::string content, xbt_dict_t properties, + StorageType(std::string id, std::string model, std::string content, std::map* properties, std::map* model_properties, sg_size_t size) : id(id), model(model), content(content), properties(properties), model_properties(model_properties), size(size) {