X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0a9ce6009d2a98f3ef66a8a1b020106f09e5568c..cc79d648c6fd0e8fc281e263c24fe72adbe59769:/src/surf/StorageImpl.hpp diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index 4fe1443585..da13a3ced4 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -1,59 +1,39 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include -#include - +#include "simgrid/kernel/resource/Action.hpp" +#include "simgrid/kernel/resource/Model.hpp" +#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" + #include #ifndef STORAGE_INTERFACE_HPP_ #define STORAGE_INTERFACE_HPP_ -namespace simgrid { -namespace surf { +/********* + * Model * + *********/ + +XBT_PUBLIC_DATA simgrid::kernel::resource::StorageModel* surf_storage_model; +namespace simgrid { +namespace kernel { +namespace resource { /*********** * Classes * ***********/ class StorageAction; - -/************* - * Callbacks * - *************/ - -/** @ingroup SURF_callbacks - * @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; - -/** @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; - -/** @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; - -/** @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)` +/** @ingroup SURF_storage_interface + * @brief The possible type of action for the storage component */ -XBT_PUBLIC_DATA(simgrid::xbt::signal) -storageActionStateChangedCallbacks; /********* * Model * @@ -62,15 +42,15 @@ storageActionStateChangedCallbacks; * @brief SURF storage model interface class * @details A model is an object which handle the interactions between its Resources and its Actions */ -class StorageModel : public Model { +class StorageModel : public kernel::resource::Model { public: StorageModel(); + StorageModel(const StorageModel&) = delete; + StorageModel& operator=(const StorageModel&) = delete; ~StorageModel(); - virtual StorageImpl* createStorage(std::string id, std::string type_id, std::string content_name, - std::string attach) = 0; - - std::vector p_storageList; + virtual StorageImpl* createStorage(const std::string& id, const std::string& type_id, const std::string& content_name, + const std::string& attach) = 0; }; /************ @@ -80,26 +60,29 @@ public: * @brief SURF storage interface class * @details A Storage represent a storage unit (e.g.: hard drive, usb key) */ -class StorageImpl : public Resource, public PropertyHolder { +class StorageImpl : public Resource, public surf::PropertyHolder { public: /** @brief Storage constructor */ - 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(Model* model, const std::string& name, kernel::lmm::System* maxmin_system, double bread, double bwrite, + const std::string& type_id, const std::string& content_name, sg_size_t size, const std::string& attach); + StorageImpl(const StorageImpl&) = delete; + StorageImpl& operator=(const StorageImpl&) = delete; ~StorageImpl() override; /** @brief Public interface */ s4u::Storage piface_; - static StorageImpl* byName(std::string name); /** @brief Check if the Storage is used (if an action currently uses its resources) */ - bool isUsed() override; + bool is_used() override; - void apply_event(tmgr_trace_event_t event, double value) override; + void apply_event(profile::Event* event, double value) override; - void turnOn() override; - void turnOff() override; + void turn_on() override; + 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; /** * @brief Read a file * @@ -115,22 +98,17 @@ public: * @return The StorageAction corresponding to the writing */ virtual StorageAction* write(sg_size_t size) = 0; - virtual sg_size_t getSize() { return size_; } - virtual std::string getHost() { return attach_; } - - static std::unordered_map* storagesMap() { return StorageImpl::storages; } + const std::string& get_host() const { return attach_; } - lmm_constraint_t constraintWrite_; /* Constraint for maximum write bandwidth*/ - lmm_constraint_t 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_; - sg_size_t usedSize_ = 0; - std::string content_name; + 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_; + 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_; @@ -140,29 +118,28 @@ private: * Action * **********/ -/** @ingroup SURF_storage_interface - * @brief The possible type of action for the storage component - */ -enum e_surf_action_storage_type_t { - READ = 0, /**< Read a file */ - WRITE /**< Write in a file */ -}; - /** @ingroup SURF_storage_interface * @brief SURF storage action interface class */ class StorageAction : public Action { public: + /** + * @brief Callbacks handler which emit the callbacks after StorageAction State changed * + * @details Callback functions have the following signature: `void(StorageAction& action, + * simgrid::kernel::resource::Action::State old, simgrid::kernel::resource::Action::State current)` + */ + static xbt::signal on_state_change; + /** * @brief StorageAction constructor * * @param model The StorageModel associated to this StorageAction - * @param cost The cost of this NetworkAction in [TODO] + * @param cost The cost of this StorageAction in bytes * @param failed [description] * @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, s4u::Io::OpType type) : Action(model, cost, failed), type_(type), storage_(storage){}; /** @@ -175,13 +152,13 @@ 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(kernel::resource::Model* model, double cost, bool failed, kernel::lmm::Variable* var, + StorageImpl* storage, s4u::Io::OpType type) : Action(model, cost, failed, var), type_(type), storage_(storage){}; - void setState(simgrid::surf::Action::State state) override; + void set_state(simgrid::kernel::resource::Action::State state) override; - e_surf_action_storage_type_t type_; + s4u::Io::OpType type_; StorageImpl* storage_; }; @@ -190,16 +167,18 @@ public: std::string id; std::string model; std::string content; - std::map* properties; - std::map* model_properties; + std::unordered_map* properties; + std::unordered_map* model_properties; sg_size_t size; - StorageType(std::string id, std::string model, std::string content, std::map* properties, - std::map* model_properties, sg_size_t size) + StorageType(const std::string& id, const std::string& model, const std::string& content, + std::unordered_map* properties, + std::unordered_map* model_properties, sg_size_t size) : id(id), model(model), content(content), properties(properties), model_properties(model_properties), size(size) { } }; -} -} +} // namespace resource +} // namespace kernel +} // namespace simgrid #endif /* STORAGE_INTERFACE_HPP_ */