X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/595e59c568ff5f8510de201bfd800951cdc2adcb..a3d08dd00246eb26ced68c5b0e046096706bbe23:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index f987ae3820..2d978c90bf 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -7,7 +7,7 @@ #include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" -#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic"); @@ -44,22 +44,22 @@ namespace kernel { namespace routing { void DijkstraZone::seal() { - xbt_node_t node = nullptr; - unsigned int cursor2; unsigned int cursor; + xbt_node_t node = nullptr; /* Create the topology graph */ - if (!routeGraph_) + if (not routeGraph_) routeGraph_ = xbt_graph_new_graph(1, nullptr); - if (!graphNodeMap_) + if (not graphNodeMap_) graphNodeMap_ = xbt_dict_new_homogeneous(&graph_node_map_elem_free); /* Add the loopback if needed */ if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) { xbt_dynar_foreach (xbt_graph_get_nodes(routeGraph_), cursor, node) { - xbt_edge_t edge = nullptr; bool found = false; + xbt_edge_t edge = nullptr; + unsigned int cursor2; xbt_dynar_foreach (xbt_graph_node_get_outedges(node), cursor2, edge) { if (xbt_graph_edge_get_target(edge) == node) { found = true; @@ -67,7 +67,7 @@ void DijkstraZone::seal() } } - if (!found) { + if (not found) { sg_platf_route_cbarg_t e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1); e_route->link_list = new std::vector(); e_route->link_list->push_back(surf_network_model->loopback_); @@ -167,7 +167,7 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb sg_platf_route_cbarg_t e_route = (sg_platf_route_cbarg_t)xbt_graph_edge_get_data(edge); - for (auto link : *e_route->link_list) { + for (auto const& link : *e_route->link_list) { route->link_list->insert(route->link_list->begin(), link); if (lat) *lat += static_cast(link)->latency(); @@ -238,10 +238,7 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb /* compose route path with links */ NetPoint* gw_src = nullptr; NetPoint* gw_dst; - NetPoint* prev_gw_src; NetPoint* first_gw = nullptr; - NetPoint* gw_dst_net_elm = nullptr; - NetPoint* prev_gw_src_net_elm = nullptr; for (int v = dst_node_id; v != src_node_id; v = pred_arr[v]) { xbt_node_t node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t); @@ -251,9 +248,9 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb if (edge == nullptr) THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name().c_str(), dst->name().c_str()); - prev_gw_src = gw_src; - sg_platf_route_cbarg_t e_route = (sg_platf_route_cbarg_t)xbt_graph_edge_get_data(edge); + + NetPoint* prev_gw_src = gw_src; gw_src = e_route->gw_src; gw_dst = e_route->gw_dst; @@ -264,9 +261,11 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb strcmp(gw_dst->name().c_str(), prev_gw_src->name().c_str())) { std::vector e_route_as_to_as; + NetPoint* gw_dst_net_elm = nullptr; + NetPoint* prev_gw_src_net_elm = nullptr; getGlobalRoute(gw_dst_net_elm, prev_gw_src_net_elm, &e_route_as_to_as, nullptr); auto pos = route->link_list->begin(); - for (auto link : e_route_as_to_as) { + for (auto const& link : e_route_as_to_as) { route->link_list->insert(pos, link); if (lat) *lat += link->latency(); @@ -274,7 +273,7 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb } } - for (auto link : *e_route->link_list) { + for (auto const& link : *e_route->link_list) { route->link_list->insert(route->link_list->begin(), link); if (lat) *lat += static_cast(link)->latency(); @@ -295,7 +294,7 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb xbt_dict_set_ext(routeCache_, (char*)(&src_id), sizeof(int), (xbt_dictelm_t)elm, nullptr); } - if (!routeCache_) + if (not routeCache_) xbt_free(pred_arr); } @@ -308,7 +307,7 @@ DijkstraZone::~DijkstraZone() /* Creation routing model functions */ -DijkstraZone::DijkstraZone(NetZone* father, const char* name, bool cached) : RoutedZone(father, name) +DijkstraZone::DijkstraZone(NetZone* father, std::string name, bool cached) : RoutedZone(father, name) { if (cached) routeCache_ = xbt_dict_new_homogeneous(&route_cache_elem_free); @@ -324,9 +323,9 @@ void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) addRouteCheckParams(route); /* Create the topology graph */ - if (!routeGraph_) + if (not routeGraph_) routeGraph_ = xbt_graph_new_graph(1, nullptr); - if (!graphNodeMap_) + if (not graphNodeMap_) graphNodeMap_ = xbt_dict_new_homogeneous(&graph_node_map_elem_free); /* we don't check whether the route already exist, because the algorithm may find another path through some other @@ -338,20 +337,23 @@ void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) // Symmetrical YES if (route->symmetrical == true) { - if (!route->gw_dst && !route->gw_src) - XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dstName, srcName); - else - XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", dstName, route->gw_dst->name().c_str(), srcName, - route->gw_src->name().c_str()); xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_); xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src->id(), xbt_node_t); xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst->id(), xbt_node_t); xbt_edge_t edge = xbt_graph_get_edge(routeGraph_, node_e_v, node_s_v); - if (edge) - THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, route->gw_dst->name().c_str(), srcName, + if (not route->gw_dst || not route->gw_src){ + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dstName, srcName); + if (edge) + THROWF(arg_error, 0, "Route from %s to %s already exists", dstName, srcName); + } else { + XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", dstName, route->gw_dst->name().c_str(), srcName, + route->gw_src->name().c_str()); + if (edge) + THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, route->gw_dst->name().c_str(), srcName, route->gw_src->name().c_str()); + } if (route->gw_dst && route->gw_src) { NetPoint* gw_tmp = route->gw_src;