X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fe45c9fee67e0b37665de17ee009844a115778d3..7abffd12021a46a0ac1bd2b4ff48ca4b3cc8c71c:/include/simgrid/platf.h diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index f600b16612..6f1c50eb7c 100644 --- a/include/simgrid/platf.h +++ b/include/simgrid/platf.h @@ -28,12 +28,16 @@ XBT_PUBLIC(tmgr_trace_t) tmgr_trace_new_from_string(const char *id, double periodicity); 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 min, + probabilist_event_generator_t generator2, + int is_state_trace); + +XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_uniform(const char* id, + double min, double max); -XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_exponential(double rate); -XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(double scale, +XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_exponential(const char* id, + double rate); +XBT_PUBLIC(probabilist_event_generator_t) tmgr_event_generator_new_weibull(const char* id, + double scale, double shape); /** Defines whether a given resource is working or not */ @@ -70,6 +74,13 @@ typedef struct { xbt_dict_t properties; } s_sg_platf_host_cbarg_t, *sg_platf_host_cbarg_t; +typedef struct { + const char* id; + const char* link_up; + const char* link_down; +} s_sg_platf_host_link_cbarg_t, *sg_platf_host_link_cbarg_t; + + typedef struct { const char* id; const char* coord; @@ -156,6 +167,7 @@ XBT_PUBLIC(void) sg_platf_new_AS_begin(const char *id, int mode); // Begin descr XBT_PUBLIC(void) sg_platf_new_AS_end(void); // That AS is fully described XBT_PUBLIC(void) sg_platf_new_host (sg_platf_host_cbarg_t host); // Add an host to the currently described AS +XBT_PUBLIC(void) sg_platf_new_host_link(sg_platf_host_link_cbarg_t h); // Add an host_link to the currently described AS XBT_PUBLIC(void) sg_platf_new_router (sg_platf_router_cbarg_t router); // Add a router to the currently described AS XBT_PUBLIC(void) sg_platf_new_link (sg_platf_link_cbarg_t link); // Add a link to the currently described AS XBT_PUBLIC(void) sg_platf_new_peer (sg_platf_peer_cbarg_t peer); // Add a peer to the currently described AS