X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b25ba22df3453203e67cc1de156130f15bd7d404..5fec5d08d744431061257ced7d7244182468b2f8:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index 7855c4f655..bccbca727c 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -6,11 +6,10 @@ #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 "xbt/string.hpp" -#include +#include #include #include @@ -24,29 +23,25 @@ class GraphNodeData { public: explicit GraphNodeData(int id) : id_(id) {} int id_; - int graph_id_ = -1; /* used for caching internal graph id's */ + unsigned long graph_id_ = UINT_MAX; /* 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 (get_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) { @@ -57,8 +52,8 @@ void DijkstraZone::seal() } if (not found) { - auto* route = new simgrid::kernel::routing::RouteCreationArgs(); - route->link_list.push_back(get_network_model()->loopback_); + auto* route = new Route(); + route->link_list_.push_back(get_network_model()->loopback_); xbt_graph_new_edge(route_graph_.get(), node, node, route); } } @@ -68,8 +63,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; } } @@ -89,7 +84,7 @@ xbt_node_t DijkstraZone::node_map_search(int id) /* Parsing */ -void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) +void DijkstraZone::get_local_route(const NetPoint* src, const NetPoint* dst, Route* route, double* lat) { get_route_check_params(src, dst); int src_id = src->id(); @@ -101,8 +96,8 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr 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) { @@ -113,10 +108,10 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr if (edge == nullptr) throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname())); - const RouteCreationArgs* 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 += link->get_latency(); } @@ -126,18 +121,18 @@ 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); - 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 */ 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; @@ -151,15 +146,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_; - 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 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; @@ -174,7 +169,7 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr NetPoint* gw_src = nullptr; NetPoint* first_gw = nullptr; - for (int v = dst_node_id; v != src_node_id; v = pred_arr[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); @@ -182,40 +177,41 @@ void DijkstraZone::get_local_route(NetPoint* src, NetPoint* dst, RouteCreationAr if (edge == nullptr) throw std::invalid_argument(xbt::string_printf("No route from '%s' to '%s'", src->get_cname(), dst->get_cname())); - const RouteCreationArgs* e_route = static_cast(xbt_graph_edge_get_data(edge)); + const Route* 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; - NetPoint* prev_gw_src_net_elm = nullptr; + 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(); + 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->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 += 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_) @@ -223,17 +219,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); + 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) +void DijkstraZone::new_edge(int src_id, int dst_id, Route* route) { XBT_DEBUG("Create Route from '%d' to '%d'", src_id, dst_id); @@ -248,13 +244,13 @@ void DijkstraZone::new_edge(int src_id, int dst_id, RouteCreationArgs* route) // 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) + 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())); + 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())); + route->src_->get_cname(), route->gw_src_->get_cname(), + route->dst_->get_cname(), route->gw_dst_->get_cname())); } // Finally add it @@ -262,4 +258,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