#include "xbt/log.h"
#include "xbt/sysdep.h"
-#include "src/kernel/routing/NetCard.hpp"
+#include "src/kernel/routing/NetPoint.hpp"
#include "src/kernel/routing/RoutedZone.hpp"
#include "src/surf/network_interface.hpp"
}
}
-/* ************************************************************************** */
-/* *********************** GENERIC BUSINESS METHODS ************************* */
+/* ***************************************************************** */
+/* *********************** GENERIC METHODS ************************* */
static const char* instr_node_name(xbt_node_t node)
{
continue;
sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1);
- route->link_list = new std::vector<Link*>();
+ route->link_list = new std::vector<surf::LinkImpl*>();
getLocalRoute(my_src, my_dst, route, nullptr);
XBT_DEBUG("get_route_and_latency %s -> %s", my_src->cname(), my_dst->cname());
- xbt_node_t current, previous;
- const char *previous_name, *current_name;
+ xbt_node_t current;
+ xbt_node_t previous;
+ const char *previous_name;
+ const char *current_name;
if (route->gw_src) {
previous = new_xbt_graph_node(graph, route->gw_src->cname(), nodes);
}
for (auto link : *route->link_list) {
- const char* link_name = link->getName();
+ const char* link_name = link->cname();
current = new_xbt_graph_node(graph, link_name, nodes);
current_name = link_name;
new_xbt_graph_edge(graph, previous, current, edges);
/* ************************* GENERIC AUX FUNCTIONS ************************** */
/* change a route containing link names into a route containing link entities */
sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_platf_route_cbarg_t routearg,
- int change_order)
+ bool change_order)
{
sg_platf_route_cbarg_t result;
result = xbt_new0(s_sg_platf_route_cbarg_t, 1);
- result->link_list = new std::vector<Link*>();
+ result->link_list = new std::vector<surf::LinkImpl*>();
xbt_assert(hierarchy == RoutingMode::base || hierarchy == RoutingMode::recursive,
- "The hierarchy of this AS is neither BASIC nor RECURSIVE, I'm lost here.");
+ "The hierarchy of this netzone is neither BASIC nor RECURSIVE, I'm lost here.");
if (hierarchy == RoutingMode::recursive) {
xbt_assert(routearg->gw_src && routearg->gw_dst, "nullptr is obviously a deficient gateway");
else
result->link_list->insert(result->link_list->begin(), link);
}
+ result->link_list->shrink_to_fit();
return result;
}
-void RoutedZone::getRouteCheckParams(NetCard* src, NetCard* dst)
+void RoutedZone::getRouteCheckParams(NetPoint* src, NetPoint* dst)
{
xbt_assert(src, "Cannot find a route from nullptr to %s", dst->cname());
xbt_assert(dst, "Cannot find a route from %s to nullptr", src->cname());
- NetZone* src_as = src->containingAS();
- NetZone* dst_as = dst->containingAS();
+ NetZone* src_as = src->netzone();
+ NetZone* dst_as = dst->netzone();
xbt_assert(src_as == dst_as,
- "Internal error: %s@%s and %s@%s are not in the same AS as expected. Please report that bug.",
+ "Internal error: %s@%s and %s@%s are not in the same netzone as expected. Please report that bug.",
src->cname(), src_as->name(), dst->cname(), dst_as->name());
- xbt_assert(this == dst_as, "Internal error: route destination %s@%s is not in AS %s as expected (route source: "
+ xbt_assert(this == dst_as, "Internal error: route destination %s@%s is not in netzone %s as expected (route source: "
"%s@%s). Please report that bug.",
src->cname(), dst->cname(), src_as->name(), dst_as->name(), name());
}
void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
{
- NetCard* src = route->src;
- NetCard* dst = route->dst;
+ NetPoint* src = route->src;
+ NetPoint* dst = route->dst;
const char* srcName = src->cname();
const char* dstName = dst->cname();
xbt_assert(src, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, srcName);
xbt_assert(dst, "Cannot add a route from %s to %s: %s does not exist.", srcName, dstName, dstName);
xbt_assert(!route->link_list->empty(), "Empty route (between %s and %s) forbidden.", srcName, dstName);
- xbt_assert(!src->isAS(),
- "When defining a route, src cannot be an AS such as '%s'. Did you meant to have an ASroute?", srcName);
- xbt_assert(!dst->isAS(),
- "When defining a route, dst cannot be an AS such as '%s'. Did you meant to have an ASroute?", dstName);
+ xbt_assert(!src->isNetZone(),
+ "When defining a route, src cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?", srcName);
+ xbt_assert(!dst->isNetZone(),
+ "When defining a route, dst cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?", dstName);
} else {
- XBT_DEBUG("Load ASroute from %s@%s to %s@%s", srcName, route->gw_src->cname(), dstName, route->gw_dst->cname());
- xbt_assert(src->isAS(), "When defining an ASroute, src must be an AS but '%s' is not", srcName);
- xbt_assert(dst->isAS(), "When defining an ASroute, dst must be an AS but '%s' is not", dstName);
+ XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", srcName, route->gw_src->cname(), dstName, route->gw_dst->cname());
+ xbt_assert(src->isNetZone(), "When defining a NetzoneRoute, src must be a netzone but '%s' is not", srcName);
+ xbt_assert(dst->isNetZone(), "When defining a NetzoneRoute, dst must be a netzone but '%s' is not", dstName);
xbt_assert(route->gw_src->isHost() || route->gw_src->isRouter(),
- "When defining an ASroute, gw_src must be an host or a router but '%s' is not.", srcName);
+ "When defining a NetzoneRoute, gw_src must be an host or a router but '%s' is not.", srcName);
xbt_assert(route->gw_dst->isHost() || route->gw_dst->isRouter(),
- "When defining an ASroute, gw_dst must be an host or a router but '%s' is not.", dstName);
+ "When defining a NetzoneRoute, gw_dst must be an host or a router but '%s' is not.", dstName);
- xbt_assert(route->gw_src != route->gw_dst, "Cannot define an ASroute from '%s' to itself", route->gw_src->cname());
+ xbt_assert(route->gw_src != route->gw_dst, "Cannot define an NetzoneRoute from '%s' to itself", route->gw_src->cname());
xbt_assert(src, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->cname(),
dstName, route->gw_dst->cname(), srcName);
