X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ff58d7a8f46e07cdc902f96b99bb47d0a077932..b1801e7056930569752cf33757134cb44d32cfac:/src/surf/StorageImpl.hpp diff --git a/src/surf/StorageImpl.hpp b/src/surf/StorageImpl.hpp index 55e8db6766..6f50872188 100644 --- a/src/surf/StorageImpl.hpp +++ b/src/surf/StorageImpl.hpp @@ -1,18 +1,16 @@ -/* Copyright (c) 2004-2018. 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/kernel/resource/Action.hpp" -#include "src/kernel/resource/Model.hpp" -#include "src/kernel/resource/Resource.hpp" #include "src/surf/PropertyHolder.hpp" +#include "src/surf/trace_mgr.hpp" #include "surf_interface.hpp" + #include #ifndef STORAGE_INTERFACE_HPP_ @@ -31,33 +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::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 * @@ -85,8 +64,8 @@ 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, 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() override; @@ -94,12 +73,14 @@ 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 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 @@ -126,6 +107,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_; @@ -148,11 +130,14 @@ enum e_surf_action_storage_type_t { */ 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] @@ -175,7 +160,7 @@ public: StorageImpl* storage, e_surf_action_storage_type_t 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_; StorageImpl* storage_; @@ -186,11 +171,12 @@ 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(std::string id, std::string model, 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) { }