dePERLify a bit the routing

[simgrid.git] / src / s4u / s4u_as.cpp

diff --git a/src/s4u/s4u_as.cpp b/src/s4u/s4u_as.cpp
index 70338f6..7dae44a 100644 (file)
--- a/src/s4u/s4u_as.cpp
+++ b/src/s4u/s4u_as.cpp
@@ -75,21 +75,24 @@ namespace simgrid {
     }
 
     void As::addBypassRoute(sg_platf_route_cbarg_t e_route){
-      const char *src = e_route->src;
-      const char *dst = e_route->dst;
-
       /* Argument validity checks */
       if (e_route->gw_dst) {
         XBT_DEBUG("Load bypassASroute from %s@%s to %s@%s",
-            src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
+            e_route->src->name(), e_route->gw_src->name(),
+            e_route->dst->name(), e_route->gw_dst->name());
         xbt_assert(!e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.",
-            src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
-        xbt_assert(bypassRoutes_.find({src,dst}) == bypassRoutes_.end(), "The bypass route between %s@%s and %s@%s already exists.",
-            src, e_route->gw_src->name(), dst, e_route->gw_dst->name());
+            e_route->src->name(), e_route->gw_src->name(),
+            e_route->dst->name(), e_route->gw_dst->name());
+        xbt_assert(bypassRoutes_.find({e_route->src->name(),e_route->dst->name()}) == bypassRoutes_.end(),
+            "The bypass route between %s@%s and %s@%s already exists.",
+            e_route->src->name(), e_route->gw_src->name(), e_route->dst->name(), e_route->gw_dst->name());
       } else {
-        XBT_DEBUG("Load bypassRoute from %s to %s", src, dst);
-        xbt_assert(!e_route->link_list->empty(),                         "Bypass route between %s and %s cannot be empty.",    src, dst);
-        xbt_assert(bypassRoutes_.find({src,dst}) == bypassRoutes_.end(), "The bypass route between %s and %s already exists.", src, dst);
+        XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->name(), e_route->dst->name());
+        xbt_assert(!e_route->link_list->empty(),                         "Bypass route between %s and %s cannot be empty.",
+            e_route->src->name(), e_route->dst->name());
+        xbt_assert(bypassRoutes_.find({e_route->src->name(),e_route->dst->name()}) == bypassRoutes_.end(),
+            "The bypass route between %s and %s already exists.",
+            e_route->src->name(), e_route->dst->name());
       }
 
       /* Build a copy that will be stored in the dict */
@@ -98,7 +101,7 @@ namespace simgrid {
         newRoute->push_back(link);
 
       /* Store it */
-      bypassRoutes_.insert({{src,dst}, newRoute});
+      bypassRoutes_.insert({{e_route->src->name(),e_route->dst->name()}, newRoute});
     }
 
 }  }; // namespace simgrid::s4u