Kill link_lib and have C++ handle the hashmap of all links

[simgrid.git] / src / surf / surf_routing_generic.cpp

diff --git a/src/surf/surf_routing_generic.cpp b/src/surf/surf_routing_generic.cpp
index 908e46e..a92e8be 100644 (file)
--- a/src/surf/surf_routing_generic.cpp
+++ b/src/surf/surf_routing_generic.cpp
@@ -234,7 +234,8 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src,
 
     if (src == NULL || dst == NULL)
       xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
-          src->getName(), dst->getName(), p_name);
+              src ? src->getName() : "(null)",
+              dst ? dst->getName() : "(null)", p_name);
 
     src_as = src->getRcComponent();
     dst_as = dst->getRcComponent();
@@ -321,7 +322,7 @@ sg_platf_route_cbarg_t AsGeneric::getBypassRoute(RoutingEdgePtr src,
 
   sg_platf_route_cbarg_t new_e_route = NULL;
   if (e_route_bypass) {
-    NetworkLinkPtr link;
+         Link* link;
     unsigned int cpt = 0;
     new_e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
     new_e_route->gw_src = e_route_bypass->gw_src;
@@ -360,21 +361,21 @@ sg_platf_route_cbarg_t AsGeneric::newExtendedRoute(e_surf_routing_hierarchy_t hi
     xbt_assert(routearg->gw_src && routearg->gw_dst,
         "NULL is obviously a bad gateway");
 
-    /* remeber not erase the gateway names */
+    /* remember not erase the gateway names */
     result->gw_src = routearg->gw_src;
     result->gw_dst = routearg->gw_dst;
   }
 
   xbt_dynar_foreach(routearg->link_list, cpt, link_name) {
 
-    void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL);
+    Link *link = Link::byName(link_name);
     if (link) {
       if (change_order)
         xbt_dynar_push(result->link_list, &link);
       else
         xbt_dynar_unshift(result->link_list, &link);
     } else
-      THROWF(mismatch_error, 0, "Link %s not found", link_name);
+      THROWF(mismatch_error, 0, "Link '%s' not found", link_name);
   }
 
   return result;
@@ -428,10 +429,7 @@ AsPtr AsGeneric::autonomousSystemExist(char *element)
 
 AsPtr AsGeneric::processingUnitsExist(char *element)
 {
-  AsPtr element_as;
-  element_as = ((RoutingEdgePtr)
-      xbt_lib_get_or_null(host_lib,
-          element, ROUTING_HOST_LEVEL))->getRcComponent();
+  AsPtr element_as = sg_host_edge(sg_host_by_name(element)) ->getRcComponent();
   if (element_as == this)
     return element_as;
   return asExist(element_as);
@@ -439,20 +437,14 @@ AsPtr AsGeneric::processingUnitsExist(char *element)
 
 void AsGeneric::srcDstCheck(RoutingEdgePtr src, RoutingEdgePtr dst)
 {
-
-  RoutingEdgePtr src_data = src;
-  RoutingEdgePtr dst_data = dst;
-
-  if (src_data == NULL || dst_data == NULL)
+  if (src == NULL || dst == NULL)
     xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"",
-        src->getName(),
-        dst->getName(),
-        p_name);
+            src ? src->getName() : "(null)",
+            dst ? dst->getName() : "(null)",
+            p_name);
 
-  AsPtr src_as =
-      (src_data)->getRcComponent();
-  AsPtr dst_as =
-      (dst_data)->getRcComponent();
+  AsPtr src_as = src->getRcComponent();
+  AsPtr dst_as = dst->getRcComponent();
 
   if (src_as != dst_as)
     xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS",