X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bc5903068a99bfc50a9f7a479cc3305326f774e9..e3f5ca3fd3726e67046afbd03e48e9cd7294b835:/src/surf/storage_interface.hpp diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp index d8d4e185f4..c578bff16e 100644 --- a/src/surf/storage_interface.hpp +++ b/src/surf/storage_interface.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2004-2013. The SimGrid Team. +/* Copyright (c) 2004-2014. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -36,27 +36,27 @@ typedef StorageAction *StorageActionPtr; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after Storage creation * - * @detail Callback functions have the following signature: `void(StoragePtr)` + * @details Callback functions have the following signature: `void(StoragePtr)` */ -extern surf_callback(void, StoragePtr) storageCreatedCallbacks; +XBT_PUBLIC_DATA(surf_callback(void, StoragePtr)) storageCreatedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after Storage destruction * - * @detail Callback functions have the following signature: `void(StoragePtr)` + * @details Callback functions have the following signature: `void(StoragePtr)` */ -extern surf_callback(void, StoragePtr) storageDestructedCallbacks; +XBT_PUBLIC_DATA(surf_callback(void, StoragePtr)) storageDestructedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after Storage State changed * - * @detail Callback functions have the following signature: `void(StorageActionPtr)` + * @details Callback functions have the following signature: `void(StorageActionPtr 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, StoragePtr, 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 * - * @detail Callback functions have the following signature: `void(StorageActionPtr)` + * @details Callback functions have the following signature: `void(StorageActionPtr 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, StorageActionPtr, e_surf_action_state_t, e_surf_action_state_t)) storageActionStateChangedCallbacks; /********* * Model * @@ -79,16 +79,21 @@ public: /** * @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 StoragePtr createResource(const char* id, const char* type_id, - const char* content_name, const char* content_type, xbt_dict_t properties)=0; + virtual StoragePtr createStorage(const char* id, + const char* type_id, + const char* content_name, + const char* content_type, + xbt_dict_t properties, + const char *attach) = 0; xbt_dynar_t p_storageList; }; @@ -104,29 +109,25 @@ 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 - * @param constraint The lmm constraint associated to this Storage if it is part of a LMM component - * @param model [description] - * @param name [description] - * @param props [description] * @param type_id [description] * @param content_name [description] * @param content_type [description] * @param size [description] */ Storage(ModelPtr model, const char *name, xbt_dict_t props, - const char* type_id, char *content_name, char *content_type, sg_size_t size); + 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 - * @param constraint The lmm constraint associated to this Storage if it is part of a LMM component * @param maxminSystem [description] * @param bread [description] * @param bwrite [description] @@ -135,10 +136,13 @@ public: * @param content_name [description] * @param content_type [description] * @param size [description] + * @param attach [description] */ Storage(ModelPtr 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); + 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); /** * @brief Storage destructor @@ -147,14 +151,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] @@ -168,37 +172,29 @@ public: sg_size_t m_size; sg_size_t m_usedSize; char * p_typeId; + char* p_attach; /** * @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, 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; - /** * @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 @@ -207,35 +203,42 @@ public: /** * @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; - /** * @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; @@ -256,8 +259,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 @@ -267,24 +269,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(ModelPtr model, double cost, bool failed, StoragePtr 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] @@ -293,14 +290,14 @@ public: * @param type [description] */ StorageAction(ModelPtr model, double cost, bool failed, lmm_variable_t var, - StoragePtr storage, e_surf_action_storage_type_t type); + StoragePtr 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; surf_file_t p_file; - xbt_dict_t p_lsDict; + double progress; }; typedef struct s_storage_type { @@ -309,6 +306,7 @@ typedef struct s_storage_type { char *content_type; char *type_id; xbt_dict_t properties; + xbt_dict_t model_properties; sg_size_t size; } s_storage_type_t, *storage_type_t;