X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/67fe7b9d6c00b390a8598bc1e72d42d8343cb218..449eca36d251f79803b58b63e2b20cb243e8a36c:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index f065cbc748..6270976eae 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2018. 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. */ @@ -8,6 +8,7 @@ #include "src/surf/network_interface.hpp" #include "src/surf/xml/platf_private.hpp" #include "surf/surf.hpp" +#include "xbt/string.hpp" #include #include @@ -26,39 +27,22 @@ public: int graph_id_ = -1; /* used for caching internal graph id's */ }; -DijkstraZone::DijkstraZone(NetZoneImpl* father, std::string name, resource::NetworkModel* netmodel, bool cached) - : RoutedZone(father, name, netmodel), cached_(cached) +void DijkstraZone::route_graph_delete(xbt_graph_t g) { + xbt_graph_free_graph( + g, [](void* n) { delete static_cast(n); }, + [](void* e) { delete static_cast(e); }, nullptr); } -static void graph_node_data_free(void* n) -{ - 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); -} - -void DijkstraZone::seal() +void DijkstraZone::do_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) { - bool found = false; + if (get_network_model()->loopback_ && get_hierarchy() == RoutingMode::base) { + xbt_dynar_foreach (xbt_graph_get_nodes(route_graph_.get()), cursor, node) { + bool found = false; xbt_edge_t edge = nullptr; unsigned int cursor2; xbt_dynar_foreach (xbt_graph_node_get_outedges(node), cursor2, edge) { @@ -69,25 +53,25 @@ void DijkstraZone::seal() } if (not found) { - RouteCreationArgs* route = new simgrid::kernel::routing::RouteCreationArgs(); - route->link_list.push_back(network_model_->loopback_); - xbt_graph_new_edge(route_graph_, node, node, route); + auto* route = new simgrid::kernel::routing::RouteCreationArgs(); + route->link_list.push_back(get_network_model()->loopback_); + 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)); - data->graph_id_ = cursor; + 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,31 +91,30 @@ 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) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->get_cname(), dst->get_cname()); + throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname())); - RouteCreationArgs* e_route = static_cast(xbt_graph_edge_get_data(edge)); + const 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); if (lat) - *lat += static_cast(link)->get_latency(); + *lat += link->get_latency(); } } @@ -139,11 +122,11 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr 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); + 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; @@ -163,16 +146,16 @@ 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); - xbt_edge_t edge = nullptr; + 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); - GraphNodeData* data = static_cast(xbt_graph_node_get_data(u_node)); - int u_id = data->graph_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 */ + 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)); + 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; @@ -188,23 +171,24 @@ 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) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->get_cname(), dst->get_cname()); + throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname())); - RouteCreationArgs* e_route = static_cast(xbt_graph_edge_get_data(edge)); + const RouteCreationArgs* e_route = static_cast(xbt_graph_edge_get_data(edge)); - NetPoint* prev_gw_src = gw_src; - gw_src = e_route->gw_src; - NetPoint* gw_dst = e_route->gw_dst; + const NetPoint* prev_gw_src = gw_src; + gw_src = e_route->gw_src; + NetPoint* gw_dst = e_route->gw_dst; if (v == dst_node_id) first_gw = gw_dst; - if (hierarchy_ == RoutingMode::recursive && v != dst_node_id && gw_dst->get_name() != prev_gw_src->get_name()) { + if (get_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; @@ -222,11 +206,11 @@ 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(); } } - if (hierarchy_ == RoutingMode::recursive) { + if (get_hierarchy() == RoutingMode::recursive) { route->gw_src = gw_src; route->gw_dst = first_gw; } @@ -236,20 +220,17 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr } void DijkstraZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, - std::vector& link_list, bool symmetrical) + const std::vector& link_list, bool symmetrical) { 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(get_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(get_hierarchy(), gw_dst, gw_src, link_list, false)); } -void DijkstraZone::new_edge(int src_id, int dst_id, simgrid::kernel::routing::RouteCreationArgs* route) +void DijkstraZone::new_edge(int src_id, int dst_id, RouteCreationArgs* route) { XBT_DEBUG("Create Route from '%d' to '%d'", src_id, dst_id); @@ -263,17 +244,27 @@ void DijkstraZone::new_edge(int src_id, int dst_id, simgrid::kernel::routing::Ro 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) - THROWF(arg_error, 0, "Route from %s to %s already exists", route->src->get_cname(), route->dst->get_cname()); + throw std::invalid_argument( + xbt::string_printf("Route from %s to %s already exists", route->src->get_cname(), route->dst->get_cname())); else - THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", route->src->get_cname(), - route->gw_src->get_cname(), route->dst->get_cname(), route->gw_dst->get_cname()); + throw std::invalid_argument(xbt::string_printf("Route from %s@%s to %s@%s already exists", + route->src->get_cname(), route->gw_src->get_cname(), + route->dst->get_cname(), route->gw_dst->get_cname())); } // 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 + +namespace s4u { +NetZone* create_dijkstra_zone(const std::string& name, bool cache) +{ + return (new kernel::routing::DijkstraZone(name, cache))->get_iface(); } -} // namespace +} // namespace s4u + +} // namespace simgrid