X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/0c7041a93174ffc542de056088890f2e8e3fe331..a1688a8f4d3a06b7dfd59fdcf06c7a198b235fbb:/src/surf/storage_private.h diff --git a/src/surf/storage_private.h b/src/surf/storage_private.h index a5c75fbf55..5fe1b8fe71 100644 --- a/src/surf/storage_private.h +++ b/src/surf/storage_private.h @@ -10,19 +10,20 @@ 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_file { char *name; - const char* storage; + char *mount; size_t size; } s_surf_file_t; @@ -33,13 +34,13 @@ typedef struct storage { 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_file_t */ - unsigned long size; - unsigned long used_size; + 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, GET_SIZE + READ=0, WRITE, STAT, OPEN, CLOSE, LS } e_surf_action_storage_type_t; typedef struct surf_action_storage {