X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d656f9465e7b1c36319f86eeafdcec58fe9551a4..c7c6662f2627dddac82f15cb8d4f1b42ac23e2b9:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index 0c5123d599..4aa05bb001 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -1,13 +1,17 @@ -/* Copyright (c) 2009-2017. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2018. 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 "src/kernel/routing/DijkstraZone.hpp" -#include "src/kernel/routing/NetPoint.hpp" +#include "simgrid/kernel/routing/DijkstraZone.hpp" +#include "simgrid/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" +#include "src/surf/xml/platf_private.hpp" +#include "surf/surf.hpp" #include +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic"); @@ -15,17 +19,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf static void graph_node_data_free(void* n) { - graph_node_data_t data = static_cast(n); - delete data; + delete static_cast(n); } -static void graph_edge_data_free(void* e) // FIXME: useless code duplication +static void graph_edge_data_free(void* e) { - sg_platf_route_cbarg_t e_route = static_cast(e); - if (e_route) { - delete e_route->link_list; - delete e_route; - } + delete static_cast(e); } /* Utility functions */ @@ -39,12 +38,12 @@ void DijkstraZone::seal() xbt_node_t node = nullptr; /* Create the topology graph */ - if (not routeGraph_) - routeGraph_ = xbt_graph_new_graph(1, nullptr); + if (not route_graph_) + route_graph_ = xbt_graph_new_graph(1, nullptr); /* Add the loopback if needed */ if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) { - xbt_dynar_foreach (xbt_graph_get_nodes(routeGraph_), cursor, node) { + xbt_dynar_foreach (xbt_graph_get_nodes(route_graph_), cursor, node) { bool found = false; xbt_edge_t edge = nullptr; @@ -57,16 +56,15 @@ void DijkstraZone::seal() } if (not found) { - sg_platf_route_cbarg_t e_route = new s_sg_platf_route_cbarg_t; - 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); + RouteCreationArgs* e_route = new simgrid::kernel::routing::RouteCreationArgs(); + e_route->link_list.push_back(surf_network_model->loopback_); + xbt_graph_new_edge(route_graph_, node, node, e_route); } } } /* initialize graph indexes in nodes after graph has been built */ - xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_); + xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_); xbt_dynar_foreach (nodes, cursor, node) { graph_node_data_t data = static_cast(xbt_graph_node_get_data(node)); @@ -80,21 +78,21 @@ xbt_node_t DijkstraZone::routeGraphNewNode(int id, int graph_id) data->id = id; data->graph_id = graph_id; - xbt_node_t node = xbt_graph_new_node(routeGraph_, data); - graphNodeMap_.emplace(id, node); + xbt_node_t node = xbt_graph_new_node(route_graph_, data); + graph_node_map_.emplace(id, node); return node; } xbt_node_t DijkstraZone::nodeMapSearch(int id) { - auto ret = graphNodeMap_.find(id); - return ret == graphNodeMap_.end() ? nullptr : ret->second; + auto ret = graph_node_map_.find(id); + return ret == graph_node_map_.end() ? nullptr : ret->second; } /* Parsing */ -void DijkstraZone::newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_route) +void DijkstraZone::newRoute(int src_id, int dst_id, simgrid::kernel::routing::RouteCreationArgs* e_route) { XBT_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id); xbt_node_t src = nullptr; @@ -123,16 +121,16 @@ void DijkstraZone::newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_rou } /* add link as edge to graph */ - xbt_graph_new_edge(routeGraph_, src, dst, e_route); + xbt_graph_new_edge(route_graph_, src, dst, e_route); } -void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) +void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) { getRouteCheckParams(src, dst); int src_id = src->id(); int dst_id = dst->id(); - xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_); + xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_); /* Use the graph_node id mapping set to quickly find the nodes */ xbt_node_t src_elm = nodeMapSearch(src_id); @@ -146,28 +144,29 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_node_id, xbt_node_t); xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_node_id, xbt_node_t); - xbt_edge_t edge = xbt_graph_get_edge(routeGraph_, node_s_v, node_e_v); + xbt_edge_t edge = xbt_graph_get_edge(route_graph_, node_s_v, node_e_v); if (edge == nullptr) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname()); + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->get_cname(), dst->get_cname()); - sg_platf_route_cbarg_t e_route = static_cast(xbt_graph_edge_get_data(edge)); + RouteCreationArgs* e_route = static_cast(xbt_graph_edge_get_data(edge)); - for (auto const& link : *e_route->link_list) { - route->link_list->insert(route->link_list->begin(), link); + 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(); } } - auto elm = routeCache_.emplace(src_id, std::vector()); + auto elm = route_cache_.emplace(src_id, std::vector()); std::vector& pred_arr = elm.first->second; if (elm.second) { /* new element was inserted (not cached mode, or cache miss) */ int nr_nodes = xbt_dynar_length(nodes); std::vector cost_arr(nr_nodes); /* link cost from src to other hosts */ pred_arr.resize(nr_nodes); /* predecessors in path from src */ - xbt_heap_t pqueue = xbt_heap_new(nr_nodes, nullptr); + typedef std::pair Qelt; + std::priority_queue, std::greater> pqueue; /* initialize */ cost_arr[src_node_id] = 0.0; @@ -180,14 +179,14 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb pred_arr[i] = 0; /* initialize priority queue */ - int* nodeid = new int(i); - xbt_heap_push(pqueue, nodeid, cost_arr[i]); + pqueue.emplace(cost_arr[i], i); } /* apply dijkstra using the indexes from the graph's node array */ - while (xbt_heap_size(pqueue) > 0) { - int* v_id = static_cast(xbt_heap_pop(pqueue)); - xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t); + while (not pqueue.empty()) { + int v_id = pqueue.top().second; + pqueue.pop(); + xbt_node_t v_node = xbt_dynar_get_as(nodes, v_id, xbt_node_t); xbt_edge_t edge = nullptr; unsigned int cursor; @@ -195,21 +194,16 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb xbt_node_t u_node = xbt_graph_edge_get_target(edge); graph_node_data_t data = static_cast(xbt_graph_node_get_data(u_node)); int u_id = data->graph_id; - sg_platf_route_cbarg_t tmp_e_route = static_cast(xbt_graph_edge_get_data(edge)); - int cost_v_u = tmp_e_route->link_list->size(); /* count of links, old model assume 1 */ - - if (cost_v_u + cost_arr[*v_id] < cost_arr[u_id]) { - pred_arr[u_id] = *v_id; - cost_arr[u_id] = cost_v_u + cost_arr[*v_id]; - int* nodeid = new int(u_id); - xbt_heap_push(pqueue, nodeid, cost_arr[u_id]); + RouteCreationArgs* tmp_e_route = static_cast(xbt_graph_edge_get_data(edge)); + int cost_v_u = tmp_e_route->link_list.size(); /* count of links, old model assume 1 */ + + if (cost_v_u + cost_arr[v_id] < cost_arr[u_id]) { + pred_arr[u_id] = v_id; + cost_arr[u_id] = cost_v_u + cost_arr[v_id]; + pqueue.emplace(cost_arr[u_id], u_id); } } - - /* free item popped from pqueue */ - delete v_id; } - xbt_heap_free(pqueue); } /* compose route path with links */ @@ -220,12 +214,12 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb 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); xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t); - xbt_edge_t edge = xbt_graph_get_edge(routeGraph_, node_pred_v, node_v); + xbt_edge_t edge = xbt_graph_get_edge(route_graph_, node_pred_v, node_v); if (edge == nullptr) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname()); + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->get_cname(), dst->get_cname()); - sg_platf_route_cbarg_t e_route = static_cast(xbt_graph_edge_get_data(edge)); + RouteCreationArgs* e_route = static_cast(xbt_graph_edge_get_data(edge)); NetPoint* prev_gw_src = gw_src; gw_src = e_route->gw_src; @@ -234,25 +228,25 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb if (v == dst_node_id) first_gw = gw_dst; - if (hierarchy_ == RoutingMode::recursive && v != dst_node_id && gw_dst->getName() != prev_gw_src->getName()) { - std::vector e_route_as_to_as; + if (hierarchy_ == RoutingMode::recursive && v != dst_node_id && gw_dst->get_name() != prev_gw_src->get_name()) { + 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(); + get_global_route(gw_dst_net_elm, prev_gw_src_net_elm, e_route_as_to_as, nullptr); + auto pos = route->link_list.begin(); for (auto const& link : e_route_as_to_as) { - route->link_list->insert(pos, link); + route->link_list.insert(pos, link); if (lat) *lat += link->latency(); pos++; } } - for (auto const& link : *e_route->link_list) { - route->link_list->insert(route->link_list->begin(), link); + 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(); } } @@ -262,12 +256,12 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb } if (not cached_) - routeCache_.clear(); + route_cache_.clear(); } DijkstraZone::~DijkstraZone() { - xbt_graph_free_graph(routeGraph_, &graph_node_data_free, &graph_edge_data_free, nullptr); + xbt_graph_free_graph(route_graph_, &graph_node_data_free, &graph_edge_data_free, nullptr); } /* Creation routing model functions */ @@ -276,52 +270,51 @@ DijkstraZone::DijkstraZone(NetZone* father, std::string name, bool cached) : Rou { } -void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) +void DijkstraZone::add_route(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(); - addRouteCheckParams(route); + addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical); /* Create the topology graph */ - if (not routeGraph_) - routeGraph_ = xbt_graph_new_graph(1, nullptr); + if (not route_graph_) + route_graph_ = xbt_graph_new_graph(1, nullptr); /* we don't check whether the route already exist, because the algorithm may find another path through some other * nodes */ /* Add the route to the base */ - sg_platf_route_cbarg_t e_route = newExtendedRoute(hierarchy_, route, 1); + RouteCreationArgs* e_route = newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1); newRoute(src->id(), dst->id(), e_route); // Symmetrical YES - if (route->symmetrical == true) { + if (symmetrical == true) { - xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_); + xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_); 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); + xbt_edge_t edge = xbt_graph_get_edge(route_graph_, node_e_v, node_s_v); - if (not route->gw_dst || not route->gw_src){ + if (not gw_dst || not 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->getCname(), srcName, - route->gw_src->getCname()); + XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", dstName, gw_dst->get_cname(), srcName, gw_src->get_cname()); if (edge) - THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, route->gw_dst->getCname(), srcName, - route->gw_src->getCname()); + THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, gw_dst->get_cname(), srcName, + gw_src->get_cname()); } - if (route->gw_dst && route->gw_src) { - NetPoint* gw_tmp = route->gw_src; - route->gw_src = route->gw_dst; - route->gw_dst = gw_tmp; + if (gw_dst && gw_src) { + NetPoint* gw_tmp = gw_src; + gw_src = gw_dst; + gw_dst = gw_tmp; } - sg_platf_route_cbarg_t link_route_back = newExtendedRoute(hierarchy_, route, 0); + RouteCreationArgs* link_route_back = + newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0); newRoute(dst->id(), src->id(), link_route_back); } }