X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8f040b324eb3f808a1f5f8da203ae16b20296914..2767d04dfce45dee33cbf8dc3efb156383119093:/include/simgrid/platf.h diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index 6528b4f43c..b9ed1ebe88 100644 --- a/include/simgrid/platf.h +++ b/include/simgrid/platf.h @@ -75,6 +75,10 @@ static inline char* sg_host_name(sg_host_t host) { return host->key; } +typedef xbt_dictelm_t sg_storage_t; +static inline char* sg_storage_name(sg_storage_t storage) { + return storage->key; +} /* * Platform creation functions. Instead of passing 123 arguments to the creation functions @@ -88,7 +92,8 @@ static inline char* sg_host_name(sg_host_t host) { typedef struct { const char* id; - double power_peak; + xbt_dynar_t power_peak; + int pstate; int core_amount; double power_scale; tmgr_trace_t power_trace; @@ -218,6 +223,7 @@ typedef struct { const char* id; const char* type_id; const char* content; + const char* content_type; xbt_dict_t properties; } s_sg_platf_storage_cbarg_t, *sg_platf_storage_cbarg_t; @@ -227,6 +233,7 @@ typedef struct { const char* id; const char* model; const char* content; + const char* content_type; xbt_dict_t properties; unsigned long size; /* size in Gbytes */ } s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t; @@ -241,7 +248,7 @@ typedef struct { #define SG_PLATF_MSTORAGE_INITIALIZER {NULL,NULL} typedef struct { - const char* id; + const char* storageId; const char* name; } s_sg_platf_mount_cbarg_t, *sg_platf_mount_cbarg_t;