X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3b7e5f4b4d7c87ee3e8827313ec966ea8fc8387..3a15a2893fa0aa6b626063cb446cd1fc6b0088d8:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index cebdab7000..6270976eae 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2020. 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. */ @@ -27,26 +27,22 @@ public: int graph_id_ = -1; /* used for caching internal graph id's */ }; -DijkstraZone::DijkstraZone(NetZoneImpl* father, const 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); + xbt_graph_free_graph( + g, [](void* n) { delete static_cast(n); }, + [](void* e) { delete static_cast(e); }, nullptr); } -void DijkstraZone::seal() +void DijkstraZone::do_seal() { unsigned int cursor; xbt_node_t node = nullptr; /* Add the loopback if needed */ - if (network_model_->loopback_ && hierarchy_ == RoutingMode::base) { + if (get_network_model()->loopback_ && get_hierarchy() == RoutingMode::base) { xbt_dynar_foreach (xbt_graph_get_nodes(route_graph_.get()), cursor, node) { - bool found = false; + bool found = false; xbt_edge_t edge = nullptr; unsigned int cursor2; xbt_dynar_foreach (xbt_graph_node_get_outedges(node), cursor2, edge) { @@ -58,7 +54,7 @@ void DijkstraZone::seal() if (not found) { auto* route = new simgrid::kernel::routing::RouteCreationArgs(); - route->link_list.push_back(network_model_->loopback_); + route->link_list.push_back(get_network_model()->loopback_); xbt_graph_new_edge(route_graph_.get(), node, node, route); } } @@ -68,8 +64,8 @@ void DijkstraZone::seal() const_xbt_dynar_t nodes = xbt_graph_get_nodes(route_graph_.get()); xbt_dynar_foreach (nodes, cursor, node) { - auto* 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; } } @@ -126,10 +122,10 @@ 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; + using Qelt = std::pair; std::priority_queue, std::greater<>> pqueue; /* initialize */ @@ -151,15 +147,15 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr 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; + xbt_edge_t edge = nullptr; unsigned int cursor; xbt_dynar_foreach (xbt_graph_node_get_outedges(v_node), cursor, 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_; + 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 */ + 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; @@ -185,13 +181,14 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr const RouteCreationArgs* e_route = static_cast(xbt_graph_edge_get_data(edge)); const NetPoint* prev_gw_src = gw_src; - gw_src = e_route->gw_src; - NetPoint* gw_dst = e_route->gw_dst; + 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; @@ -213,7 +210,7 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr } } - if (hierarchy_ == RoutingMode::recursive) { + if (get_hierarchy() == RoutingMode::recursive) { route->gw_src = gw_src; route->gw_dst = first_gw; } @@ -223,14 +220,14 @@ 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); - new_edge(src->id(), dst->id(), new_extended_route(hierarchy_, gw_src, gw_dst, link_list, true)); + new_edge(src->id(), dst->id(), new_extended_route(get_hierarchy(), gw_src, gw_dst, link_list, true)); if (symmetrical) - new_edge(dst->id(), src->id(), new_extended_route(hierarchy_, gw_dst, gw_src, link_list, false)); + 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, RouteCreationArgs* route) @@ -262,4 +259,12 @@ void DijkstraZone::new_edge(int src_id, int dst_id, RouteCreationArgs* 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 s4u + } // namespace simgrid