X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a18117755285a374ec3d5830309c924f2830e3ba..73049fc3c9c1159f15d39ff550712a8c9a8f6ebb:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index e7d12b5161..d0e07ee1fc 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -4,10 +4,11 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #include "src/kernel/routing/DijkstraZone.hpp" -#include "src/kernel/routing/NetCard.hpp" - +#include "src/kernel/routing/NetPoint.hpp" #include "src/surf/network_interface.hpp" +#include + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic"); /* Free functions */ @@ -41,10 +42,11 @@ static void graph_edge_data_free(void* e) // FIXME: useless code duplication namespace simgrid { namespace kernel { namespace routing { -void AsDijkstra::seal() +void DijkstraZone::seal() { xbt_node_t node = nullptr; - unsigned int cursor2, cursor; + unsigned int cursor2; + unsigned int cursor; /* Create the topology graph */ if (!routeGraph_) @@ -67,7 +69,7 @@ void AsDijkstra::seal() if (!found) { sg_platf_route_cbarg_t e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1); - e_route->link_list = new std::vector(); + 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); } @@ -83,32 +85,28 @@ void AsDijkstra::seal() } } -xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id) +xbt_node_t DijkstraZone::routeGraphNewNode(int id, int graph_id) { - xbt_node_t node = nullptr; - graph_node_data_t data = nullptr; - graph_node_map_element_t elm = nullptr; - - data = xbt_new0(struct graph_node_data, 1); + graph_node_data_t data = xbt_new0(struct graph_node_data, 1); data->id = id; data->graph_id = graph_id; - node = xbt_graph_new_node(routeGraph_, data); - elm = xbt_new0(struct graph_node_map_element, 1); + xbt_node_t node = xbt_graph_new_node(routeGraph_, data); + graph_node_map_element_t elm = xbt_new0(struct graph_node_map_element, 1); elm->node = node; xbt_dict_set_ext(graphNodeMap_, (char*)(&id), sizeof(int), (xbt_dictelm_t)elm, nullptr); return node; } -graph_node_map_element_t AsDijkstra::nodeMapSearch(int id) +graph_node_map_element_t DijkstraZone::nodeMapSearch(int id) { return (graph_node_map_element_t)xbt_dict_get_or_null_ext(graphNodeMap_, (char*)(&id), sizeof(int)); } /* Parsing */ -void AsDijkstra::newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_route) +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; @@ -140,7 +138,7 @@ void AsDijkstra::newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_route xbt_graph_new_edge(routeGraph_, src, dst, e_route); } -void AsDijkstra::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_t route, double* lat) +void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cbarg_t route, double* lat) { getRouteCheckParams(src, dst); int src_id = src->id(); @@ -172,7 +170,7 @@ void AsDijkstra::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_ for (auto link : *e_route->link_list) { route->link_list->insert(route->link_list->begin(), link); if (lat) - *lat += static_cast(link)->latency(); + *lat += static_cast(link)->latency(); } } @@ -208,7 +206,7 @@ void AsDijkstra::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_ /* apply dijkstra using the indexes from the graph's node array */ while (xbt_heap_size(pqueue) > 0) { - int* v_id = (int*)xbt_heap_pop(pqueue); + 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; unsigned int cursor; @@ -238,8 +236,11 @@ void AsDijkstra::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_ } /* compose route path with links */ - NetCard *gw_src = nullptr, *gw_dst, *prev_gw_src, *first_gw = nullptr; - NetCard *gw_dst_net_elm = nullptr, *prev_gw_src_net_elm = nullptr; + NetPoint *gw_src = nullptr; + NetPoint *gw_dst; + NetPoint *prev_gw_src; + NetPoint *first_gw = nullptr; + NetPoint *gw_dst_net_elm = nullptr, *prev_gw_src_net_elm = 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); @@ -260,11 +261,11 @@ void AsDijkstra::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_ if (hierarchy_ == RoutingMode::recursive && v != dst_node_id && strcmp(gw_dst->name().c_str(), prev_gw_src->name().c_str())) { - std::vector* e_route_as_to_as = new std::vector(); + std::vector e_route_as_to_as; - getGlobalRoute(gw_dst_net_elm, prev_gw_src_net_elm, e_route_as_to_as, nullptr); + getGlobalRoute(gw_dst_net_elm, prev_gw_src_net_elm, &e_route_as_to_as, nullptr); auto pos = route->link_list->begin(); - for (auto link : *e_route_as_to_as) { + for (auto link : e_route_as_to_as) { route->link_list->insert(pos, link); if (lat) *lat += link->latency(); @@ -275,7 +276,7 @@ void AsDijkstra::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_ for (auto link : *e_route->link_list) { route->link_list->insert(route->link_list->begin(), link); if (lat) - *lat += static_cast(link)->latency(); + *lat += static_cast(link)->latency(); } size++; } @@ -297,7 +298,7 @@ void AsDijkstra::getLocalRoute(NetCard* src, NetCard* dst, sg_platf_route_cbarg_ xbt_free(pred_arr); } -AsDijkstra::~AsDijkstra() +DijkstraZone::~DijkstraZone() { xbt_graph_free_graph(routeGraph_, &xbt_free_f, &graph_edge_data_free, &xbt_free_f); xbt_dict_free(&graphNodeMap_); @@ -306,16 +307,16 @@ AsDijkstra::~AsDijkstra() /* Creation routing model functions */ -AsDijkstra::AsDijkstra(As* father, const char* name, bool cached) : AsRoutedGraph(father, name) +DijkstraZone::DijkstraZone(NetZone* father, const char* name, bool cached) : RoutedZone(father, name) { if (cached) routeCache_ = xbt_dict_new_homogeneous(&route_cache_elem_free); } -void AsDijkstra::addRoute(sg_platf_route_cbarg_t route) +void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) { - NetCard* src = route->src; - NetCard* dst = route->dst; + NetPoint* src = route->src; + NetPoint* dst = route->dst; const char* srcName = src->name().c_str(); const char* dstName = dst->name().c_str(); @@ -339,7 +340,7 @@ void AsDijkstra::addRoute(sg_platf_route_cbarg_t route) if (!route->gw_dst && !route->gw_src) XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dstName, srcName); else - XBT_DEBUG("Load ASroute from %s@%s to %s@%s", dstName, route->gw_dst->name().c_str(), srcName, + XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", dstName, route->gw_dst->name().c_str(), srcName, route->gw_src->name().c_str()); xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_); @@ -352,7 +353,7 @@ void AsDijkstra::addRoute(sg_platf_route_cbarg_t route) route->gw_src->name().c_str()); if (route->gw_dst && route->gw_src) { - NetCard* gw_tmp = route->gw_src; + NetPoint* gw_tmp = route->gw_src; route->gw_src = route->gw_dst; route->gw_dst = gw_tmp; }