X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/084e8bbede5c1c275292a037a5b2fbfcb8c7d381..8ef37a2e313de8c48edbd49a643d500dd76cebc1:/src/surf/surf_routing_cluster.c diff --git a/src/surf/surf_routing_cluster.c b/src/surf/surf_routing_cluster.c index a34dc31c33..52cc0595d9 100644 --- a/src/surf/surf_routing_cluster.c +++ b/src/surf/surf_routing_cluster.c @@ -20,7 +20,7 @@ typedef struct { /* Business methods */ static void cluster_get_route_and_latency(AS_t as, - network_element_t src, network_element_t dst, + sg_routing_edge_t src, sg_routing_edge_t dst, route_t route, double *lat) { s_surf_parsing_link_up_down_t info; @@ -58,13 +58,15 @@ static void model_cluster_finalize(AS_t as) { model_none_finalize(as); } -static int cluster_parse_PU(AS_t rc, network_element_t elm) { - xbt_dynar_push(rc->index_network_elm, (void *)elm); +static int cluster_parse_PU(AS_t rc, sg_routing_edge_t elm) { + XBT_DEBUG("Load process unit \"%s\"", elm->name); + xbt_dynar_push_as(rc->index_network_elm,sg_routing_edge_t,elm); return xbt_dynar_length(rc->index_network_elm)-1; } -static int cluster_parse_AS(AS_t rc, network_element_t elm) { - xbt_dynar_push(rc->index_network_elm, (void *)elm); +static int cluster_parse_AS(AS_t rc, sg_routing_edge_t elm) { + XBT_DEBUG("Load Autonomous system \"%s\"", elm->name); + xbt_dynar_push_as(rc->index_network_elm,sg_routing_edge_t,elm); return xbt_dynar_length(rc->index_network_elm)-1; }