X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/82230d737404aa70c3c2b5824d97109f1f129d58..6bc213d56af4db3812f14dcb4e0caae96dec46fb:/src/kernel/routing/RoutedZone.cpp diff --git a/src/kernel/routing/RoutedZone.cpp b/src/kernel/routing/RoutedZone.cpp index dab2e4ed09..6905ed9720 100644 --- a/src/kernel/routing/RoutedZone.cpp +++ b/src/kernel/routing/RoutedZone.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2019. 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. */ @@ -7,10 +7,10 @@ #include "xbt/graph.h" #include "xbt/log.h" #include "xbt/sysdep.h" - -#include "src/kernel/routing/NetPoint.hpp" -#include "src/kernel/routing/RoutedZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/RoutedZone.hpp" #include "src/surf/network_interface.hpp" +#include "src/surf/xml/platf_private.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_routing_generic, surf_route, "Generic implementation of the surf routing"); @@ -59,25 +59,26 @@ namespace simgrid { namespace kernel { namespace routing { -RoutedZone::RoutedZone(NetZone* father, std::string name) : NetZoneImpl(father, name) +RoutedZone::RoutedZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel) + : NetZoneImpl(father, name, netmodel) { } -void RoutedZone::getGraph(xbt_graph_t graph, std::map* nodes, - std::map* edges) +void RoutedZone::get_graph(xbt_graph_t graph, std::map* nodes, + std::map* edges) { - std::vector vertices = getVertices(); + std::vector vertices = get_vertices(); for (auto const& my_src : vertices) { for (auto const& my_dst : vertices) { if (my_src == my_dst) continue; - sg_platf_route_cbarg_t route = new s_sg_platf_route_cbarg_t; + RouteCreationArgs* route = new RouteCreationArgs(); - getLocalRoute(my_src, my_dst, route, nullptr); + get_local_route(my_src, my_dst, route, nullptr); - XBT_DEBUG("get_route_and_latency %s -> %s", my_src->getCname(), my_dst->getCname()); + XBT_DEBUG("get_route_and_latency %s -> %s", my_src->get_cname(), my_dst->get_cname()); xbt_node_t current; xbt_node_t previous; @@ -85,15 +86,15 @@ void RoutedZone::getGraph(xbt_graph_t graph, std::map* const char *current_name; if (route->gw_src) { - previous = new_xbt_graph_node(graph, route->gw_src->getCname(), nodes); - previous_name = route->gw_src->getCname(); + previous = new_xbt_graph_node(graph, route->gw_src->get_cname(), nodes); + previous_name = route->gw_src->get_cname(); } else { - previous = new_xbt_graph_node(graph, my_src->getCname(), nodes); - previous_name = my_src->getCname(); + previous = new_xbt_graph_node(graph, my_src->get_cname(), nodes); + previous_name = my_src->get_cname(); } for (auto const& link : route->link_list) { - const char* link_name = link->getCname(); + const char* link_name = link->get_cname(); current = new_xbt_graph_node(graph, link_name, nodes); current_name = link_name; new_xbt_graph_edge(graph, previous, current, edges); @@ -103,11 +104,11 @@ void RoutedZone::getGraph(xbt_graph_t graph, std::map* } if (route->gw_dst) { - current = new_xbt_graph_node(graph, route->gw_dst->getCname(), nodes); - current_name = route->gw_dst->getCname(); + current = new_xbt_graph_node(graph, route->gw_dst->get_cname(), nodes); + current_name = route->gw_dst->get_cname(); } else { - current = new_xbt_graph_node(graph, my_dst->getCname(), nodes); - current_name = my_dst->getCname(); + current = new_xbt_graph_node(graph, my_dst->get_cname(), nodes); + current_name = my_dst->get_cname(); } new_xbt_graph_edge(graph, previous, current, edges); XBT_DEBUG(" %s -> %s", previous_name, current_name); @@ -120,24 +121,23 @@ void RoutedZone::getGraph(xbt_graph_t graph, std::map* /* ************************************************************************** */ /* ************************* 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, - bool change_order) +RouteCreationArgs* RoutedZone::new_extended_route(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 = new s_sg_platf_route_cbarg_t; + RouteCreationArgs* result = new RouteCreationArgs(); 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 const& link : routearg->link_list) { + for (auto const& link : link_list) { if (change_order) result->link_list.push_back(link); else @@ -148,63 +148,61 @@ sg_platf_route_cbarg_t RoutedZone::newExtendedRoute(RoutingMode hierarchy, sg_pl return result; } -void RoutedZone::getRouteCheckParams(NetPoint* src, NetPoint* dst) +void RoutedZone::get_route_check_params(NetPoint* src, NetPoint* dst) { - 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()); + xbt_assert(src, "Cannot find a route from nullptr to %s", dst->get_cname()); + xbt_assert(dst, "Cannot find a route from %s to nullptr", src->get_cname()); - NetZone* src_as = src->netzone(); - NetZone* dst_as = dst->netzone(); + NetZoneImpl* src_as = src->get_englobing_zone(); + NetZoneImpl* dst_as = dst->get_englobing_zone(); 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->getCname(), src_as->getCname(), dst->getCname(), dst_as->getCname()); + src->get_cname(), src_as->get_cname(), dst->get_cname(), dst_as->get_cname()); - 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->getCname(), dst->getCname(), src_as->getCname(), dst_as->getCname(), 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->get_cname(), dst->get_cname(), src_as->get_cname(), dst_as->get_cname(), get_cname()); } -void RoutedZone::addRouteCheckParams(sg_platf_route_cbarg_t route) +void RoutedZone::add_route_check_params(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, + std::vector& link_list, bool symmetrical) { - NetPoint* src = route->src; - NetPoint* dst = route->dst; - const char* srcName = src->getCname(); - const char* dstName = dst->getCname(); + const char* srcName = src->get_cname(); + const char* dstName = dst->get_cname(); - if (not route->gw_dst || not 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(not route->link_list.empty(), "Empty route (between %s and %s) forbidden.", srcName, dstName); - xbt_assert(not src->isNetZone(), + xbt_assert(not link_list.empty(), "Empty route (between %s and %s) forbidden.", srcName, dstName); + xbt_assert(not src->is_netzone(), "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(), + xbt_assert(not dst->is_netzone(), "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->getCname(), dstName, - route->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(), - "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 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->getCname()); - - xbt_assert(src, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->getCname(), - dstName, route->gw_dst->getCname(), srcName); - xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, route->gw_src->getCname(), - dstName, route->gw_dst->getCname(), dstName); - xbt_assert(not route->link_list.empty(), "Empty route (between %s@%s and %s@%s) forbidden.", srcName, - route->gw_src->getCname(), dstName, route->gw_dst->getCname()); + XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", srcName, gw_src->get_cname(), dstName, gw_dst->get_cname()); + xbt_assert(src->is_netzone(), "When defining a NetzoneRoute, src must be a netzone but '%s' is not", srcName); + xbt_assert(dst->is_netzone(), "When defining a NetzoneRoute, dst must be a netzone but '%s' is not", dstName); + + xbt_assert(gw_src->is_host() || gw_src->is_router(), + "When defining a NetzoneRoute, gw_src must be a host or a router but '%s' is not.", srcName); + xbt_assert(gw_dst->is_host() || gw_dst->is_router(), + "When defining a NetzoneRoute, gw_dst must be a host or a router but '%s' is not.", dstName); + + xbt_assert(gw_src != gw_dst, "Cannot define an NetzoneRoute from '%s' to itself", gw_src->get_cname()); + + xbt_assert(src, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, gw_src->get_cname(), dstName, + gw_dst->get_cname(), srcName); + xbt_assert(dst, "Cannot add a route from %s@%s to %s@%s: %s does not exist.", srcName, gw_src->get_cname(), dstName, + gw_dst->get_cname(), dstName); + xbt_assert(not link_list.empty(), "Empty route (between %s@%s and %s@%s) forbidden.", srcName, gw_src->get_cname(), + dstName, gw_dst->get_cname()); } - onRouteCreation(route->symmetrical, route->src, route->dst, route->gw_src, route->gw_dst, route->link_list); + simgrid::s4u::NetZone::on_route_creation(symmetrical, src, dst, gw_src, gw_dst, link_list); } } }