X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b4ac368a8512fa8ec30d04f55c4a3c660e9439b9..5fec5d08d744431061257ced7d7244182468b2f8:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index 0c5123d599..bccbca727c 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -1,330 +1,269 @@ -/* Copyright (c) 2009-2017. 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. */ -#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 "surf/surf.hpp" +#include "xbt/string.hpp" -#include +#include +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic"); -/* Free functions */ +namespace simgrid { +namespace kernel { +namespace routing { -static void graph_node_data_free(void* n) -{ - graph_node_data_t data = static_cast(n); - delete data; -} +class GraphNodeData { +public: + explicit GraphNodeData(int id) : id_(id) {} + int id_; + unsigned long graph_id_ = UINT_MAX; /* used for caching internal graph id's */ +}; -static void graph_edge_data_free(void* e) // FIXME: useless code duplication +void DijkstraZone::route_graph_delete(xbt_graph_t g) { - sg_platf_route_cbarg_t e_route = static_cast(e); - if (e_route) { - delete e_route->link_list; - delete e_route; - } + xbt_graph_free_graph( + g, [](void* n) { delete static_cast(n); }, [](void* e) { delete static_cast(e); }, + nullptr); } -/* Utility functions */ - -namespace simgrid { -namespace kernel { -namespace routing { -void DijkstraZone::seal() +void DijkstraZone::do_seal() { unsigned int cursor; xbt_node_t node = nullptr; - /* Create the topology graph */ - if (not routeGraph_) - routeGraph_ = 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) { - - 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) { - if (xbt_graph_edge_get_target(edge) == node) { + if (xbt_graph_edge_get_target(edge) == node) { // There is an edge from node to itself found = true; break; } } 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); + auto* route = new Route(); + 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(routeGraph_); + const_xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_.get()); xbt_dynar_foreach (nodes, cursor, node) { - graph_node_data_t 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::routeGraphNewNode(int id, int graph_id) +xbt_node_t DijkstraZone::route_graph_new_node(int id) { - graph_node_data_t data = new s_graph_node_data_t; - 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_.get(), new GraphNodeData(id)); + graph_node_map_.emplace(id, node); return node; } -xbt_node_t DijkstraZone::nodeMapSearch(int id) +xbt_node_t DijkstraZone::node_map_search(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) -{ - XBT_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id); - xbt_node_t src = nullptr; - xbt_node_t dst = nullptr; - - xbt_node_t src_elm = nodeMapSearch(src_id); - xbt_node_t dst_elm = nodeMapSearch(dst_id); - - if (src_elm) - src = src_elm; - - if (dst_elm) - dst = dst_elm; - - /* add nodes if they don't exist in the graph */ - if (src_id == dst_id && src == nullptr && dst == nullptr) { - src = this->routeGraphNewNode(src_id, -1); - dst = src; - } else { - if (src == nullptr) { - src = this->routeGraphNewNode(src_id, -1); - } - if (dst == nullptr) { - dst = this->routeGraphNewNode(dst_id, -1); - } - } - - /* add link as edge to graph */ - xbt_graph_new_edge(routeGraph_, src, dst, e_route); -} - -void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) +void DijkstraZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat) { - getRouteCheckParams(src, dst); + get_route_check_params(src, dst); int src_id = src->id(); int dst_id = dst->id(); - xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_); + 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 = nodeMapSearch(src_id); - xbt_node_t dst_elm = nodeMapSearch(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; + unsigned int src_node_id = static_cast(xbt_graph_node_get_data(src_elm))->graph_id_; + unsigned 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(routeGraph_, 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->getCname(), dst->getCname()); + throw std::invalid_argument(xbt::string_printf("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)); + const Route* 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 += link->get_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 */ + unsigned long 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); + using Qelt = std::pair; + std::priority_queue, std::greater<>> pqueue; /* initialize */ - cost_arr[src_node_id] = 0.0; + cost_arr[src_node_id] = 0; - for (int i = 0; i < nr_nodes; i++) { + for (unsigned long i = 0; i < nr_nodes; i++) { if (i != src_node_id) { - cost_arr[i] = DBL_MAX; + cost_arr[i] = ULONG_MAX; } 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); - xbt_edge_t edge = nullptr; + while (not pqueue.empty()) { + int v_id = pqueue.top().second; + pqueue.pop(); + 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); - 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]); + 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 Route* tmp_e_route = static_cast(xbt_graph_edge_get_data(edge)); + unsigned long 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 */ - NetPoint* gw_src = nullptr; - NetPoint* gw_dst; - NetPoint* first_gw = nullptr; + NetPoint* gw_src = nullptr; + 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(routeGraph_, node_pred_v, node_v); + for (unsigned int v = dst_node_id; v != src_node_id; v = pred_arr[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->getCname(), dst->getCname()); + throw std::invalid_argument(xbt::string_printf("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)); + const Route* e_route = static_cast(xbt_graph_edge_get_data(edge)); - NetPoint* prev_gw_src = gw_src; - gw_src = e_route->gw_src; - 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->getName() != prev_gw_src->getName()) { - std::vector e_route_as_to_as; + 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; - 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(); + const NetPoint* gw_dst_net_elm = nullptr; + const NetPoint* prev_gw_src_net_elm = nullptr; + 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(); + *lat += link->get_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 += link->get_latency(); } } - if (hierarchy_ == RoutingMode::recursive) { - route->gw_src = gw_src; - route->gw_dst = first_gw; + if (get_hierarchy() == RoutingMode::recursive) { + route->gw_src_ = gw_src; + route->gw_dst_ = first_gw; } if (not cached_) - routeCache_.clear(); + route_cache_.clear(); } -DijkstraZone::~DijkstraZone() +void DijkstraZone::add_route(NetPoint* src, NetPoint* dst, NetPoint* gw_src, NetPoint* gw_dst, + const std::vector& link_list_, bool symmetrical) { - xbt_graph_free_graph(routeGraph_, &graph_node_data_free, &graph_edge_data_free, nullptr); -} + add_route_check_params(src, dst, gw_src, gw_dst, link_list_, symmetrical); -/* Creation routing model functions */ + new_edge(src->id(), dst->id(), new_extended_route(get_hierarchy(), gw_src, gw_dst, link_list_, true)); -DijkstraZone::DijkstraZone(NetZone* father, std::string name, bool cached) : RoutedZone(father, name), cached_(cached) -{ + if (symmetrical) + new_edge(dst->id(), src->id(), new_extended_route(get_hierarchy(), gw_dst, gw_src, link_list_, false)); } -void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) +void DijkstraZone::new_edge(int src_id, int dst_id, Route* route) { - NetPoint* src = route->src; - NetPoint* dst = route->dst; - const char* srcName = src->getCname(); - const char* dstName = dst->getCname(); - - addRouteCheckParams(route); - - /* Create the topology graph */ - if (not routeGraph_) - routeGraph_ = 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); - newRoute(src->id(), dst->id(), e_route); - - // Symmetrical YES - if (route->symmetrical == true) { - - 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 (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->getCname(), srcName, - route->gw_src->getCname()); - 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()); - } - - if (route->gw_dst && route->gw_src) { - NetPoint* gw_tmp = route->gw_src; - route->gw_src = route->gw_dst; - route->gw_dst = gw_tmp; - } - sg_platf_route_cbarg_t link_route_back = newExtendedRoute(hierarchy_, route, 0); - newRoute(dst->id(), src->id(), link_route_back); + XBT_DEBUG("Create Route from '%d' to '%d'", src_id, dst_id); + + // Get the extremities, or create them if they don't exist yet + xbt_node_t src = node_map_search(src_id); + if (src == nullptr) + src = route_graph_new_node(src_id); + + xbt_node_t dst = node_map_search(dst_id); + if (dst == nullptr) + 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_.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())); + else + 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_.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