Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot//simgrid/simgrid

[simgrid.git] / src / surf / surf_routing_full.c

diff --git a/src/surf/surf_routing_full.c b/src/surf/surf_routing_full.c
index 9e1b99c..776d2ed 100644 (file)
--- a/src/surf/surf_routing_full.c
+++ b/src/surf/surf_routing_full.c
@@ -39,9 +39,9 @@ static xbt_dynar_t full_get_onelink_routes(AS_t rc)
           onelink_t onelink = xbt_new0(s_onelink_t, 1);
           onelink->link_ptr = link;
           if (rc->hierarchy == SURF_ROUTING_BASE) {
-            onelink->src = xbt_dynar_get_as(rc->index_network_elm,src,network_element_t);
+            onelink->src = xbt_dynar_get_as(rc->index_network_elm,src,sg_routing_edge_t);
             onelink->src->id = src;
-            onelink->dst = xbt_dynar_get_as(rc->index_network_elm,dst,network_element_t);
+            onelink->dst = xbt_dynar_get_as(rc->index_network_elm,dst,sg_routing_edge_t);
             onelink->dst->id = dst;
           } else if (rc->hierarchy == SURF_ROUTING_RECURSIVE) {
             onelink->src = route->src_gateway;
@@ -59,7 +59,7 @@ static xbt_dynar_t full_get_onelink_routes(AS_t rc)
 }
 
 static void full_get_route_and_latency(AS_t rc,
-    network_element_t src, network_element_t dst,
+    sg_routing_edge_t src, sg_routing_edge_t dst,
     route_t res, double *lat)
 {
   XBT_DEBUG("full_get_route_and_latency from %s[%d] to %s[%d]",
@@ -159,14 +159,10 @@ static int full_pointer_resource_cmp(const void *a, const void *b)
 void model_full_set_route(AS_t rc, const char *src,
     const char *dst, route_t route)
 {
-  network_element_t src_net_elm, dst_net_elm;
+  sg_routing_edge_t src_net_elm, dst_net_elm;
   int as_route = 0;
-  src_net_elm = xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL);
-  dst_net_elm = xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL);
-  if (!src_net_elm)
-    src_net_elm = xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL);
-  if (!dst_net_elm)
-    dst_net_elm = xbt_lib_get_or_null(as_router_lib, dst, ROUTING_ASR_LEVEL);
+  src_net_elm = sg_routing_edge_by_name_or_null(src);
+  dst_net_elm = sg_routing_edge_by_name_or_null(dst);
 
   xbt_assert(src_net_elm, "Network elements %s not found", src);
   xbt_assert(dst_net_elm, "Network elements %s not found", dst);
@@ -249,7 +245,7 @@ void model_full_set_route(AS_t rc, const char *src,
       || (A_surfxml_ASroute_symmetrical == A_surfxml_ASroute_symmetrical_YES && as_route == 1)
   ) {
     if (route->dst_gateway && route->src_gateway) {
-      network_element_t gw_tmp;
+      sg_routing_edge_t gw_tmp;
       gw_tmp = route->src_gateway;
       route->src_gateway = route->dst_gateway;
       route->dst_gateway = gw_tmp;