X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b3973f5189df8d8983e47336546fd0259f0e2dab..7cad4f0d54aafeabb7ee95007fc370514c4923a9:/src/surf/storage_interface.hpp

diff --git a/src/surf/storage_interface.hpp b/src/surf/storage_interface.hpp
index d0e7df6038..c578bff16e 100644
--- a/src/surf/storage_interface.hpp
+++ b/src/surf/storage_interface.hpp
@@ -38,25 +38,25 @@ typedef StorageAction *StorageActionPtr;
  * @brief Callbacks handler which emit the callbacks after Storage creation *
  * @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 *
  * @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 *
  * @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, e_surf_resource_state_t, e_surf_resource_state_t) 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 *
  * @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, e_surf_action_state_t, e_surf_action_state_t) storageActionStateChangedCallbacks;
+XBT_PUBLIC_DATA(surf_callback(void, StorageActionPtr, e_surf_action_state_t, e_surf_action_state_t)) storageActionStateChangedCallbacks;
 
 /*********
  * Model *
@@ -88,7 +88,7 @@ public:
    * @param attach [description]
    * @return The created Storage
    */
-  virtual StoragePtr createResource(const char* id,
+  virtual StoragePtr createStorage(const char* id,
                                     const char* type_id,
                                     const char* content_name,
                                     const char* content_type,
@@ -192,15 +192,6 @@ public:
    */
   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
    *
@@ -233,6 +224,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 +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
@@ -262,11 +267,6 @@ typedef enum {
  */
 class StorageAction : public Action {
 public:
-  /**
-   * @brief StorageAction constructor
-   */
-  StorageAction() : m_type(READ) {};//FIXME:REMOVE
-
   /**
    * @brief StorageAction constructor
    *
@@ -276,8 +276,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(ModelPtr model, double cost, bool failed, StoragePtr storage,
+      e_surf_action_storage_type_t type);
 
     /**
    * @brief StorageAction constructor
@@ -290,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 {