X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/74b9dc06b8ce6aa6e1f1087ceadfc09aee0ddaaa..51c23076e2b42ff07dc167dea1cb0e3a4ab3cf68:/src/surf/StorageImpl.hpp diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index c66f9f96d7..530c7287e9 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -1,15 +1,16 @@ -/* Copyright (c) 2004-2017. The SimGrid Team. - * All rights reserved. */ +/* Copyright (c) 2004-2018. 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/Storage.hpp" #include "src/surf/PropertyHolder.hpp" +#include "src/surf/trace_mgr.hpp" #include "surf_interface.hpp" + #include #ifndef STORAGE_INTERFACE_HPP_ @@ -28,32 +29,14 @@ 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)` + * @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 * @@ -62,15 +45,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; }; /************ @@ -80,25 +61,26 @@ 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 kernel::resource::Resource, public 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(kernel::resource::Model* model, std::string name, kernel::lmm::System* 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; + bool is_used() override; void apply_event(tmgr_trace_event_t 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 /** * @brief Read a file @@ -115,43 +97,17 @@ public: * @return The StorageAction corresponding to the writing */ virtual StorageAction* write(sg_size_t size) = 0; - - /** - * @brief Get the content of the current Storage - * - * @return A map with path as keys and size in bytes as values - */ - virtual std::map* getContent(); - - /** - * @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(); - - /** - * @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(); - virtual sg_size_t getSize() { return size_; } virtual std::string getHost() { return attach_; } - std::map* parseContent(std::string filename); - 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*/ + kernel::lmm::Constraint* constraintWrite_; /* Constraint for maximum write bandwidth*/ + kernel::lmm::Constraint* constraintRead_; /* Constraint for maximum write bandwidth*/ std::string typeId_; - sg_size_t usedSize_ = 0; + 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 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_; @@ -172,18 +128,22 @@ 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: + 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(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){}; /** @@ -196,11 +156,11 @@ 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, 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 set_state(simgrid::kernel::resource::Action::State state) override; e_surf_action_storage_type_t type_; StorageImpl* storage_;