X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b313c9714f8199ac42e4fd6938b8e9d964f66525..b24f30653c7107b2c85ea2f3704f722efe8648e6:/include/simgrid/platf.h diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index ad045edfe6..1fdafeb938 100644 --- a/include/simgrid/platf.h +++ b/include/simgrid/platf.h @@ -27,15 +27,14 @@ XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_file(const char *filename); XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char *id, const char *input, double periodicity); -typedef struct RngStream_InfoState *RngStream; -XBT_PUBLIC(RngStream) tmgr_rng_stream_from_id(char* id); -XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_uniform(RngStream rng_stream, - double alpha, +XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_generator(const char *id, + probabilist_event_generator_t generator1, + probabilist_event_generator_t generator2); + +XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_uniform(double alpha, double beta); -XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_exponential(RngStream rng_stream, - double lambda); -XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(RngStream rng_stream, - double lambda, +XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_exponential(double lambda); +XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(double lambda, double k); /** Defines whether a given resource is working or not */ @@ -136,6 +135,7 @@ typedef struct { const char* model; const char* content; xbt_dict_t properties; + unsigned long size; /* size in Gbytes */ } s_sg_platf_storage_type_cbarg_t, *sg_platf_storage_type_cbarg_t; typedef struct {