X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8b170c65c7f1daa87221caaffee907b6cf73b01d..62cbd47a6b39a36431539d60f0f0efe81d228e4b:/src/surf/storage_interface.hpp diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp index d0e7df6038..4620a9cb2a 100644 --- a/src/surf/storage_interface.hpp +++ b/src/surf/storage_interface.hpp @@ -1,34 +1,29 @@ -/* Copyright (c) 2004-2014. The SimGrid Team. +/* Copyright (c) 2004-2015. 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 "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 * ***********/ 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 +31,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(simgrid::surf::signal) 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(simgrid::surf::signal) storageDestructedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after Storage State changed * - * @details Callback functions have the following signature: `void(StorageActionPtr action, e_surf_resource_state_t old, e_surf_resource_state_t current)` + * @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, e_surf_resource_state_t, e_surf_resource_state_t) storageStateChangedCallbacks; +XBT_PUBLIC_DATA(simgrid::surf::signal) storageStateChangedCallbacks; /** @ingroup SURF_callbacks * @brief Callbacks handler which emit the callbacks after StorageAction State changed * - * @details Callback functions have the following signature: `void(StorageActionPtr action, e_surf_action_state_t old, e_surf_action_state_t current)` + * @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, e_surf_action_state_t, e_surf_action_state_t) storageActionStateChangedCallbacks; +XBT_PUBLIC_DATA(simgrid::surf::signal) storageActionStateChangedCallbacks; /********* * Model * @@ -88,13 +83,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; }; @@ -105,7 +102,7 @@ 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 @@ -118,7 +115,7 @@ 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); @@ -138,7 +135,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, @@ -182,7 +179,7 @@ public: * * @return The StorageAction corresponding to the opening */ - virtual StorageActionPtr open(const char* mount, const char* path)=0; + virtual StorageAction *open(const char* mount, const char* path)=0; /** * @brief Close a file @@ -190,16 +187,7 @@ public: * @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 @@ -208,7 +196,7 @@ public: * @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 @@ -217,7 +205,7 @@ public: * @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; + virtual StorageAction *write(surf_file_t fd, sg_size_t size)=0; /** * @brief Get the content of the current Storage @@ -233,6 +221,21 @@ public: */ 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; @@ -253,8 +256,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 @@ -262,11 +264,6 @@ typedef enum { */ class StorageAction : public Action { public: - /** - * @brief StorageAction constructor - */ - StorageAction() : m_type(READ) {};//FIXME:REMOVE - /** * @brief StorageAction constructor * @@ -276,8 +273,8 @@ public: * @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 @@ -289,17 +286,20 @@ 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 { char *model; char *content;