X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29dbba02d775b87908c34d8233290331b67d02b3..455435b8a7cc8d84037aa66104a73d4760d9666f:/src/kernel/routing/AsImpl.cpp diff --git a/src/kernel/routing/AsImpl.cpp b/src/kernel/routing/AsImpl.cpp index 86c782b7b6..1be8910964 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/BypassRoute.hpp" #include "src/kernel/routing/NetCard.hpp" #include "src/surf/cpu_interface.hpp" #include "src/surf/network_interface.hpp" @@ -41,17 +42,6 @@ namespace simgrid { return res; } - void AsImpl::getOneLinkRoutes(std::vector* accumulator) - { - // 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); - } - } - /** @brief Get the common ancestor and its first children in each line leading to src and dst * * In the recursive case, this sets common_ancestor, src_ancestor and dst_ancestor are set as follows. @@ -171,7 +161,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) @@ -215,7 +205,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++) {