X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/86e534066dafbcbb2284a75ad76d8258a329d226..2a1dda68beb91ffc5514501ded2e03c3fe42b760:/src/surf/StorageImpl.hpp diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index a77c79b3c3..1f3d1702a6 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -7,12 +7,13 @@ #include #include +#include "simgrid/kernel/resource/Action.hpp" +#include "simgrid/kernel/resource/Model.hpp" +#include "simgrid/kernel/resource/Resource.hpp" #include "simgrid/s4u/Storage.hpp" -#include "src/kernel/resource/Action.hpp" -#include "src/kernel/resource/Model.hpp" -#include "src/kernel/resource/Resource.hpp" #include "src/surf/PropertyHolder.hpp" #include "surf_interface.hpp" + #include #ifndef STORAGE_INTERFACE_HPP_ @@ -35,28 +36,29 @@ 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)` + * @details Callback functions have the following signature: `void(StorageAction *action, + * simgrid::kernel::resource::Action::State old, simgrid::kernel::resource::Action::State current)` */ -XBT_PUBLIC_DATA(simgrid::xbt::signal) -storageActionStateChangedCallbacks; +XBT_PUBLIC_DATA +simgrid::xbt::signal + storageActionStateChangedCallbacks; /********* * Model * @@ -65,15 +67,13 @@ 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(); virtual StorageImpl* createStorage(std::string id, std::string type_id, std::string content_name, std::string attach) = 0; - - std::vector p_storageList; }; /************ @@ -86,14 +86,13 @@ public: class StorageImpl : public kernel::resource::Resource, public PropertyHolder { public: /** @brief Storage constructor */ - StorageImpl(Model* model, std::string name, lmm_system_t maxminSystem, double bread, double bwrite, + StorageImpl(kernel::resource::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; /** @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; @@ -120,8 +119,6 @@ public: virtual StorageAction* write(sg_size_t size) = 0; virtual std::string getHost() { return attach_; } - static std::unordered_map* storagesMap() { return StorageImpl::storages; } - kernel::lmm::Constraint* constraintWrite_; /* Constraint for maximum write bandwidth*/ kernel::lmm::Constraint* constraintRead_; /* Constraint for maximum write bandwidth*/ @@ -130,7 +127,6 @@ public: sg_size_t size_; // Only used at parsing time then goes to the FileSystemExtension private: - static std::unordered_map* storages; // 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_; @@ -151,7 +147,7 @@ enum e_surf_action_storage_type_t { /** @ingroup SURF_storage_interface * @brief SURF storage action interface class */ -class StorageAction : public Action { +class StorageAction : public kernel::resource::Action { public: /** * @brief StorageAction constructor @@ -162,7 +158,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(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage, + e_surf_action_storage_type_t type) : Action(model, cost, failed), type_(type), storage_(storage){}; /** @@ -175,11 +172,11 @@ public: * @param storage The Storage associated to this StorageAction * @param type [description] */ - StorageAction(Model* model, double cost, bool failed, kernel::lmm::Variable* 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, e_surf_action_storage_type_t type) : Action(model, cost, failed, var), type_(type), storage_(storage){}; - void setState(simgrid::surf::Action::State state) override; + void setState(simgrid::kernel::resource::Action::State state) override; e_surf_action_storage_type_t type_; StorageImpl* storage_;