X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7bd4c4c813d5e95bbe17bab38c0c07e53a50218d..74b9dc06b8ce6aa6e1f1087ceadfc09aee0ddaaa:/src/surf/StorageImpl.hpp diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index 97a3e7d588..c66f9f96d7 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; /********* @@ -68,8 +67,8 @@ public: StorageModel(); ~StorageModel(); - virtual StorageImpl* createStorage(const char* id, const char* type_id, const char* content_name, - const char* attach) = 0; + virtual StorageImpl* createStorage(std::string id, std::string type_id, std::string content_name, + std::string attach) = 0; std::vector p_storageList; }; @@ -81,18 +80,17 @@ 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 Resource, public PropertyHolder { public: /** @brief Storage constructor */ - StorageImpl(Model* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite, - const char* type_id, const char* content_name, sg_size_t size, const char* attach); + StorageImpl(Model* model, std::string name, lmm_system_t maxminSystem, double bread, double bwrite, + std::string type_id, std::string content_name, sg_size_t size, std::string attach); ~StorageImpl() override; -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; @@ -121,7 +119,7 @@ public: /** * @brief Get the content of the current Storage * - * @return A xbt_dict_t with path as keys and size in bytes as values + * @return A map with path as keys and size in bytes as values */ virtual std::map* getContent(); @@ -141,8 +139,7 @@ public: virtual sg_size_t getSize() { return size_; } virtual std::string getHost() { return attach_; } - std::map* parseContent(const char* filename); - static std::unordered_map* storages; + std::map* parseContent(std::string filename); static std::unordered_map* storagesMap() { return StorageImpl::storages; } lmm_constraint_t constraintWrite_; /* Constraint for maximum write bandwidth*/ @@ -153,6 +150,7 @@ public: 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. @@ -166,10 +164,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 @@ -185,7 +183,8 @@ public: * @param storage The Storage associated to this StorageAction * @param type [description] */ - StorageAction(Model* model, double cost, bool failed, StorageImpl* storage, e_surf_action_storage_type_t type); + StorageAction(Model* model, double cost, bool failed, StorageImpl* storage, e_surf_action_storage_type_t type) + : Action(model, cost, failed), type_(type), storage_(storage){}; /** * @brief StorageAction constructor @@ -198,26 +197,30 @@ public: * @param type [description] */ StorageAction(Model* model, double cost, bool failed, lmm_variable_t var, StorageImpl* storage, - e_surf_action_storage_type_t type); + e_surf_action_storage_type_t type) + : Action(model, cost, failed, var), type_(type), storage_(storage){}; void setState(simgrid::surf::Action::State state) override; e_surf_action_storage_type_t type_; StorageImpl* storage_; - FileImpl* file_; - double progress_; }; -} -} -typedef struct s_storage_type { - char* model; - char* content; - char* type_id; - xbt_dict_t properties; +class StorageType { +public: + std::string id; + std::string model; + std::string content; + std::map* properties; std::map* model_properties; sg_size_t size; -} s_storage_type_t; -typedef s_storage_type_t* storage_type_t; + 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) + { + } +}; +} +} #endif /* STORAGE_INTERFACE_HPP_ */