#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 {
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());
}
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);
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;
/* 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;
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;
/* (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)
getGlobalRoute(src, const_cast<NetCard*>(bypassedRoute->gw_src), links, latency);
for (surf::Link* link : bypassedRoute->links) {
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;
}
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;
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)