X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/98902509dba21a4817edab8fb2a8f69506a461a3..b8cb9b7a6662783042181ed7c86a85c789ede456:/src/kernel/routing/AsFull.cpp

diff --git a/src/kernel/routing/AsFull.cpp b/src/kernel/routing/AsFull.cpp
index 62df1a6b42..1a116db547 100644
--- a/src/kernel/routing/AsFull.cpp
+++ b/src/kernel/routing/AsFull.cpp
@@ -59,25 +59,20 @@ AsFull::~AsFull(){
   }
 }
 
-void AsFull::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t res, double *lat)
+void AsFull::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t res, double* lat)
 {
-  XBT_DEBUG("full_get_route_and_latency from %s[%d] to %s[%d]", src->name().c_str(), src->id(), dst->name().c_str(),
-            dst->id());
+  XBT_DEBUG("full getLocalRoute from %s[%d] to %s[%d]", src->cname(), src->id(), dst->cname(), dst->id());
 
-  /* set utils vars */
   size_t table_size = vertices_.size();
+  sg_platf_route_cbarg_t e_route = TO_ROUTE_FULL(src->id(), dst->id());
 
-  sg_platf_route_cbarg_t e_route = nullptr;
-
-  e_route = TO_ROUTE_FULL(src->id(), dst->id());
-
-  if (e_route) {
+  if (e_route != nullptr) {
     res->gw_src = e_route->gw_src;
     res->gw_dst = e_route->gw_dst;
     for (auto link : *e_route->link_list) {
       res->link_list->push_back(link);
       if (lat)
-        *lat += static_cast<Link*>(link)->latency();
+        *lat += link->latency();
     }
   }
 }
@@ -86,9 +81,6 @@ void AsFull::addRoute(sg_platf_route_cbarg_t route)
 {
   NetCard* src        = route->src;
   NetCard* dst        = route->dst;
-  const char* srcName = src->name().c_str();
-  const char* dstName = dst->name().c_str();
-
   addRouteCheckParams(route);
 
   size_t table_size = vertices_.size();
@@ -99,11 +91,12 @@ void AsFull::addRoute(sg_platf_route_cbarg_t route)
   /* Check that the route does not already exist */
   if (route->gw_dst) // AS route (to adapt the error message, if any)
     xbt_assert(nullptr == TO_ROUTE_FULL(src->id(), dst->id()),
-               "The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).", srcName,
-               route->gw_src->name().c_str(), dstName, route->gw_dst->name().c_str());
+               "The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).",
+               src->cname(), route->gw_src->cname(), dst->cname(), route->gw_dst->cname());
   else
     xbt_assert(nullptr == TO_ROUTE_FULL(src->id(), dst->id()),
-               "The route between %s and %s already exists (Rq: routes are symmetrical by default).", srcName, dstName);
+               "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->cname(),
+               dst->cname());
 
   /* Add the route to the base */
   TO_ROUTE_FULL(src->id(), dst->id()) = newExtendedRoute(hierarchy_, route, 1);
@@ -119,11 +112,11 @@ void AsFull::addRoute(sg_platf_route_cbarg_t route)
       xbt_assert(
           nullptr == TO_ROUTE_FULL(dst->id(), src->id()),
           "The route between %s@%s and %s@%s already exists. You should not declare the reverse path as symmetrical.",
-          dstName, route->gw_dst->name().c_str(), srcName, route->gw_src->name().c_str());
+          dst->cname(), route->gw_dst->cname(), src->cname(), route->gw_src->cname());
     else
       xbt_assert(nullptr == TO_ROUTE_FULL(dst->id(), src->id()),
                  "The route between %s and %s already exists. You should not declare the reverse path as symmetrical.",
-                 dstName, srcName);
+                 dst->cname(), src->cname());
 
     TO_ROUTE_FULL(dst->id(), src->id()) = newExtendedRoute(hierarchy_, route, 0);
     TO_ROUTE_FULL(dst->id(), src->id())->link_list->shrink_to_fit();