X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9a02e3654bd28c13ac053247383566f54fa4498a..681600546425819d6810e4e595d35e843130d878:/src/kernel/routing/AsImpl.cpp diff --git a/src/kernel/routing/AsImpl.cpp b/src/kernel/routing/AsImpl.cpp index 1509825091..d30d7866fd 100644 --- a/src/kernel/routing/AsImpl.cpp +++ b/src/kernel/routing/AsImpl.cpp @@ -7,36 +7,79 @@ #include "simgrid/s4u/host.hpp" #include "src/kernel/routing/AsImpl.hpp" -#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header +#include "src/kernel/routing/NetCard.hpp" +#include "src/surf/cpu_interface.hpp" +#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 { namespace routing { + class BypassRoute { + public: + explicit BypassRoute(NetCard* gwSrc, NetCard* gwDst) : gw_src(gwSrc), gw_dst(gwDst) {} + const NetCard* gw_src; + const NetCard* gw_dst; + std::vector links; + }; + AsImpl::AsImpl(As* father, const char* name) : As(father, name) { 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(father)); + netcard_ = new NetCard(name, NetCard::Type::As, static_cast(father)); xbt_lib_set(as_router_lib, name, ROUTING_ASR_LEVEL, static_cast(netcard_)); XBT_DEBUG("AS '%s' created with the id '%d'", name, netcard_->id()); } - AsImpl::~AsImpl() = default; + AsImpl::~AsImpl() + { + for (auto& kv : bypassRoutes_) + delete kv.second; + } - void AsImpl::attachHost(s4u::Host* host) + simgrid::s4u::Host* AsImpl::createHost(const char* name, std::vector* speedPerPstate, int coreAmount) { + simgrid::s4u::Host* res = new simgrid::s4u::Host(name); + if (hierarchy_ == RoutingMode::unset) hierarchy_ = RoutingMode::base; - host->pimpl_netcard = new NetCardImpl(host->name().c_str(), NetCard::Type::Host, this); + res->pimpl_netcard = new NetCard(name, NetCard::Type::Host, this); + + surf_cpu_model_pm->createCpu(res, speedPerPstate, coreAmount); + + return res; } - xbt_dynar_t AsImpl::getOneLinkRoutes() + void AsImpl::addBypassRoute(sg_platf_route_cbarg_t e_route) { - return nullptr; + /* Argument validity checks */ + if (e_route->gw_dst) { + XBT_DEBUG("Load bypassASroute from %s@%s to %s@%s", e_route->src->cname(), e_route->gw_src->cname(), + e_route->dst->cname(), e_route->gw_dst->cname()); + xbt_assert(!e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.", + e_route->src->cname(), e_route->gw_src->cname(), e_route->dst->cname(), e_route->gw_dst->cname()); + xbt_assert(bypassRoutes_.find({e_route->src, e_route->dst}) == bypassRoutes_.end(), + "The bypass route between %s@%s and %s@%s already exists.", e_route->src->cname(), + e_route->gw_src->cname(), e_route->dst->cname(), e_route->gw_dst->cname()); + } else { + XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->cname(), e_route->dst->cname()); + xbt_assert(!e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.", e_route->src->cname(), + e_route->dst->cname()); + xbt_assert(bypassRoutes_.find({e_route->src, e_route->dst}) == bypassRoutes_.end(), + "The bypass route between %s and %s already exists.", e_route->src->cname(), e_route->dst->cname()); + } + + /* Build a copy that will be stored in the dict */ + kernel::routing::BypassRoute* newRoute = new kernel::routing::BypassRoute(e_route->gw_src, e_route->gw_dst); + for (auto link : *e_route->link_list) + newRoute->links.push_back(link); + + /* Store it */ + bypassRoutes_.insert({{e_route->src, e_route->dst}, newRoute}); } /** @brief Get the common ancestor and its first children in each line leading to src and dst @@ -106,8 +149,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 path_src; @@ -152,20 +195,20 @@ namespace simgrid { /* OUT */ std::vector* 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; /* Base case, no recursion is needed */ if (dst->containingAS() == this && src->containingAS() == this) { - if (bypassRoutes_.find({src->name(), dst->name()}) != bypassRoutes_.end()) { - std::vector* bypassedRoute = bypassRoutes_.at({src->name(), dst->name()}); - for (surf::Link* link : *bypassedRoute) { + if (bypassRoutes_.find({src, dst}) != bypassRoutes_.end()) { + BypassRoute* bypassedRoute = bypassRoutes_.at({src, dst}); + for (surf::Link* link : bypassedRoute->links) { links->push_back(link); if (latency) *latency += link->latency(); } - XBT_DEBUG("Found a bypass route with %zu links", bypassedRoute->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; @@ -173,20 +216,19 @@ namespace simgrid { /* Engage recursive search */ - std::vector* bypassedRoute = nullptr; /* (1) find the path to the root routing component */ - std::vector path_src; + std::vector path_src; As* current = src->containingAS(); while (current != nullptr) { - path_src.push_back(current); + path_src.push_back(static_cast(current)); current = current->father_; } - std::vector path_dst; + std::vector path_dst; current = dst->containingAS(); while (current != nullptr) { - path_dst.push_back(current); + path_dst.push_back(static_cast(current)); current = current->father_; } @@ -202,17 +244,20 @@ namespace simgrid { int max_index = std::max(max_index_src, max_index_dst); + /* (3) Search for a bypass making the path up to the ancestor useless */ + BypassRoute* bypassedRoute = nullptr; + std::pair key; for (int max = 0; max <= max_index; max++) { for (int i = 0; i < max; i++) { if (i <= max_index_src && max <= max_index_dst) { - const std::pair key = {path_src.at(i)->name(), path_dst.at(max)->name()}; + key = {path_src.at(i)->netcard_, path_dst.at(max)->netcard_}; if (bypassRoutes_.find(key) != bypassRoutes_.end()) { bypassedRoute = bypassRoutes_.at(key); break; } } if (max <= max_index_src && i <= max_index_dst) { - const std::pair key = {path_src.at(max)->name(), path_dst.at(i)->name()}; + key = {path_src.at(max)->netcard_, path_dst.at(i)->netcard_}; if (bypassRoutes_.find(key) != bypassRoutes_.end()) { bypassedRoute = bypassRoutes_.at(key); break; @@ -224,7 +269,7 @@ namespace simgrid { break; if (max <= max_index_src && max <= max_index_dst) { - const std::pair key = {path_src.at(max)->name(), path_dst.at(max)->name()}; + key = {path_src.at(max)->netcard_, path_dst.at(max)->netcard_}; if (bypassRoutes_.find(key) != bypassRoutes_.end()) { bypassedRoute = bypassRoutes_.at(key); break; @@ -232,32 +277,33 @@ namespace simgrid { } } + /* (4) If we have the bypass, use it. If not, caller will do the Right Thing. */ if (bypassedRoute) { - for (surf::Link* link : *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(bypassedRoute->gw_src), links, latency); + for (surf::Link* link : bypassedRoute->links) { links->push_back(link); if (latency) *latency += link->latency(); } + if (dst != key.second) + getGlobalRoute(const_cast(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 * links, double *latency) + void AsImpl::getGlobalRoute(routing::NetCard* src, routing::NetCard* dst, + /* OUT */ std::vector* 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; @@ -272,7 +318,7 @@ namespace simgrid { /* If src and dst are in the same AS, life is good */ if (src_ancestor == dst_ancestor) { /* SURF_ROUTING_BASE */ route.link_list = links; - common_ancestor->getRouteAndLatency(src, dst, &route, latency); + common_ancestor->getLocalRoute(src, dst, &route, latency); return; } @@ -280,21 +326,20 @@ namespace simgrid { route.link_list = new std::vector(); - common_ancestor->getRouteAndLatency(src_ancestor->netcard_, dst_ancestor->netcard_, &route, latency); + 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