X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a714f2cc13ccf01d24d8848aafc9085aef8eb6ce..c96b8ddfe1c923257f43ee40334ceb820226694c:/src/surf/storage_interface.hpp diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp index 4620a9cb2a..0fcfd2b59f 100644 --- a/src/surf/storage_interface.hpp +++ b/src/surf/storage_interface.hpp @@ -5,6 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include +#include #include "surf_interface.hpp" #include "src/surf/PropertyHolder.hpp" @@ -12,8 +13,6 @@ #ifndef STORAGE_INTERFACE_HPP_ #define STORAGE_INTERFACE_HPP_ -extern xbt_dynar_t mount_list; - namespace simgrid { namespace surf { @@ -33,25 +32,25 @@ 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::surf::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::surf::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, e_surf_resource_state_t old, e_surf_resource_state_t current)` + * @details Callback functions have the following signature: `void(StorageAction *action, int previouslyOn, int currentlyOn)` */ -XBT_PUBLIC_DATA(simgrid::surf::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, e_surf_action_state_t old, e_surf_action_state_t current)` + * @details Callback functions have the following signature: `void(StorageAction *action, simgrid::surf::Action::State old, simgrid::surf::Action::State current)` */ -XBT_PUBLIC_DATA(simgrid::surf::signal) storageActionStateChangedCallbacks; +XBT_PUBLIC_DATA(simgrid::xbt::signal) storageActionStateChangedCallbacks; /********* * Model * @@ -62,18 +61,10 @@ XBT_PUBLIC_DATA(simgrid::surf::signal p_storageList; }; /************ @@ -102,7 +90,8 @@ public: * @brief SURF storage interface class * @details A Storage represent a storage unit (e.g.: hard drive, usb key) */ -class Storage : public simgrid::surf::Resource, public simgrid::surf::PropertyHolder { +class Storage : public simgrid::surf::Resource, + public simgrid::surf::PropertyHolder { public: /** * @brief Storage constructor @@ -116,7 +105,7 @@ public: * @param size [description] */ Storage(Model *model, const char *name, xbt_dict_t props, - const char* type_id, char *content_name, char *content_type, + const char* type_id, const char *content_name, const char *content_type, sg_size_t size); /** @@ -125,51 +114,29 @@ public: * @param model StorageModel associated to this Storage * @param name The name of the Storage * @param props Dictionary of properties associated to this Storage - * @param maxminSystem [description] - * @param bread [description] - * @param bwrite [description] - * @param bconnection [description] - * @param type_id [description] - * @param content_name [description] - * @param content_type [description] - * @param size [description] - * @param attach [description] */ Storage(Model *model, const char *name, xbt_dict_t props, lmm_system_t maxminSystem, double bread, double bwrite, double bconnection, - const char* type_id, char *content_name, char *content_type, - sg_size_t size, char *attach); + const char* type_id, const char *content_name, const char *content_type, + sg_size_t size, const char *attach); - /** - * @brief Storage destructor - */ ~Storage(); - /** - * @brief Check if the Storage is used - * - * @return true if the current Storage is used, false otherwise - */ - bool isUsed(); + /** @brief Check if the Storage is used (if an action currently uses its resources) */ + bool isUsed() override; - /** - * @brief Update the state of the current Storage - * - * @param event_type [description] - * @param value [description] - * @param date [description] - */ - void updateState(tmgr_trace_event_t event_type, double value, double date); + void apply_event(tmgr_trace_iterator_t event, double value) override; - void setState(e_surf_resource_state_t state); + void turnOn() override; + void turnOff() override; - xbt_dict_t p_content; - char* p_contentType; - sg_size_t m_size; - sg_size_t m_usedSize; - char * p_typeId; - char* p_attach; + xbt_dict_t content_; + char* contentType_; + sg_size_t size_; + sg_size_t usedSize_; + char * typeId_; + char* attach_; //FIXME: this is the name of the host. Use the host directly /** * @brief Open a file @@ -236,12 +203,12 @@ public: virtual sg_size_t getUsedSize(); - xbt_dict_t parseContent(char *filename); + xbt_dict_t parseContent(const char *filename); - xbt_dynar_t p_writeActions; + std::vector writeActions_; - lmm_constraint_t p_constraintWrite; /* Constraint for maximum write bandwidth*/ - lmm_constraint_t p_constraintRead; /* Constraint for maximum write bandwidth*/ + lmm_constraint_t constraintWrite_; /* Constraint for maximum write bandwidth*/ + lmm_constraint_t constraintRead_; /* Constraint for maximum write bandwidth*/ }; /********** @@ -289,7 +256,7 @@ public: StorageAction(Model *model, double cost, bool failed, lmm_variable_t var, Storage *storage, e_surf_action_storage_type_t type); - void setState(e_surf_action_state_t state); + void setState(simgrid::surf::Action::State state) override; e_surf_action_storage_type_t m_type; Storage *p_storage; @@ -322,5 +289,4 @@ typedef struct surf_file { sg_size_t current_position; } s_surf_file_t; - #endif /* STORAGE_INTERFACE_HPP_ */