/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/dict.h"
/* This program is free software; you can redistribute it and/or modify it
* under the terms of the license (GNU LGPL) which comes with this package. */
#include "xbt/dict.h"
#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing");
#include "src/surf/network_interface.hpp"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing");
-/* ************************************************************************** */
-/* *********************** GENERIC BUSINESS METHODS ************************* */
+/* ***************************************************************** */
+/* *********************** GENERIC METHODS ************************* */
xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges)
{
xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt_dict_t edges)
{
- const char *sn = instr_node_name(s);
- const char *dn = instr_node_name(d);
- int len = strlen(sn) + strlen(dn) + 1;
- char *name = (char *) xbt_malloc(len * sizeof(char));
+ const char* sn = instr_node_name(s);
+ const char* dn = instr_node_name(d);
+ std::string name = std::string(sn) + dn;
- snprintf(name, len, "%s%s", sn, dn);
- xbt_edge_t ret = (xbt_edge_t) xbt_dict_get_or_null(edges, name);
+ xbt_edge_t ret = static_cast<xbt_edge_t>(xbt_dict_get_or_null(edges, name.c_str()));
- snprintf(name, len, "%s%s", dn, sn);
- ret = (xbt_edge_t) xbt_dict_get_or_null(edges, name);
+ name = std::string(dn) + sn;
+ ret = static_cast<xbt_edge_t>(xbt_dict_get_or_null(edges, name.c_str()));
}
if (ret == nullptr) {
ret = xbt_graph_new_edge(graph, s, d, nullptr);
}
if (ret == nullptr) {
ret = xbt_graph_new_edge(graph, s, d, nullptr);
- xbt_dict_set(edges, name, ret, nullptr);
+ xbt_dict_set(edges, name.c_str(), ret, nullptr);
- for (auto my_src: vertices_){
- for (auto my_dst: vertices_){
+ std::vector<kernel::routing::NetPoint*> vertices = getVertices();
+
+ for (auto my_src : vertices) {
+ for (auto my_dst : vertices) {
getLocalRoute(my_src, my_dst, route, nullptr);
XBT_DEBUG("get_route_and_latency %s -> %s", my_src->cname(), my_dst->cname());
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;
- for (auto link: *route->link_list) {
- const char *link_name = link->getName();
- current = new_xbt_graph_node(graph, link_name, nodes);
- current_name = link_name;
+ for (auto link : *route->link_list) {
+ 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);
new_xbt_graph_edge(graph, previous, current, edges);
current_name = my_dst->cname();
}
new_xbt_graph_edge(graph, previous, current, edges);
current_name = my_dst->cname();
}
new_xbt_graph_edge(graph, previous, current, edges);
/* ************************************************************************** */
/* ************************* GENERIC AUX FUNCTIONS ************************** */
/* change a route containing link names into a route containing link entities */
/* ************************************************************************** */
/* ************************* GENERIC AUX FUNCTIONS ************************** */
/* change a route containing link names into a route containing link entities */
-sg_platf_route_cbarg_t AsRoutedGraph::newExtendedRoute(RoutingMode hierarchy, sg_platf_route_cbarg_t routearg, int change_order)
+sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_platf_route_cbarg_t routearg,
+ bool change_order)
- result = xbt_new0(s_sg_platf_route_cbarg_t, 1);
- result->link_list = new std::vector<Link*>();
+ result = xbt_new0(s_sg_platf_route_cbarg_t, 1);
+ result->link_list = new std::vector<surf::LinkImpl*>();
if (hierarchy == RoutingMode::recursive) {
xbt_assert(routearg->gw_src && routearg->gw_dst, "nullptr is obviously a deficient gateway");
if (hierarchy == RoutingMode::recursive) {
xbt_assert(routearg->gw_src && routearg->gw_dst, "nullptr is obviously a deficient gateway");
{
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());
{
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());
- "Internal error: %s@%s and %s@%s are not in the same AS as expected. Please report that bug.",
- src->cname(), src_as->name(), dst->cname(), dst_as->name());
+ "Internal error: %s@%s and %s@%s are not in the same netzone as expected. Please report that bug.",
+ src->cname(), src_as->getCname(), dst->cname(), dst_as->getCname());
- src->cname(), dst->cname(), src_as->name(), dst_as->name(), name());
+ src->cname(), dst->cname(), src_as->getCname(), dst_as->getCname(), getCname());
-void AsRoutedGraph::addRouteCheckParams(sg_platf_route_cbarg_t route) {
- NetCard *src = route->src;
- NetCard *dst = route->dst;
+void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route)
+{
+ NetPoint* src = route->src;
+ NetPoint* dst = route->dst;
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", srcName, dstName);
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_DEBUG("Load Route from \"%s\" to \"%s\"", srcName, dstName);
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(not route->link_list->empty(), "Empty route (between %s and %s) forbidden.", srcName, dstName);
+ xbt_assert(not src->isNetZone(),
+ "When defining a route, src cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?",
+ srcName);
+ xbt_assert(not dst->isNetZone(),
+ "When defining a route, dst cannot be a netzone such as '%s'. Did you meant to have an NetzoneRoute?",
+ dstName);
- 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 != 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);
xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->cname(),
dstName, route->gw_dst->cname(), dstName);
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);
xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->cname(),
dstName, route->gw_dst->cname(), dstName);
- xbt_assert(!route->link_list->empty(), "Empty route (between %s@%s and %s@%s) forbidden.", srcName,
+ xbt_assert(not route->link_list->empty(), "Empty route (between %s@%s and %s@%s) forbidden.", srcName,
route->gw_src->cname(), dstName, route->gw_dst->cname());
}
onRouteCreation(route->symmetrical, route->src, route->dst, route->gw_src, route->gw_dst, route->link_list);
}
route->gw_src->cname(), dstName, route->gw_dst->cname());
}
onRouteCreation(route->symmetrical, route->src, route->dst, route->gw_src, route->gw_dst, route->link_list);
}