X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/638b21d2071c77f39da2f322156f05f75bf91517..4a69abcc786d029bd2962537f767d12a0f808d11:/src/surf/storage_interface.hpp diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp index 4d30a14c15..f52d57b3b9 100644 --- a/src/surf/storage_interface.hpp +++ b/src/surf/storage_interface.hpp @@ -1,18 +1,19 @@ -/* Copyright (c) 2004-2015. The SimGrid Team. +/* Copyright (c) 2004-2017. 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 "src/surf/PropertyHolder.hpp" #include "surf_interface.hpp" +#include #ifndef STORAGE_INTERFACE_HPP_ #define STORAGE_INTERFACE_HPP_ -extern xbt_dynar_t mount_list; - namespace simgrid { namespace surf { @@ -32,25 +33,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, simgrid::surf::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, simgrid::surf::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, simgrid::surf::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, simgrid::surf::StorageAction*, e_surf_action_state_t, e_surf_action_state_t)) storageActionStateChangedCallbacks; +XBT_PUBLIC_DATA(simgrid::xbt::signal) storageActionStateChangedCallbacks; /********* * Model * @@ -61,37 +62,13 @@ XBT_PUBLIC_DATA(surf_callback(void, simgrid::surf::StorageAction*, e_surf_action */ class StorageModel : public Model { public: - /** - * @brief The storage model constructor - */ StorageModel(); - - /** - * @brief The Storange model destructor - */ ~StorageModel(); - /** - * @brief Create a Storage - * - * @param id [description] - * @param type_id [description] - * @param content_name [description] - * @param content_type [description] - * @param properties [description] - * @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; - - bool shareResourcesIsIdempotent() {return true;} + virtual Storage* createStorage(const char* id, const char* type_id, const char* content_name, + const char* content_type, const char* attach) = 0; - xbt_dynar_t p_storageList; + std::vector p_storageList; }; /************ @@ -101,22 +78,9 @@ 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 { +class Storage : public simgrid::surf::Resource, + public simgrid::surf::PropertyHolder { public: - /** - * @brief Storage constructor - * - * @param model StorageModel associated to this Storage - * @param name The name of the Storage - * @param props Dictionary of properties associated to this Storage - * @param type_id [description] - * @param content_name [description] - * @param content_type [description] - * @param size [description] - */ - Storage(Model *model, const char *name, xbt_dict_t props, - const char* type_id, char *content_name, char *content_type, - sg_size_t size); /** * @brief Storage constructor @@ -124,51 +88,26 @@ 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); + Storage(Model* model, const char* name, lmm_system_t maxminSystem, double bread, double bwrite, double bconnection, + 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; + std::map* 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 @@ -211,14 +150,7 @@ public: * * @return A xbt_dict_t with path as keys and size in bytes as values */ - virtual xbt_dict_t getContent(); - - /** - * @brief Get the size in bytes of the current Storage - * - * @return The size in bytes of the current Storage - */ - virtual sg_size_t getSize(); + virtual std::map* getContent(); /** * @brief Get the available size in bytes of the current Storage @@ -234,13 +166,12 @@ public: */ virtual sg_size_t getUsedSize(); + std::map* parseContent(const char* filename); - xbt_dict_t parseContent(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*/ }; /********** @@ -288,12 +219,12 @@ 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; - surf_file_t p_file; - double progress; + e_surf_action_storage_type_t type_; + Storage* storage_; + surf_file_t file_; + double progress_; }; } @@ -305,14 +236,16 @@ typedef struct s_storage_type { char *content_type; char *type_id; xbt_dict_t properties; - xbt_dict_t model_properties; + std::map* model_properties; sg_size_t size; -} s_storage_type_t, *storage_type_t; +} s_storage_type_t; +typedef s_storage_type_t* storage_type_t; typedef struct s_mount { void *storage; char *name; -} s_mount_t, *mount_t; +} s_mount_t; +typedef s_mount_t* mount_t; typedef struct surf_file { char *name; @@ -321,5 +254,4 @@ typedef struct surf_file { sg_size_t current_position; } s_surf_file_t; - #endif /* STORAGE_INTERFACE_HPP_ */