Rewrite the way the disk usage and file size are updated

[simgrid.git] / src / surf / storage_private.h

diff --git a/src/surf/storage_private.h b/src/surf/storage_private.h
index c1b812b..f27d650 100644 (file)
--- a/src/surf/storage_private.h
+++ b/src/surf/storage_private.h
@@ -10,9 +10,10 @@
 
 typedef struct s_storage_type {
   char *model;
-  xbt_dict_t content; /* char * -> s_surf_stat_t */
+  char *content;
   char *type_id;
   xbt_dict_t properties;
+  unsigned long size;
 } s_storage_type_t, *storage_type_t;
 
 typedef struct s_mount {
@@ -28,6 +29,7 @@ typedef struct surf_stat { /* file status structure */
 typedef struct surf_file {
   char *name;
   surf_stat_t content;
+  const char* storage;
 } s_surf_file_t;
 
 typedef struct storage {
@@ -35,16 +37,21 @@ typedef struct storage {
   e_surf_resource_state_t state_current;        /*< STORAGE current state (ON or OFF) */
   lmm_constraint_t constraint;          /* Constraint for maximum bandwidth from connexion */
   lmm_constraint_t constraint_write;    /* Constraint for maximum write bandwidth*/
-  lmm_constraint_t constraint_read;    /* 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_dynar_t write_actions;
 } s_storage_t, *storage_t;
 
 typedef enum {
-  READ, WRITE, STAT, OPEN, CLOSE
+  READ=0, WRITE, STAT, OPEN, CLOSE
 } e_surf_action_storage_type_t;
 
 typedef struct surf_action_storage {
   s_surf_action_lmm_t generic_lmm_action;
   e_surf_action_storage_type_t type;
+  void *storage;
 } s_surf_action_storage_t, *surf_action_storage_t;
 
 #endif /* STORAGE_PRIVATE_H_ */