X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/582b6f00f1f41d334dbc865dd0b993a7e501f3ba..6ebcf09b6c37399ca597870339c1c5e60b1f774b:/src/surf/storage_private.h

diff --git a/src/surf/storage_private.h b/src/surf/storage_private.h
index 63e9d2c8e4..c1b812b7d0 100644
--- a/src/surf/storage_private.h
+++ b/src/surf/storage_private.h
@@ -10,7 +10,7 @@
 
 typedef struct s_storage_type {
   char *model;
-  xbt_dict_t content;
+  xbt_dict_t content; /* char * -> s_surf_stat_t */
   char *type_id;
   xbt_dict_t properties;
 } s_storage_type_t, *storage_type_t;
@@ -20,19 +20,14 @@ typedef struct s_mount {
   char *name;
 } s_mount_t, *mount_t;
 
-typedef struct s_content {
-  char *user_rights;
-  char *user;
-  char *group;
-  char *date;
-  char *time;
-  size_t size;
-} s_content_t, *content_t;
-
+typedef struct surf_stat { /* file status structure */
+  s_file_stat_t stat;
+  /* possible additionnal 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;
-  content_t content;
+  surf_stat_t content;
 } s_surf_file_t;
 
 typedef struct storage {
@@ -43,9 +38,13 @@ typedef struct storage {
   lmm_constraint_t constraint_read;    /* Constraint for maximum write bandwidth*/
 } s_storage_t, *storage_t;
 
+typedef enum {
+  READ, WRITE, STAT, OPEN, CLOSE
+} e_surf_action_storage_type_t;
+
 typedef struct surf_action_storage {
   s_surf_action_lmm_t generic_lmm_action;
-  int index_heap;
+  e_surf_action_storage_type_t type;
 } s_surf_action_storage_t, *surf_action_storage_t;
 
 #endif /* STORAGE_PRIVATE_H_ */