X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d83cf3b035bac2ce84d94c5b2dcc0b8bf2f38574..e9e9edad500ddf3967b577ca018ae9f5567bc1d8:/src/surf/storage_private.h

diff --git a/src/surf/storage_private.h b/src/surf/storage_private.h
index bc02af1545..8f8aad96b3 100644
--- a/src/surf/storage_private.h
+++ b/src/surf/storage_private.h
@@ -10,36 +10,49 @@
 typedef struct s_storage_type {
   char *model;
   char *content;
+  char *content_type;
   char *type_id;
   xbt_dict_t properties;
-  unsigned long size;
+  size_t size;
+  size_t used_size;
 } s_storage_type_t, *storage_type_t;
 
 typedef struct s_mount {
-  void *id;
+  void *storage;
   char *name;
 } s_mount_t, *mount_t;
 
+typedef struct s_file_info {
+  size_t size;
+  char* mount_point;
+  char* storageId;
+  char* content_type;
+} s_file_info_t, *surf_file_info_t;
+
 typedef struct surf_file {
   char *name;
-  const char* storage;
-  double size;
+  char *mount;
+  size_t size;
+  surf_file_info_t info;
 } s_surf_file_t;
 
-typedef struct storage {
+typedef struct surf_storage {
   s_surf_resource_t generic_resource;   /*< Structure with generic data. Needed at begin to interact with SURF */
   e_surf_resource_state_t state_current;        /*< STORAGE current state (ON or OFF) */
   lmm_constraint_t constraint;          /* Constraint for maximum bandwidth from connection */
   lmm_constraint_t constraint_write;    /* Constraint for maximum write bandwidth*/
   lmm_constraint_t constraint_read;     /* Constraint for maximum write bandwidth*/
-  xbt_dict_t content; /* char * -> s_surf_stat_t */
-  unsigned long size;
-  unsigned long used_size;
+  xbt_dict_t content; /* char * -> s_surf_file_t */
+  char* content_type;
+  size_t size;
+  size_t used_size;
+  char *type_id;
+  char *content_type;
   xbt_dynar_t write_actions;
 } s_storage_t, *storage_t;
 
 typedef enum {
-  READ=0, WRITE, STAT, OPEN, CLOSE, UNLINK, LS
+  READ=0, WRITE, STAT, OPEN, CLOSE, LS
 } e_surf_action_storage_type_t;
 
 typedef struct surf_action_storage {