X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7dd253f0ff4dda733dd0f7c924a25df4b777f0d0..39c935d6d5ee86d153f6f7e6a10d723ae7c57f6f:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index 2694cdff9d..3c3378dca9 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2009-2021. 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. */ @@ -32,19 +32,10 @@ DijkstraZone::DijkstraZone(NetZoneImpl* father, const std::string& name, resourc { } -static void graph_node_data_free(void* n) +void DijkstraZone::route_graph_delete(xbt_graph_t g) { - delete static_cast(n); -} - -static void graph_edge_data_free(void* e) -{ - delete static_cast(e); -} - -DijkstraZone::~DijkstraZone() -{ - xbt_graph_free_graph(route_graph_, &graph_node_data_free, &graph_edge_data_free, nullptr); + xbt_graph_free_graph(g, [](void* n) { delete static_cast(n); }, + [](void* e) { delete static_cast(e); }, nullptr); } void DijkstraZone::seal() @@ -52,12 +43,9 @@ void DijkstraZone::seal() unsigned int cursor; xbt_node_t node = nullptr; - if (not route_graph_) - route_graph_ = xbt_graph_new_graph(1, nullptr); - /* Add the loopback if needed */ if (network_model_->loopback_ && hierarchy_ == RoutingMode::base) { - xbt_dynar_foreach (xbt_graph_get_nodes(route_graph_), cursor, node) { + xbt_dynar_foreach (xbt_graph_get_nodes(route_graph_.get()), cursor, node) { bool found = false; xbt_edge_t edge = nullptr; unsigned int cursor2; @@ -69,25 +57,25 @@ void DijkstraZone::seal() } if (not found) { - RouteCreationArgs* route = new simgrid::kernel::routing::RouteCreationArgs(); + auto* route = new simgrid::kernel::routing::RouteCreationArgs(); route->link_list.push_back(network_model_->loopback_); - xbt_graph_new_edge(route_graph_, node, node, route); + xbt_graph_new_edge(route_graph_.get(), node, node, route); } } } /* initialize graph indexes in nodes after graph has been built */ - xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_); + const_xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_.get()); xbt_dynar_foreach (nodes, cursor, node) { - GraphNodeData* data = static_cast(xbt_graph_node_get_data(node)); + auto* data = static_cast(xbt_graph_node_get_data(node)); data->graph_id_ = cursor; } } xbt_node_t DijkstraZone::route_graph_new_node(int id) { - xbt_node_t node = xbt_graph_new_node(route_graph_, new GraphNodeData(id)); + xbt_node_t node = xbt_graph_new_node(route_graph_.get(), new GraphNodeData(id)); graph_node_map_.emplace(id, node); return node; @@ -107,20 +95,20 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr int src_id = src->id(); int dst_id = dst->id(); - xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_); + const_xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_.get()); /* Use the graph_node id mapping set to quickly find the nodes */ - xbt_node_t src_elm = node_map_search(src_id); - xbt_node_t dst_elm = node_map_search(dst_id); + const s_xbt_node_t* src_elm = node_map_search(src_id); + const s_xbt_node_t* dst_elm = node_map_search(dst_id); int src_node_id = static_cast(xbt_graph_node_get_data(src_elm))->graph_id_; int dst_node_id = static_cast(xbt_graph_node_get_data(dst_elm))->graph_id_; /* if the src and dst are the same */ if (src_node_id == dst_node_id) { - 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(route_graph_, node_s_v, node_e_v); + const s_xbt_node_t* node_s_v = xbt_dynar_get_as(nodes, src_node_id, xbt_node_t); + const s_xbt_node_t* node_e_v = xbt_dynar_get_as(nodes, dst_node_id, xbt_node_t); + const s_xbt_edge_t* edge = xbt_graph_get_edge(route_graph_.get(), node_s_v, node_e_v); if (edge == nullptr) throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname())); @@ -130,7 +118,7 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr for (auto const& link : e_route->link_list) { route->link_list.insert(route->link_list.begin(), link); if (lat) - *lat += static_cast(link)->get_latency(); + *lat += link->get_latency(); } } @@ -141,8 +129,8 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr 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 */ - typedef std::pair Qelt; - std::priority_queue, std::greater> pqueue; + using Qelt = std::pair; + std::priority_queue, std::greater<>> pqueue; /* initialize */ cost_arr[src_node_id] = 0.0; @@ -162,12 +150,12 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr 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); + const s_xbt_node_t* v_node = xbt_dynar_get_as(nodes, v_id, xbt_node_t); xbt_edge_t edge = nullptr; unsigned int cursor; xbt_dynar_foreach (xbt_graph_node_get_outedges(v_node), cursor, edge) { - xbt_node_t u_node = xbt_graph_edge_get_target(edge); + const s_xbt_node_t* u_node = xbt_graph_edge_get_target(edge); const GraphNodeData* data = static_cast(xbt_graph_node_get_data(u_node)); int u_id = data->graph_id_; const RouteCreationArgs* tmp_e_route = static_cast(xbt_graph_edge_get_data(edge)); @@ -187,9 +175,9 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr 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); - xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t); - xbt_edge_t edge = xbt_graph_get_edge(route_graph_, node_pred_v, node_v); + const s_xbt_node_t* node_pred_v = xbt_dynar_get_as(nodes, pred_arr[v], xbt_node_t); + const s_xbt_node_t* node_v = xbt_dynar_get_as(nodes, v, xbt_node_t); + const s_xbt_edge_t* edge = xbt_graph_get_edge(route_graph_.get(), node_pred_v, node_v); if (edge == nullptr) throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname())); @@ -221,7 +209,7 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr for (auto const& link : e_route->link_list) { route->link_list.insert(route->link_list.begin(), link); if (lat) - *lat += static_cast(link)->get_latency(); + *lat += link->get_latency(); } } @@ -239,13 +227,10 @@ void DijkstraZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, Net { add_route_check_params(src, dst, gw_src, gw_dst, link_list, symmetrical); - if (not route_graph_) - route_graph_ = xbt_graph_new_graph(1, nullptr); - - new_edge(src->id(), dst->id(), new_extended_route(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1)); + new_edge(src->id(), dst->id(), new_extended_route(hierarchy_, gw_src, gw_dst, link_list, true)); - if (symmetrical == true) - new_edge(dst->id(), src->id(), new_extended_route(hierarchy_, dst, src, gw_dst, gw_src, link_list, symmetrical, 0)); + if (symmetrical) + new_edge(dst->id(), src->id(), new_extended_route(hierarchy_, gw_dst, gw_src, link_list, false)); } void DijkstraZone::new_edge(int src_id, int dst_id, RouteCreationArgs* route) @@ -262,7 +247,7 @@ void DijkstraZone::new_edge(int src_id, int dst_id, RouteCreationArgs* route) dst = route_graph_new_node(dst_id); // Make sure that this graph edge was not already added to the graph - if (xbt_graph_get_edge(route_graph_, src, dst) != nullptr) { + if (xbt_graph_get_edge(route_graph_.get(), src, dst) != nullptr) { if (route->gw_dst == nullptr || route->gw_src == nullptr) throw std::invalid_argument( xbt::string_printf("Route from %s to %s already exists", route->src->get_cname(), route->dst->get_cname())); @@ -273,7 +258,7 @@ void DijkstraZone::new_edge(int src_id, int dst_id, RouteCreationArgs* route) } // Finally add it - xbt_graph_new_edge(route_graph_, src, dst, route); + xbt_graph_new_edge(route_graph_.get(), src, dst, route); } } // namespace routing } // namespace kernel