X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f7afa0288b0d18934f8178a99320a99889e1f38b..53f719520dac91270a2335ab6c48f5ef948b6828:/src/surf/xml/platf_private.hpp diff --git a/src/surf/xml/platf_private.hpp b/src/surf/xml/platf_private.hpp index bd8224396b..3d21302f1a 100644 --- a/src/surf/xml/platf_private.hpp +++ b/src/surf/xml/platf_private.hpp @@ -115,8 +115,6 @@ typedef struct s_sg_platf_cluster_cbarg { const char* router_id; e_surf_link_sharing_policy_t sharing_policy; e_surf_link_sharing_policy_t bb_sharing_policy; - const char* availability_trace; //don't convert to tmgr_trace_t since there is a trace per host and some rewriting is needed - const char* state_trace; } s_sg_platf_cluster_cbarg_t; typedef struct s_sg_platf_cabinet_cbarg *sg_platf_cabinet_cbarg_t; @@ -202,8 +200,8 @@ void routing_cluster_add_backbone(Link* bb); XBT_PUBLIC(void) sg_platf_begin(void); // Start a new platform XBT_PUBLIC(void) sg_platf_end(void); // Finish the creation of the platform -XBT_PUBLIC(void) sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS); // Begin description of new AS -XBT_PUBLIC(void) sg_platf_new_AS_end(void); // That AS is fully described +XBT_PUBLIC(simgrid::s4u::As*) sg_platf_new_AS_begin(sg_platf_AS_cbarg_t AS); // Begin description of new AS +XBT_PUBLIC(void) sg_platf_new_AS_seal(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_hostlink(sg_platf_host_link_cbarg_t h); // Add an host_link to the currently described AS