X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3b356352e87ae00a20f737c48e19b0c8413455a..81a1001af43cb261b637feb5900abb38d1b09cb0:/src/surf/storage_interface.hpp diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp index f5debbdd88..e8879f9b09 100644 --- a/src/surf/storage_interface.hpp +++ b/src/surf/storage_interface.hpp @@ -4,12 +4,17 @@ /* 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 "surf_interface.hpp" +#include "src/surf/PropertyHolder.hpp" #ifndef STORAGE_INTERFACE_HPP_ #define STORAGE_INTERFACE_HPP_ -extern xbt_dynar_t mount_list; +namespace simgrid { +namespace surf { /*********** * Classes * @@ -27,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(surf_callback(void, Storage*)) 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(surf_callback(void, Storage*)) 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(surf_callback(void, Storage*, e_surf_resource_state_t, e_surf_resource_state_t)) 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(surf_callback(void, StorageAction*, e_surf_action_state_t, e_surf_action_state_t)) storageActionStateChangedCallbacks; +XBT_PUBLIC_DATA(simgrid::xbt::signal) storageActionStateChangedCallbacks; /********* * Model * @@ -56,18 +61,10 @@ XBT_PUBLIC_DATA(surf_callback(void, StorageAction*, e_surf_action_state_t, e_sur */ class StorageModel : public Model { public: - /** - * @brief The storage model constructor - */ StorageModel(); - - /** - * @brief The Storange model destructor - */ ~StorageModel(); - /** - * @brief Create a Storage + /** @brief Create a Storage * * @param id [description] * @param type_id [description] @@ -77,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; }; /************ @@ -96,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 Resource { +class Storage : public simgrid::surf::Resource, + public simgrid::surf::PropertyHolder { public: /** * @brief Storage constructor @@ -110,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); /** @@ -132,38 +127,25 @@ public: 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; + char* p_attach; //FIXME: this is the name of the host. Use the host directly /** * @brief Open a file @@ -230,9 +212,9 @@ 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 p_writeActions; lmm_constraint_t p_constraintWrite; /* Constraint for maximum write bandwidth*/ lmm_constraint_t p_constraintRead; /* Constraint for maximum write bandwidth*/ @@ -283,7 +265,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; @@ -291,6 +273,9 @@ public: double progress; }; +} +} + typedef struct s_storage_type { char *model; char *content; @@ -313,5 +298,4 @@ typedef struct surf_file { sg_size_t current_position; } s_surf_file_t; - #endif /* STORAGE_INTERFACE_HPP_ */