- do {
- prev_pred = pred;
- pred = TO_FLOYD_PRED(*src_id, pred);
- if (pred == -1) /* if no pred in route -> no route to host */
- break;
- xbt_assert(TO_FLOYD_LINK(pred, prev_pred),
- "Invalid link for the route between \"%s\" or \"%s\"",
- src->name,
- dst->name);
-
- prev_gw_src = gw_src;
-
- route_t e_route = TO_FLOYD_LINK(pred, prev_pred);
- gw_src = e_route->src_gateway;
- gw_dst = e_route->dst_gateway;
-
- if (first)
- first_gw = gw_dst;
-
- if (asg->hierarchy == SURF_ROUTING_RECURSIVE && !first
- && strcmp(gw_dst->name, prev_gw_src->name)) {
- xbt_dynar_t e_route_as_to_as;
- e_route_as_to_as = xbt_dynar_new(sizeof(sg_routing_link_t), NULL);
- routing_get_route_and_latency(gw_dst, prev_gw_src,&e_route_as_to_as,NULL);
- links = e_route_as_to_as;
- int pos = 0;
- xbt_dynar_foreach(links, cpt, link) {
- xbt_dynar_insert_at(res->link_list, pos, &link);
- if (lat)
- *lat += surf_network_model->extension.network.get_link_latency(link);
- pos++;
- }
- xbt_dynar_free(&e_route_as_to_as);
+ sg_routing_edge_t prev_dst_gw = NULL;
+ while (!xbt_dynar_is_empty(route_stack)) {
+ sg_platf_route_cbarg_t e_route = xbt_dynar_pop_as(route_stack, sg_platf_route_cbarg_t);
+ xbt_dynar_t links;
+ sg_routing_link_t link;
+ unsigned int cpt;
+
+ if (asg->hierarchy == SURF_ROUTING_RECURSIVE && prev_dst_gw != NULL
+ && strcmp(prev_dst_gw->name, e_route->gw_src->name)) {
+ routing_get_route_and_latency(prev_dst_gw, e_route->gw_src,
+ &res->link_list, lat);