X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e1a5f89a7c21cf47e6b9603906d32abf0f3b0dd0..681600546425819d6810e4e595d35e843130d878:/src/kernel/routing/AsImpl.cpp
diff --git a/src/kernel/routing/AsImpl.cpp b/src/kernel/routing/AsImpl.cpp
index f4afb7e112..d30d7866fd 100644
--- a/src/kernel/routing/AsImpl.cpp
+++ b/src/kernel/routing/AsImpl.cpp
@@ -7,6 +7,7 @@
#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"
@@ -16,15 +17,28 @@ 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()
+ {
+ for (auto& kv : bypassRoutes_)
+ delete kv.second;
+ }
simgrid::s4u::Host* AsImpl::createHost(const char* name, std::vector* speedPerPstate, int coreAmount)
{
@@ -33,22 +47,39 @@ 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);
return res;
}
- void AsImpl::getOneLinkRoutes(std::vector* accumulator)
+ void AsImpl::addBypassRoute(sg_platf_route_cbarg_t e_route)
{
- // recursing only. I have no route myself :)
- char* key;
- xbt_dict_cursor_t cursor = nullptr;
- AsImpl* rc_child;
- xbt_dict_foreach (children(), cursor, key, rc_child) {
- rc_child->getOneLinkRoutes(accumulator);
+ /* 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
@@ -118,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;
@@ -170,7 +201,7 @@ namespace simgrid {
/* Base case, no recursion is needed */
if (dst->containingAS() == this && src->containingAS() == this) {
if (bypassRoutes_.find({src, dst}) != bypassRoutes_.end()) {
- AsRoute* bypassedRoute = bypassRoutes_.at({src, dst});
+ BypassRoute* bypassedRoute = bypassRoutes_.at({src, dst});
for (surf::Link* link : bypassedRoute->links) {
links->push_back(link);
if (latency)
@@ -214,7 +245,7 @@ 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 */
- AsRoute* bypassedRoute = nullptr;
+ BypassRoute* bypassedRoute = nullptr;
std::pair key;
for (int max = 0; max <= max_index; max++) {
for (int i = 0; i < max; i++) {
@@ -297,7 +328,7 @@ 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)