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

diff --git a/src/surf/storage_private.h b/src/surf/storage_private.h
index f6145f21de..5fe1b8fe71 100644
--- a/src/surf/storage_private.h
+++ b/src/surf/storage_private.h
@@ -10,25 +10,21 @@
 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;
 } s_storage_type_t, *storage_type_t;
 
 typedef struct s_mount {
-  void *id;
+  void *storage;
   char *name;
 } s_mount_t, *mount_t;
 
-typedef struct surf_stat { /* file status structure */
-  s_file_stat_t stat;
-  /* possible additional fields (e.g., popularity, last access time to know whether the file is in cache, ...) */
-} s_surf_stat_t;
-
 typedef struct surf_file {
   char *name;
-  surf_stat_t content;
-  const char* storage;
+  char *mount;
+  size_t size;
 } s_surf_file_t;
 
 typedef struct storage {
@@ -37,14 +33,14 @@ typedef struct storage {
   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 */
+  size_t size;
+  size_t used_size;
   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 {