X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f9587e71330e7471ef675d2652cee260a0e3a96..96f28ae42d647404237a100eb505dd3564fba339:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index 08fd4430fa..cf1dc01577 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,27 +7,12 @@ #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"); /* Free functions */ -static void route_cache_elem_free(void* e) -{ - route_cache_element_t elm = (route_cache_element_t)e; - if (elm) { - xbt_free(elm->pred_arr); - xbt_free(elm); - } -} - -static void graph_node_map_elem_free(void* e) -{ - graph_node_map_element_t elm = (graph_node_map_element_t)e; - xbt_free(elm); -} - static void graph_edge_data_free(void* e) // FIXME: useless code duplication { sg_platf_route_cbarg_t e_route = (sg_platf_route_cbarg_t)e; @@ -44,21 +29,20 @@ namespace kernel { namespace routing { void DijkstraZone::seal() { + unsigned int cursor; xbt_node_t node = nullptr; - unsigned int cursor2, cursor; /* Create the topology graph */ - if (!routeGraph_) + if (not routeGraph_) routeGraph_ = xbt_graph_new_graph(1, nullptr); - if (!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; @@ -66,9 +50,9 @@ 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 = new std::vector(); e_route->link_list->push_back(surf_network_model->loopback_); xbt_graph_new_edge(routeGraph_, node, node, e_route); } @@ -86,25 +70,22 @@ void DijkstraZone::seal() xbt_node_t DijkstraZone::routeGraphNewNode(int id, int graph_id) { - xbt_node_t node = nullptr; - graph_node_data_t data = nullptr; - graph_node_map_element_t elm = nullptr; - - data = xbt_new0(struct graph_node_data, 1); + graph_node_data_t data = xbt_new0(s_graph_node_data_t, 1); data->id = id; data->graph_id = graph_id; - node = xbt_graph_new_node(routeGraph_, data); - elm = xbt_new0(struct graph_node_map_element, 1); + xbt_node_t node = xbt_graph_new_node(routeGraph_, data); + graph_node_map_element_t elm = xbt_new0(s_graph_node_map_element_t, 1); elm->node = node; - xbt_dict_set_ext(graphNodeMap_, (char*)(&id), sizeof(int), (xbt_dictelm_t)elm, nullptr); + graphNodeMap_.insert({id, elm}); return node; } graph_node_map_element_t DijkstraZone::nodeMapSearch(int id) { - return (graph_node_map_element_t)xbt_dict_get_or_null_ext(graphNodeMap_, (char*)(&id), sizeof(int)); + auto ret = graphNodeMap_.find(id); + return ret == graphNodeMap_.end() ? nullptr : ret->second; } /* Parsing */ @@ -170,16 +151,17 @@ 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(); + *lat += static_cast(link)->latency(); } } route_cache_element_t elm = nullptr; - if (routeCache_) { /* cache mode */ - elm = (route_cache_element_t)xbt_dict_get_or_null_ext(routeCache_, (char*)(&src_id), sizeof(int)); + if (not routeCache_.empty()) { /* cache mode */ + auto it = routeCache_.find(src_id); + elm = (it == routeCache_.end()) ? nullptr : it->second; } if (elm) { /* cached mode and cache hit */ @@ -209,7 +191,7 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb /* apply dijkstra using the indexes from the graph's node array */ while (xbt_heap_size(pqueue) > 0) { - int* v_id = (int*)xbt_heap_pop(pqueue); + int* v_id = static_cast(xbt_heap_pop(pqueue)); xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t); xbt_edge_t edge = nullptr; unsigned int cursor; @@ -239,8 +221,9 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb } /* compose route path with links */ - NetPoint *gw_src = nullptr, *gw_dst, *prev_gw_src, *first_gw = nullptr; - NetPoint *gw_dst_net_elm = nullptr, *prev_gw_src_net_elm = nullptr; + NetPoint* gw_src = nullptr; + NetPoint* gw_dst; + NetPoint* first_gw = 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); @@ -250,9 +233,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; @@ -261,11 +244,13 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb if (hierarchy_ == RoutingMode::recursive && v != dst_node_id && strcmp(gw_dst->name().c_str(), prev_gw_src->name().c_str())) { - std::vector* e_route_as_to_as = new std::vector(); + std::vector e_route_as_to_as; - getGlobalRoute(gw_dst_net_elm, prev_gw_src_net_elm, e_route_as_to_as, nullptr); + 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(); @@ -273,10 +258,10 @@ 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(); + *lat += static_cast(link)->latency(); } size++; } @@ -286,31 +271,27 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb route->gw_dst = first_gw; } - if (routeCache_ && elm == nullptr) { + if (not routeCache_.empty() && elm == nullptr) { /* add to predecessor list of the current src-host to cache */ - elm = xbt_new0(struct route_cache_element, 1); + elm = xbt_new0(s_route_cache_element_t, 1); elm->pred_arr = pred_arr; elm->size = size; - xbt_dict_set_ext(routeCache_, (char*)(&src_id), sizeof(int), (xbt_dictelm_t)elm, nullptr); + routeCache_.insert({src_id, elm}); } - if (!routeCache_) + if (routeCache_.empty()) xbt_free(pred_arr); } DijkstraZone::~DijkstraZone() { xbt_graph_free_graph(routeGraph_, &xbt_free_f, &graph_edge_data_free, &xbt_free_f); - xbt_dict_free(&graphNodeMap_); - xbt_dict_free(&routeCache_); } /* 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); } void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) @@ -323,10 +304,8 @@ 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_) - 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 * nodes */ @@ -337,20 +316,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;