X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bcb5cde966bef9e174da1c93cdb2158c0880a613..07eb08dd092e89871ab3ed9fcf41ad0219598e3b:/src/surf/StorageImpl.hpp diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index 4773a9b37e..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; /********* @@ -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 kernel::model::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; @@ -102,76 +100,37 @@ public: void turnOn() override; void turnOff() override; - std::map* content_; - sg_size_t size_; - sg_size_t usedSize_; - std::string typeId_; - std::string attach_; // Name of the host to which this storage is attached. - // Only used until the platform is fully parsed only. - // Then the interface stores the Host directly. - /** - * @brief Open a file - * - * @param mount The mount point - * @param path The path to the file - * - * @return The StorageAction corresponding to the opening - */ - virtual StorageAction* open(const char* mount, const char* path) = 0; - - /** - * @brief Close a file - * - * @param fd The file descriptor to close - * @return The StorageAction corresponding to the closing - */ - virtual StorageAction* close(surf_file_t fd) = 0; - /** * @brief Read a file * - * @param fd The file descriptor to read * @param size The size in bytes to read * @return The StorageAction corresponding to the reading */ - virtual StorageAction* read(surf_file_t fd, sg_size_t size) = 0; + virtual StorageAction* read(sg_size_t size) = 0; /** * @brief Write a file * - * @param fd The file descriptor to write * @param size The size in bytes to write * @return The StorageAction corresponding to the writing */ - virtual StorageAction* write(surf_file_t fd, sg_size_t size) = 0; + virtual StorageAction* write(sg_size_t size) = 0; + virtual std::string getHost() { return attach_; } - /** - * @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(); + static std::unordered_map* storagesMap() { return StorageImpl::storages; } - /** - * @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(); + kernel::lmm::Constraint* constraintWrite_; /* Constraint for maximum write bandwidth*/ + kernel::lmm::Constraint* constraintRead_; /* Constraint for maximum write bandwidth*/ - /** - * @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(); + std::string typeId_; + 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 - std::map* parseContent(const char* filename); +private: static std::unordered_map* storages; - 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*/ + // 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_; }; /********** @@ -181,13 +140,10 @@ public: /** @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 */ - STAT, /**< Stat a file */ - OPEN, /**< Open a file */ - CLOSE /**< Close a file */ -} e_surf_action_storage_type_t; + WRITE /**< Write in a file */ +}; /** @ingroup SURF_storage_interface * @brief SURF storage action interface class @@ -203,7 +159,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 @@ -215,27 +172,31 @@ 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, - e_surf_action_storage_type_t type); + 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){}; 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_ */