X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a79a8e1cab86ccc687cfbc97b01b735acb996f16..c4792b986c90263d97a3db8e68279f5512b65fa1:/src/kernel/routing/RoutedZone.cpp diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp index a20c83f73a..5c237168ca 100644 --- a/src/kernel/routing/RoutedZone.cpp +++ b/src/kernel/routing/RoutedZone.cpp @@ -1,15 +1,14 @@ -/* Copyright (c) 2009-2016. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ /* 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 "xbt/dynar.h" #include "xbt/graph.h" #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" @@ -23,19 +22,18 @@ void routing_route_free(sg_platf_route_cbarg_t route) } } -/* ************************************************************************** */ -/* *********************** GENERIC BUSINESS METHODS ************************* */ +/* ***************************************************************** */ +/* *********************** GENERIC METHODS ************************* */ static const char* instr_node_name(xbt_node_t node) { void* data = xbt_graph_node_get_data(node); - char* str = (char*)data; - return str; + 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 ret = (xbt_node_t)xbt_dict_get_or_null(nodes, name); + xbt_node_t ret = static_cast(xbt_dict_get_or_null(nodes, name)); if (ret) return ret; @@ -48,21 +46,18 @@ xbt_edge_t new_xbt_graph_edge(xbt_graph_t graph, xbt_node_t s, xbt_node_t d, xbt { 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)); + 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_dict_get_or_null(edges, name.c_str())); if (ret == nullptr) { - 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_dict_get_or_null(edges, name.c_str())); } 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); } - free(name); return ret; } @@ -70,26 +65,30 @@ 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) { - 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(); + route->link_list = new std::vector(); 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); @@ -99,8 +98,8 @@ void RoutedZone::getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges) previous_name = my_src->cname(); } - for (auto link : *route->link_list) { - const char* link_name = link->getName(); + for (auto const& 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); @@ -129,15 +128,15 @@ 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, - 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(); + result->link_list = new std::vector(); 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"); @@ -146,65 +145,68 @@ sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl result->gw_dst = routearg->gw_dst; } - for (auto link : *routearg->link_list) { + for (auto const& link : *routearg->link_list) { if (change_order) result->link_list->push_back(link); 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.", - 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()); - 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()); + src->cname(), dst->cname(), src_as->getCname(), dst_as->getCname(), getCname()); } 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(); - if (!route->gw_dst && !route->gw_src) { + if (not route->gw_dst || not route->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->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); } 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); 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()); }