X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/18ba8a3fabab08a493038a2e11e5df5b4b6de4f0..3715b2a421abd8357f41fb2be3c25a351f1af8cb:/src/surf/storage_interface.hpp diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp index 5b89f8d638..9e0e4420ed 100644 --- a/src/surf/storage_interface.hpp +++ b/src/surf/storage_interface.hpp @@ -16,19 +16,8 @@ extern xbt_dynar_t mount_list; ***********/ class StorageModel; -typedef StorageModel *StorageModelPtr; - -class Storage; -typedef Storage *StoragePtr; - class Storage; -typedef Storage *StoragePtr; - class StorageAction; -typedef StorageAction *StorageActionPtr; - -class StorageAction; -typedef StorageAction *StorageActionPtr; /************* * Callbacks * @@ -36,27 +25,27 @@ typedef StorageAction *StorageActionPtr; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after Storage creation * - * @details Callback functions have the following signature: `void(StoragePtr)` + * @details Callback functions have the following signature: `void(Storage*)` */ -extern surf_callback(void, StoragePtr) storageCreatedCallbacks; +XBT_PUBLIC_DATA(surf_callback(void, Storage*)) storageCreatedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after Storage destruction * * @details Callback functions have the following signature: `void(StoragePtr)` */ -extern surf_callback(void, StoragePtr) storageDestructedCallbacks; +XBT_PUBLIC_DATA(surf_callback(void, Storage*)) storageDestructedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after Storage State changed * - * @details Callback functions have the following signature: `void(StorageActionPtr)` + * @details Callback functions have the following signature: `void(StorageAction *action, e_surf_resource_state_t old, e_surf_resource_state_t current)` */ -extern surf_callback(void, StoragePtr) storageStateChangedCallbacks; +XBT_PUBLIC_DATA(surf_callback(void, Storage*, e_surf_resource_state_t, e_surf_resource_state_t)) storageStateChangedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after StorageAction State changed * - * @details Callback functions have the following signature: `void(StorageActionPtr)` + * @details Callback functions have the following signature: `void(StorageAction *action, e_surf_action_state_t old, e_surf_action_state_t current)` */ -extern surf_callback(void, StorageActionPtr) storageActionStateChangedCallbacks; +XBT_PUBLIC_DATA(surf_callback(void, StorageAction*, e_surf_action_state_t, e_surf_action_state_t)) storageActionStateChangedCallbacks; /********* * Model * @@ -79,7 +68,7 @@ public: /** * @brief Create a Storage - * + * * @param id [description] * @param type_id [description] * @param content_name [description] @@ -88,13 +77,15 @@ public: * @param attach [description] * @return The created Storage */ - virtual StoragePtr createResource(const char* id, + 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;} + xbt_dynar_t p_storageList; }; @@ -109,7 +100,7 @@ class Storage : public Resource { 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 @@ -118,13 +109,13 @@ public: * @param content_type [description] * @param size [description] */ - Storage(ModelPtr model, const char *name, xbt_dict_t props, + 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 - * + * * @param model StorageModel associated to this Storage * @param name The name of the Storage * @param props Dictionary of properties associated to this Storage @@ -138,7 +129,7 @@ public: * @param size [description] * @param attach [description] */ - Storage(ModelPtr model, const char *name, xbt_dict_t props, + 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, @@ -151,14 +142,14 @@ public: /** * @brief Check if the Storage is used - * + * * @return true if the current Storage is used, false otherwise */ bool isUsed(); /** * @brief Update the state of the current Storage - * + * * @param event_type [description] * @param value [description] * @param date [description] @@ -176,71 +167,69 @@ public: /** * @brief Open a file - * + * * @param mount The mount point * @param path The path to the file - * + * * @return The StorageAction corresponding to the opening */ - virtual StorageActionPtr open(const char* mount, char* path)=0; + virtual StorageAction *open(const char* mount, const char* path)=0; /** * @brief Close a file - * + * * @param fd The file descriptor to close * @return The StorageAction corresponding to the closing */ - virtual StorageActionPtr close(surf_file_t fd)=0; - - /** - * @brief List directory contents of a path - * @details [long description] - * - * @param path The path to the directory - * @return The StorageAction corresponding to the ls action - */ - virtual StorageActionPtr ls(const char *path)=0; + virtual StorageAction *close(surf_file_t fd)=0; /** * @brief Read a file - * + * * @param fd The file descriptor to read * @param size The size in bytes to read * @return The StorageAction corresponding to the reading */ - virtual StorageActionPtr read(surf_file_t fd, sg_size_t size)=0; + virtual StorageAction *read(surf_file_t fd, sg_size_t size)=0; /** * @brief Write a file - * + * * @param fd The file descriptor to write * @param size The size in bytes to write * @return The StorageAction corresponding to the writing */ - virtual StorageActionPtr write(surf_file_t fd, sg_size_t size)=0; - - /** - * @brief Rename a path - * - * @param src The old path - * @param dest The new path - */ - virtual void rename(const char *src, const char *dest)=0; + virtual StorageAction *write(surf_file_t fd, sg_size_t size)=0; /** * @brief Get the content of the current Storage - * + * * @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(); + /** + * @brief Get the available size in bytes of the current Storage + * + * @return The available size in bytes of the current Storage + */ + virtual sg_size_t getFreeSize(); + + /** + * @brief Get the used size in bytes of the current Storage + * + * @return The used size in bytes of the current Storage + */ + virtual sg_size_t getUsedSize(); + + xbt_dict_t parseContent(char *filename); xbt_dynar_t p_writeActions; @@ -261,8 +250,7 @@ typedef enum { WRITE, /**< Write in a file */ STAT, /**< Stat a file */ OPEN, /**< Open a file */ - CLOSE, /**< Close a file */ - LS /**< List directory contents */ + CLOSE /**< Close a file */ } e_surf_action_storage_type_t; /** @ingroup SURF_storage_interface @@ -272,24 +260,19 @@ class StorageAction : public Action { public: /** * @brief StorageAction constructor - */ - StorageAction() : m_type(READ) {};//FIXME:REMOVE - - /** - * @brief StorageAction constructor - * + * * @param model The StorageModel associated to this StorageAction * @param cost The cost of this NetworkAction in [TODO] * @param failed [description] * @param storage The Storage associated to this StorageAction * @param type [description] */ - StorageAction(ModelPtr model, double cost, bool failed, - StoragePtr storage, e_surf_action_storage_type_t type); + StorageAction(Model *model, double cost, bool failed, Storage *storage, + e_surf_action_storage_type_t type); /** * @brief StorageAction constructor - * + * * @param model The StorageModel associated to this StorageAction * @param cost The cost of this StorageAction in [TODO] * @param failed [description] @@ -297,15 +280,15 @@ public: * @param storage The Storage associated to this StorageAction * @param type [description] */ - StorageAction(ModelPtr model, double cost, bool failed, lmm_variable_t var, - StoragePtr storage, e_surf_action_storage_type_t type); + 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); e_surf_action_storage_type_t m_type; - StoragePtr p_storage; + Storage *p_storage; surf_file_t p_file; - xbt_dict_t p_lsDict; + double progress; }; typedef struct s_storage_type {