#include <simgrid/s4u/host.hpp>
#include <simgrid/s4u/As.hpp>
-#include "src/surf/surf_routing.hpp"
+#include "src/kernel/routing/NetCard.hpp"
#include "src/surf/network_interface.hpp" // Link FIXME: move to proper header
+#include "src/surf/surf_routing.hpp"
XBT_LOG_NEW_DEFAULT_CATEGORY(s4u_as,"S4U autonomous systems");
{
/* Argument validity checks */
if (e_route->gw_dst) {
- XBT_DEBUG("Load bypassASroute from %s@%s to %s@%s", e_route->src->name(), e_route->gw_src->name(),
- e_route->dst->name(), e_route->gw_dst->name());
+ XBT_DEBUG("Load bypassASroute from %s@%s to %s@%s", e_route->src->name().c_str(), e_route->gw_src->name().c_str(),
+ e_route->dst->name().c_str(), e_route->gw_dst->name().c_str());
xbt_assert(!e_route->link_list->empty(), "Bypass route between %s@%s and %s@%s cannot be empty.",
- e_route->src->name(), e_route->gw_src->name(), e_route->dst->name(), e_route->gw_dst->name());
- xbt_assert(bypassRoutes_.find({e_route->src->name(), e_route->dst->name()}) == bypassRoutes_.end(),
- "The bypass route between %s@%s and %s@%s already exists.", e_route->src->name(),
- e_route->gw_src->name(), e_route->dst->name(), e_route->gw_dst->name());
+ e_route->src->name().c_str(), e_route->gw_src->name().c_str(), e_route->dst->name().c_str(),
+ e_route->gw_dst->name().c_str());
+ 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->name().c_str(),
+ e_route->gw_src->name().c_str(), e_route->dst->name().c_str(), e_route->gw_dst->name().c_str());
} else {
- XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->name(), e_route->dst->name());
- xbt_assert(!e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.", e_route->src->name(),
- e_route->dst->name());
- xbt_assert(bypassRoutes_.find({e_route->src->name(), e_route->dst->name()}) == bypassRoutes_.end(),
- "The bypass route between %s and %s already exists.", e_route->src->name(), e_route->dst->name());
+ XBT_DEBUG("Load bypassRoute from %s to %s", e_route->src->name().c_str(), e_route->dst->name().c_str());
+ xbt_assert(!e_route->link_list->empty(), "Bypass route between %s and %s cannot be empty.",
+ e_route->src->name().c_str(), e_route->dst->name().c_str());
+ xbt_assert(bypassRoutes_.find({e_route->src, e_route->dst}) == bypassRoutes_.end(),
+ "The bypass route between %s and %s already exists.", e_route->src->name().c_str(),
+ e_route->dst->name().c_str());
}
/* Build a copy that will be stored in the dict */
- std::vector<surf::Link*>* newRoute = new std::vector<surf::Link*>();
+ kernel::routing::AsRoute* newRoute = new kernel::routing::AsRoute(e_route->gw_src, e_route->gw_dst);
for (auto link : *e_route->link_list)
- newRoute->push_back(link);
+ newRoute->links.push_back(link);
/* Store it */
- bypassRoutes_.insert({{e_route->src->name(), e_route->dst->name()}, newRoute});
+ bypassRoutes_.insert({{e_route->src, e_route->dst}, newRoute});
}
} }; // namespace simgrid::s4u