if (strcmp (child1_name, child2_name) == 0) continue;
//get the route
- route_t route = xbt_new0(s_route_t,1);
+ sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1);
route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
rc->get_route_and_latency(rc, child1->net_elm, child2->net_elm,
route, NULL);
unsigned int cpt;
void *link;
container_t current, previous;
- if (route->src_gateway){
- previous = PJ_container_get(route->src_gateway->name);
+ if (route->gw_src){
+ previous = PJ_container_get(route->gw_src->name);
}else{
previous = child1;
}
linkContainers(previous, current, filter);
previous = current;
}
- if (route->dst_gateway){
- current = PJ_container_get(route->dst_gateway->name);
+ if (route->gw_dst){
+ current = PJ_container_get(route->gw_dst->name);
}else{
current = child2;
}
/*
* Callbacks
*/
-static void instr_routing_parse_start_AS (const char*id,int routing)
+static void instr_routing_parse_start_AS (sg_platf_AS_cbarg_t AS)
{
+ const char*id = AS->id;
+
if (PJ_container_get_root() == NULL){
PJ_container_alloc ();
PJ_type_alloc();
if (strcmp (child1_name, child2_name) == 0) continue;
//get the route
- route_t route = xbt_new0(s_route_t,1);
+ sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1);
route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL);
rc->get_route_and_latency(rc, child1->net_elm, child2->net_elm,
route, NULL);
unsigned int cpt;
void *link;
xbt_node_t current, previous;
- if (route->src_gateway){
- previous = new_xbt_graph_node(graph, route->src_gateway->name, nodes);
+ if (route->gw_src){
+ previous = new_xbt_graph_node(graph, route->gw_src->name, nodes);
}else{
previous = new_xbt_graph_node(graph, child1_name, nodes);
}
//previous -> current
previous = current;
}
- if (route->dst_gateway){
- current = new_xbt_graph_node(graph, route->dst_gateway->name, nodes);
+ if (route->gw_dst){
+ current = new_xbt_graph_node(graph, route->gw_dst->name, nodes);
}else{
current = new_xbt_graph_node(graph, child2_name, nodes);
}