X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc4eceb15c80a597e44222b8c0ff60caf85db959..c97c73bdc69512d26f4e807c1e6f417d3b1db874:/src/surf/StorageImpl.hpp diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index e3c508acd3..b1c60472f4 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2004-2020. 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. */ @@ -8,18 +8,23 @@ #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 "xbt/PropertyHolder.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 * ***********/ @@ -28,18 +33,6 @@ class StorageAction; /** @ingroup SURF_storage_interface * @brief The possible type of action for the storage component */ -/************* - * Callbacks * - *************/ - -/** @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::kernel::resource::Action::State old, simgrid::kernel::resource::Action::State current)` - */ -XBT_PUBLIC_DATA -simgrid::xbt::signal - on_state_change; /********* * Model * @@ -55,8 +48,8 @@ public: StorageModel& operator=(const StorageModel&) = delete; ~StorageModel(); - virtual StorageImpl* createStorage(std::string id, std::string type_id, std::string content_name, - std::string attach) = 0; + virtual StorageImpl* createStorage(const std::string& id, const std::string& type_id, const std::string& content_name, + const std::string& attach) = 0; }; /************ @@ -66,29 +59,42 @@ public: * @brief SURF storage interface class * @details A Storage represent a storage unit (e.g.: hard drive, usb key) */ -class StorageImpl : public kernel::resource::Resource, public PropertyHolder { +class StorageImpl : public Resource, public xbt::PropertyHolder { + s4u::Storage piface_; + lmm::Constraint* constraint_read_; /* Constraint for maximum write bandwidth*/ + lmm::Constraint* constraint_write_; /* Constraint for maximum write bandwidth*/ + + std::string typeId_; + 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_; + public: + const std::string content_name_; // Only used at parsing time then goes to the FileSystemExtension + const sg_size_t size_; // Only used at parsing time then goes to the FileSystemExtension /** @brief Storage constructor */ - StorageImpl(kernel::resource::Model* model, const std::string& name, kernel::lmm::System* maxmin_system, 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_; - + s4u::Storage* get_iface() { return &piface_; } + const char* get_type() { return typeId_.c_str(); } + lmm::Constraint* get_read_constraint() const { return constraint_read_; } + lmm::Constraint* get_write_constraint() const { return constraint_write_; } /** @brief Check if the Storage is used (if an action currently uses its resources) */ bool is_used() override; - void apply_event(simgrid::kernel::profile::Event* event, double value) override; + void apply_event(profile::Event* event, double value) override; void turn_on() override; void turn_off() override; void destroy(); // Must be called instead of the destructor - virtual simgrid::kernel::resource::Action* io_start(sg_size_t size, s4u::Io::OpType type) = 0; + virtual StorageAction* io_start(sg_size_t size, s4u::Io::OpType type) = 0; /** * @brief Read a file * @@ -104,20 +110,7 @@ public: * @return The StorageAction corresponding to the writing */ virtual StorageAction* write(sg_size_t size) = 0; - virtual std::string getHost() { return attach_; } - - kernel::lmm::Constraint* constraintWrite_; /* Constraint for maximum write bandwidth*/ - kernel::lmm::Constraint* constraintRead_; /* Constraint for maximum write bandwidth*/ - - 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 - -private: - bool currentlyDestroying_ = 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_; + const std::string& get_host() const { return attach_; } }; /********** @@ -127,10 +120,14 @@ private: /** @ingroup SURF_storage_interface * @brief SURF storage action interface class */ -class StorageAction : public kernel::resource::Action { +class StorageAction : public Action { public: - static xbt::signal - on_state_change; + /** + * @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 @@ -141,7 +138,7 @@ public: * @param storage The Storage associated to this StorageAction * @param type [description] */ - StorageAction(kernel::resource::Model* model, double cost, bool failed, StorageImpl* storage, s4u::Io::OpType type) + StorageAction(Model* model, double cost, bool failed, StorageImpl* storage, s4u::Io::OpType type) : Action(model, cost, failed), type_(type), storage_(storage){}; /** @@ -172,19 +169,15 @@ public: std::unordered_map* properties; std::unordered_map* model_properties; sg_size_t size; - StorageType(std::string id, std::string model, std::string content, + 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(std::move(id)) - , model(std::move(model)) - , content(std::move(content)) - , properties(properties) - , model_properties(model_properties) - , size(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_ */