X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/636c4a39fd7018786f10c6e66954aae0ed5677d5..b0b37b3b19ca4660c9dd3c01ffd46c6c6df8e898:/src/surf/storage_private.h diff --git a/src/surf/storage_private.h b/src/surf/storage_private.h index 9979e033f7..ee023b417f 100644 --- a/src/surf/storage_private.h +++ b/src/surf/storage_private.h @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2013. The SimGrid Team. +/* Copyright (c) 2009, 2012-2013. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -13,8 +13,7 @@ typedef struct s_storage_type { char *content_type; char *type_id; xbt_dict_t properties; - size_t size; - size_t used_size; + sg_storage_size_t size; } s_storage_type_t, *storage_type_t; typedef struct s_mount { @@ -25,7 +24,7 @@ typedef struct s_mount { typedef struct surf_file { char *name; char *mount; - size_t size; + sg_storage_size_t size; } s_surf_file_t; typedef struct surf_storage { @@ -34,12 +33,13 @@ typedef struct surf_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_file_t */ - size_t size; - size_t used_size; + xbt_dict_t content; + char* content_type; + sg_storage_size_t size; + sg_storage_size_t used_size; char *type_id; - char *content_type; xbt_dynar_t write_actions; + xbt_dict_t properties; } s_storage_t, *storage_t; typedef enum {