X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ae701792ae00d4b822b890780619878e0a624980..28f758f3ac685281f048a22a99405f48163be169:/src/kernel/routing/RoutedZone.cpp diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp index d12ad8cbfc..6d41cbc786 100644 --- a/src/kernel/routing/RoutedZone.cpp +++ b/src/kernel/routing/RoutedZone.cpp @@ -4,7 +4,6 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "xbt/dict.h" -#include "xbt/dynar.h" #include "xbt/graph.h" #include "xbt/log.h" #include "xbt/sysdep.h" @@ -15,14 +14,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing"); -void routing_route_free(sg_platf_route_cbarg_t route) -{ - if (route) { - delete route->link_list; - xbt_free(route); - } -} - /* ***************************************************************** */ /* *********************** GENERIC METHODS ************************* */ @@ -32,57 +23,61 @@ static const char* instr_node_name(xbt_node_t node) return static_cast(data); } -xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name, xbt_dict_t nodes) +xbt_node_t new_xbt_graph_node(xbt_graph_t graph, const char* name, std::map* nodes) { - xbt_node_t ret = static_cast(xbt_dict_get_or_null(nodes, name)); - if (ret) - return ret; - ret = xbt_graph_new_node(graph, xbt_strdup(name)); - xbt_dict_set(nodes, name, ret, nullptr); - return ret; + auto elm = nodes->find(name); + if (elm == nodes->end()) { + xbt_node_t ret = xbt_graph_new_node(graph, xbt_strdup(name)); + nodes->insert({name, ret}); + return ret; + } else + return elm->second; } -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, std::map* edges) { const char* sn = instr_node_name(s); const char* dn = instr_node_name(d); std::string name = std::string(sn) + dn; - xbt_edge_t ret = static_cast(xbt_dict_get_or_null(edges, name.c_str())); - if (ret == nullptr) { + auto elm = edges->find(name); + if (elm == edges->end()) { name = std::string(dn) + sn; - ret = static_cast(xbt_dict_get_or_null(edges, name.c_str())); + elm = edges->find(name); } - if (ret == nullptr) { - ret = xbt_graph_new_edge(graph, s, d, nullptr); - xbt_dict_set(edges, name.c_str(), ret, nullptr); - } - return ret; + if (elm == edges->end()) { + xbt_edge_t ret = xbt_graph_new_edge(graph, s, d, nullptr); + edges->insert({name, ret}); + return ret; + } else + return elm->second; } namespace simgrid { namespace kernel { namespace routing { -RoutedZone::RoutedZone(NetZone* father, const char* name) : NetZoneImpl(father, name) +RoutedZone::RoutedZone(NetZone* father, std::string name) : NetZoneImpl(father, name) { } -void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) +void RoutedZone::getGraph(xbt_graph_t graph, std::map* nodes, + std::map* edges) { - for (auto my_src : vertices_) { - for (auto my_dst : vertices_) { + std::vector vertices = getVertices(); + + for (auto const& my_src : vertices) { + for (auto const& my_dst : vertices) { if (my_src == my_dst) continue; - sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t, 1); - route->link_list = new std::vector(); + sg_platf_route_cbarg_t route = new s_sg_platf_route_cbarg_t; getLocalRoute(my_src, my_dst, route, nullptr); - XBT_DEBUG("get_route_and_latency %s -> %s", my_src->cname(), my_dst->cname()); + XBT_DEBUG("get_route_and_latency %s -> %s", my_src->getCname(), my_dst->getCname()); xbt_node_t current; xbt_node_t previous; @@ -90,15 +85,15 @@ void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) const char *current_name; if (route->gw_src) { - previous = new_xbt_graph_node(graph, route->gw_src->cname(), nodes); - previous_name = route->gw_src->cname(); + previous = new_xbt_graph_node(graph, route->gw_src->getCname(), nodes); + previous_name = route->gw_src->getCname(); } else { - previous = new_xbt_graph_node(graph, my_src->cname(), nodes); - previous_name = my_src->cname(); + previous = new_xbt_graph_node(graph, my_src->getCname(), nodes); + previous_name = my_src->getCname(); } - for (auto link : *route->link_list) { - const char* link_name = link->cname(); + for (auto const& link : route->link_list) { + const char* link_name = link->getCname(); current = new_xbt_graph_node(graph, link_name, nodes); current_name = link_name; new_xbt_graph_edge(graph, previous, current, edges); @@ -108,17 +103,16 @@ void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) } if (route->gw_dst) { - current = new_xbt_graph_node(graph, route->gw_dst->cname(), nodes); - current_name = route->gw_dst->cname(); + current = new_xbt_graph_node(graph, route->gw_dst->getCname(), nodes); + current_name = route->gw_dst->getCname(); } else { - current = new_xbt_graph_node(graph, my_dst->cname(), nodes); - current_name = my_dst->cname(); + current = new_xbt_graph_node(graph, my_dst->getCname(), nodes); + current_name = my_dst->getCname(); } new_xbt_graph_edge(graph, previous, current, edges); XBT_DEBUG(" %s -> %s", previous_name, current_name); - delete route->link_list; - xbt_free(route); + delete route; } } } @@ -126,88 +120,89 @@ void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t 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, +sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, NetPoint* src, NetPoint* dst, + NetPoint* gw_src, NetPoint* gw_dst, + std::vector& link_list, bool symmetrical, 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(); + sg_platf_route_cbarg_t result = new s_sg_platf_route_cbarg_t; xbt_assert(hierarchy == RoutingMode::base || hierarchy == RoutingMode::recursive, "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"); + xbt_assert(gw_src && gw_dst, "nullptr is obviously a deficient gateway"); - result->gw_src = routearg->gw_src; - result->gw_dst = routearg->gw_dst; + result->gw_src = gw_src; + result->gw_dst = gw_dst; } - for (auto link : *routearg->link_list) { + for (auto const& link : link_list) { if (change_order) - result->link_list->push_back(link); + result->link_list.push_back(link); else - result->link_list->insert(result->link_list->begin(), link); + result->link_list.insert(result->link_list.begin(), link); } - result->link_list->shrink_to_fit(); + result->link_list.shrink_to_fit(); return result; } 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()); + xbt_assert(src, "Cannot find a route from nullptr to %s", dst->getCname()); + xbt_assert(dst, "Cannot find a route from %s to nullptr", src->getCname()); 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 netzone as expected. Please report that bug.", - src->cname(), src_as->name(), dst->cname(), dst_as->name()); + src->getCname(), src_as->getCname(), dst->getCname(), dst_as->getCname()); 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()); + src->getCname(), dst->getCname(), src_as->getCname(), dst_as->getCname(), getCname()); } -void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route) +void RoutedZone::addRouteCheckParams(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, + kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, + std::vector& link_list, bool symmetrical) { - NetPoint* src = route->src; - NetPoint* dst = route->dst; - const char* srcName = src->cname(); - const char* dstName = dst->cname(); + const char* srcName = src->getCname(); + const char* dstName = dst->getCname(); - if (!route->gw_dst && !route->gw_src) { + if (not gw_dst || not gw_src) { 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->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); + xbt_assert(not 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); } else { - XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", srcName, route->gw_src->cname(), dstName, route->gw_dst->cname()); + XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", srcName, gw_src->getCname(), dstName, gw_dst->getCname()); 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(), + xbt_assert(gw_src->isHost() || gw_src->isRouter(), "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(), + xbt_assert(gw_dst->isHost() || gw_dst->isRouter(), "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 NetzoneRoute from '%s' to itself", route->gw_src->cname()); + xbt_assert(gw_src != gw_dst, "Cannot define an NetzoneRoute from '%s' to itself", gw_src->getCname()); - 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, - route->gw_src->cname(), dstName, route->gw_dst->cname()); + xbt_assert(src, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, gw_src->getCname(), dstName, + gw_dst->getCname(), srcName); + xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, gw_src->getCname(), dstName, + gw_dst->getCname(), dstName); + xbt_assert(not link_list.empty(), "Empty route (between %s@%s and %s@%s) forbidden.", srcName, gw_src->getCname(), + dstName, gw_dst->getCname()); } - onRouteCreation(route->symmetrical, route->src, route->dst, route->gw_src, route->gw_dst, route->link_list); + onRouteCreation(symmetrical, src, dst, gw_src, gw_dst, link_list); } } }