X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ff58d7a8f46e07cdc902f96b99bb47d0a077932..8c753c341f0c7f6d5ea38c4cb7bf7da6f0ef0a1b:/src/surf/StorageImpl.hpp diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index 55e8db6766..e3c508acd3 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -1,18 +1,17 @@ -/* Copyright (c) 2004-2018. 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/Action.hpp" -#include "src/kernel/resource/Model.hpp" -#include "src/kernel/resource/Resource.hpp" +#include "src/kernel/resource/profile/trace_mgr.hpp" #include "src/surf/PropertyHolder.hpp" #include "surf_interface.hpp" + #include #ifndef STORAGE_INTERFACE_HPP_ @@ -26,38 +25,21 @@ namespace surf { ***********/ 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 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::kernel::resource::Action::State old, simgrid::kernel::resource::Action::State current)` */ -XBT_PUBLIC_DATA( - simgrid::xbt::signal) -storageActionStateChangedCallbacks; +XBT_PUBLIC_DATA +simgrid::xbt::signal + on_state_change; /********* * Model * @@ -69,6 +51,8 @@ storageActionStateChangedCallbacks; 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, @@ -85,8 +69,10 @@ public: class StorageImpl : public kernel::resource::Resource, public PropertyHolder { public: /** @brief Storage constructor */ - 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(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(const StorageImpl&) = delete; + StorageImpl& operator=(const StorageImpl&) = delete; ~StorageImpl() override; @@ -94,13 +80,15 @@ public: s4u::Storage piface_; /** @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(simgrid::kernel::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 simgrid::kernel::resource::Action* io_start(sg_size_t size, s4u::Io::OpType type) = 0; /** * @brief Read a file * @@ -126,6 +114,7 @@ public: 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_; @@ -135,30 +124,24 @@ 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 kernel::resource::Action { public: + 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(kernel::resource::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, s4u::Io::OpType type) : Action(model, cost, failed), type_(type), storage_(storage){}; /** @@ -172,12 +155,12 @@ public: * @param type [description] */ StorageAction(kernel::resource::Model* model, double cost, bool failed, kernel::lmm::Variable* var, - StorageImpl* storage, e_surf_action_storage_type_t type) + StorageImpl* storage, s4u::Io::OpType type) : Action(model, cost, failed, var), type_(type), storage_(storage){}; - void setState(simgrid::kernel::resource::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_; }; @@ -186,12 +169,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) - : id(id), model(model), content(content), properties(properties), model_properties(model_properties), size(size) + StorageType(std::string id, std::string model, 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) { } };