X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6badbbf58554a35b03f58509b0b18cf606c38f5e..c96b8ddfe1c923257f43ee40334ceb820226694c:/src/surf/storage_interface.hpp diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp index 125962e092..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, 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 * @@ -75,16 +74,13 @@ public: * @param attach [description] * @return The created Storage */ - virtual Storage *createStorage(const char* id, - const char* type_id, - const char* content_name, - const char* content_type, - xbt_dict_t properties, - const char *attach) = 0; + virtual Storage *createStorage(const char* id, const char* type_id, + const char* content_name, const char* content_type, + xbt_dict_t properties, const char *attach) = 0; - bool shareResourcesIsIdempotent() {return true;} + bool next_occuring_event_isIdempotent() {return true;} - xbt_dynar_t p_storageList; + std::vector p_storageList; }; /************ @@ -95,7 +91,7 @@ public: * @details A Storage represent a storage unit (e.g.: hard drive, usb key) */ class Storage : public simgrid::surf::Resource, - public simgrid::surf::PropertyHolder { + public simgrid::surf::PropertyHolder { public: /** * @brief Storage constructor @@ -118,15 +114,6 @@ 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, @@ -137,26 +124,19 @@ public: ~Storage(); /** @brief Check if the Storage is used (if an action currently uses its resources) */ - bool isUsed(); + 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 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; //FIXME: this is the name of the host. Use the host directly + 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 @@ -225,10 +205,10 @@ public: 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*/ }; /********** @@ -276,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; @@ -309,5 +289,4 @@ typedef struct surf_file { sg_size_t current_position; } s_surf_file_t; - #endif /* STORAGE_INTERFACE_HPP_ */