cosmetics

[simgrid.git] / src / kernel / routing / AsImpl.cpp

diff --git a/src/kernel/routing/AsImpl.cpp b/src/kernel/routing/AsImpl.cpp
index 8025f70..86c782b 100644 (file)
--- a/src/kernel/routing/AsImpl.cpp
+++ b/src/kernel/routing/AsImpl.cpp
@@ -7,10 +7,11 @@
 
 #include "simgrid/s4u/host.hpp"
 #include "src/kernel/routing/AsImpl.hpp"
+#include "src/kernel/routing/NetCard.hpp"
 #include "src/surf/cpu_interface.hpp"
-#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
+#include "src/surf/network_interface.hpp"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(AsImpl,surf, "Implementation of S4U autonomous systems");
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_route);
 
 namespace simgrid {
   namespace kernel {
@@ -21,7 +22,7 @@ namespace simgrid {
     xbt_assert(nullptr == xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL),
                "Refusing to create a second AS called '%s'.", name);
 
-    netcard_ = new NetCardImpl(name, NetCard::Type::As, static_cast<AsImpl*>(father));
+    netcard_ = new NetCard(name, NetCard::Type::As, static_cast<AsImpl*>(father));
     xbt_lib_set(as_router_lib, name, ROUTING_ASR_LEVEL, static_cast<void*>(netcard_));
     XBT_DEBUG("AS '%s' created with the id '%d'", name, netcard_->id());
   }
@@ -33,7 +34,7 @@ namespace simgrid {
     if (hierarchy_ == RoutingMode::unset)
       hierarchy_ = RoutingMode::base;
 
-    res->pimpl_netcard = new NetCardImpl(name, NetCard::Type::Host, this);
+    res->pimpl_netcard = new NetCard(name, NetCard::Type::Host, this);
 
     surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount);
 
@@ -118,8 +119,8 @@ namespace simgrid {
     AsImpl* src_as = src->containingAS();
     AsImpl* dst_as = dst->containingAS();
 
-    xbt_assert(src_as, "Host %s must be in an AS", src->name().c_str());
-    xbt_assert(dst_as, "Host %s must be in an AS", dst->name().c_str());
+    xbt_assert(src_as, "Host %s must be in an AS", src->cname());
+    xbt_assert(dst_as, "Host %s must be in an AS", dst->cname());
 
     /* (2) find the path to the root routing component */
     std::vector<AsImpl*> path_src;
@@ -164,7 +165,6 @@ namespace simgrid {
                               /* OUT */ std::vector<surf::Link*>* links, double* latency)
   {
     // If never set a bypass route return nullptr without any further computations
-    XBT_DEBUG("generic_get_bypassroute from %s to %s", src->name().c_str(), dst->name().c_str());
     if (bypassRoutes_.empty())
       return false;
 
@@ -177,7 +177,8 @@ namespace simgrid {
           if (latency)
             *latency += link->latency();
         }
-        XBT_DEBUG("Found a bypass route with %zu links", bypassedRoute->links.size());
+        XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links", src->cname(), dst->cname(),
+                  bypassedRoute->links.size());
         return true;
       }
       return false;
@@ -248,35 +249,31 @@ namespace simgrid {
 
     /* (4) If we have the bypass, use it. If not, caller will do the Right Thing. */
     if (bypassedRoute) {
+      XBT_DEBUG("Found a bypass route from '%s' to '%s' with %zu links. We may have to complete it with recursive "
+                "calls to getRoute",
+                src->cname(), dst->cname(), bypassedRoute->links.size());
       if (src != key.first)
-        getRouteRecursive(src, const_cast<NetCard*>(bypassedRoute->gw_src), links, latency);
+        getGlobalRoute(src, const_cast<NetCard*>(bypassedRoute->gw_src), links, latency);
       for (surf::Link* link : bypassedRoute->links) {
         links->push_back(link);
         if (latency)
           *latency += link->latency();
       }
       if (dst != key.second)
-        getRouteRecursive(const_cast<NetCard*>(bypassedRoute->gw_dst), dst, links, latency);
+        getGlobalRoute(const_cast<NetCard*>(bypassedRoute->gw_dst), dst, links, latency);
       return true;
     }
+    XBT_DEBUG("No bypass route from '%s' to '%s'.", src->cname(), dst->cname());
     return false;
     }
 
-    /**
-     * \brief Recursive function for getRouteAndLatency
-     *
-     * \param src the source host
-     * \param dst the destination host
-     * \param links Where to store the links and the gw information
-     * \param latency If not nullptr, the latency of all links will be added in it
-     */
-    void AsImpl::getRouteRecursive(routing::NetCard *src, routing::NetCard *dst,
-        /* OUT */ std::vector<surf::Link*> * links, double *latency)
+    void AsImpl::getGlobalRoute(routing::NetCard* src, routing::NetCard* dst,
+                                /* OUT */ std::vector<surf::Link*>* links, double* latency)
     {
       s_sg_platf_route_cbarg_t route;
       memset(&route,0,sizeof(route));
 
-      XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->name().c_str(), dst->name().c_str());
+      XBT_DEBUG("Resolve route from '%s' to '%s'", src->cname(), dst->cname());
 
       /* Find how src and dst are interconnected */
       AsImpl *common_ancestor, *src_ancestor, *dst_ancestor;
@@ -301,19 +298,18 @@ namespace simgrid {
 
       common_ancestor->getLocalRoute(src_ancestor->netcard_, dst_ancestor->netcard_, &route, latency);
       xbt_assert((route.gw_src != nullptr) && (route.gw_dst != nullptr), "bad gateways for route from \"%s\" to \"%s\"",
-                 src->name().c_str(), dst->name().c_str());
+                 src->cname(), dst->cname());
 
       /* If source gateway is not our source, we have to recursively find our way up to this point */
       if (src != route.gw_src)
-        getRouteRecursive(src, route.gw_src, links, latency);
+        getGlobalRoute(src, route.gw_src, links, latency);
       for (auto link: *route.link_list)
         links->push_back(link);
       delete route.link_list;
 
       /* If dest gateway is not our destination, we have to recursively find our way from this point */
       if (route.gw_dst != dst)
-        getRouteRecursive(route.gw_dst, dst, links, latency);
-
+        getGlobalRoute(route.gw_dst, dst, links, latency);
     }
 
 }}} // namespace