X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ca280be5e4f894c66ac254d445962c96a34cbe45..de57b34916659892d2dc26edabf552253afe2c18:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index 3cb87afd6e..214a02f6cb 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -8,6 +8,8 @@ #include "src/surf/network_interface.hpp" #include +#include +#include XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic"); @@ -15,17 +17,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf static void graph_node_data_free(void* n) { - graph_node_data_t data = static_cast(n); - delete data; + delete static_cast(n); } -static void graph_edge_data_free(void* e) // FIXME: useless code duplication +static void graph_edge_data_free(void* e) { - sg_platf_route_cbarg_t e_route = static_cast(e); - if (e_route) { - delete e_route->link_list; - delete e_route; - } + delete static_cast(e); } /* Utility functions */ @@ -57,9 +54,8 @@ void DijkstraZone::seal() } 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_); + RouteCreationArgs* e_route = new RouteCreationArgs(); + e_route->link_list.push_back(surf_network_model->loopback_); xbt_graph_new_edge(routeGraph_, node, node, e_route); } } @@ -81,14 +77,12 @@ xbt_node_t DijkstraZone::routeGraphNewNode(int id, int graph_id) data->graph_id = graph_id; xbt_node_t node = xbt_graph_new_node(routeGraph_, data); - graph_node_map_element_t elm = new s_graph_node_map_element_t; - elm->node = node; - graphNodeMap_.insert({id, elm}); + graphNodeMap_.emplace(id, node); return node; } -graph_node_map_element_t DijkstraZone::nodeMapSearch(int id) +xbt_node_t DijkstraZone::nodeMapSearch(int id) { auto ret = graphNodeMap_.find(id); return ret == graphNodeMap_.end() ? nullptr : ret->second; @@ -96,20 +90,20 @@ graph_node_map_element_t DijkstraZone::nodeMapSearch(int id) /* Parsing */ -void DijkstraZone::newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_route) +void DijkstraZone::newRoute(int src_id, int dst_id, RouteCreationArgs* e_route) { XBT_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id); xbt_node_t src = nullptr; xbt_node_t dst = nullptr; - graph_node_map_element_t src_elm = nodeMapSearch(src_id); - graph_node_map_element_t dst_elm = nodeMapSearch(dst_id); + xbt_node_t src_elm = nodeMapSearch(src_id); + xbt_node_t dst_elm = nodeMapSearch(dst_id); if (src_elm) - src = src_elm->node; + src = src_elm; if (dst_elm) - dst = dst_elm->node; + dst = dst_elm; /* add nodes if they don't exist in the graph */ if (src_id == dst_id && src == nullptr && dst == nullptr) { @@ -128,22 +122,20 @@ void DijkstraZone::newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_rou 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::getLocalRoute(NetPoint* src, NetPoint* dst, RouteCreationArgs* route, double* lat) { getRouteCheckParams(src, dst); int src_id = src->id(); int dst_id = dst->id(); - int* pred_arr = nullptr; - int size = 0; xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_); /* Use the graph_node id mapping set to quickly find the nodes */ - graph_node_map_element_t src_elm = nodeMapSearch(src_id); - graph_node_map_element_t dst_elm = nodeMapSearch(dst_id); + xbt_node_t src_elm = nodeMapSearch(src_id); + xbt_node_t dst_elm = nodeMapSearch(dst_id); - int src_node_id = static_cast(xbt_graph_node_get_data(src_elm->node))->graph_id; - int dst_node_id = static_cast(xbt_graph_node_get_data(dst_elm->node))->graph_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) { @@ -153,31 +145,26 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb xbt_edge_t edge = xbt_graph_get_edge(routeGraph_, node_s_v, node_e_v); if (edge == nullptr) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name().c_str(), dst->name().c_str()); + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname()); - sg_platf_route_cbarg_t e_route = static_cast(xbt_graph_edge_get_data(edge)); + 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); + for (auto const& link : e_route->link_list) { + route->link_list.insert(route->link_list.begin(), link); if (lat) *lat += static_cast(link)->latency(); } } - route_cache_element_t elm = nullptr; - if (not routeCache_.empty()) { /* cache mode */ - auto it = routeCache_.find(src_id); - elm = (it == routeCache_.end()) ? nullptr : it->second; - } - - if (elm) { /* cached mode and cache hit */ - pred_arr = elm->pred_arr; - } else { /* not cached mode, or cache miss */ + auto elm = routeCache_.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); - double* cost_arr = new double[nr_nodes]; /* link cost from src to other hosts */ - pred_arr = new int[nr_nodes]; /* predecessors in path from src */ - xbt_heap_t pqueue = xbt_heap_new(nr_nodes, nullptr); + 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; /* initialize */ cost_arr[src_node_id] = 0.0; @@ -190,14 +177,14 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb 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); + 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; unsigned int cursor; @@ -205,23 +192,16 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb 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]); + 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; + 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; } - - delete[] cost_arr; - xbt_heap_free(pqueue); } /* compose route path with links */ @@ -235,9 +215,9 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb xbt_edge_t edge = xbt_graph_get_edge(routeGraph_, node_pred_v, node_v); if (edge == nullptr) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name().c_str(), dst->name().c_str()); + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getCname(), dst->getCname()); - sg_platf_route_cbarg_t e_route = static_cast(xbt_graph_edge_get_data(edge)); + RouteCreationArgs* e_route = static_cast(xbt_graph_edge_get_data(edge)); NetPoint* prev_gw_src = gw_src; gw_src = e_route->gw_src; @@ -246,28 +226,26 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb if (v == dst_node_id) first_gw = gw_dst; - if (hierarchy_ == RoutingMode::recursive && v != dst_node_id && - strcmp(gw_dst->name().c_str(), prev_gw_src->name().c_str())) { + if (hierarchy_ == RoutingMode::recursive && v != dst_node_id && gw_dst->getName() != prev_gw_src->getName()) { 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(); + getGlobalRoute(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(); 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(); } - size++; } if (hierarchy_ == RoutingMode::recursive) { @@ -275,16 +253,8 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb route->gw_dst = first_gw; } - if (not routeCache_.empty() && elm == nullptr) { - /* add to predecessor list of the current src-host to cache */ - elm = new s_route_cache_element_t; - elm->pred_arr = pred_arr; - elm->size = size; - routeCache_.insert({src_id, elm}); - } - - if (routeCache_.empty()) - delete[] pred_arr; + if (not cached_) + routeCache_.clear(); } DijkstraZone::~DijkstraZone() @@ -294,18 +264,18 @@ DijkstraZone::~DijkstraZone() /* Creation routing model functions */ -DijkstraZone::DijkstraZone(NetZone* father, std::string name, bool cached) : RoutedZone(father, name) +DijkstraZone::DijkstraZone(NetZone* father, std::string name, bool cached) : RoutedZone(father, name), cached_(cached) { } -void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) +void DijkstraZone::addRoute(kernel::routing::NetPoint* src, kernel::routing::NetPoint* dst, + kernel::routing::NetPoint* gw_src, kernel::routing::NetPoint* gw_dst, + std::vector& link_list, bool symmetrical) { - NetPoint* src = route->src; - NetPoint* dst = route->dst; - const char* srcName = src->name().c_str(); - const char* dstName = dst->name().c_str(); + const char* srcName = src->getCname(); + const char* dstName = dst->getCname(); - addRouteCheckParams(route); + addRouteCheckParams(src, dst, gw_src, gw_dst, link_list, symmetrical); /* Create the topology graph */ if (not routeGraph_) @@ -315,35 +285,35 @@ void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) * nodes */ /* Add the route to the base */ - sg_platf_route_cbarg_t e_route = newExtendedRoute(hierarchy_, route, 1); + RouteCreationArgs* e_route = newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 1); newRoute(src->id(), dst->id(), e_route); // Symmetrical YES - if (route->symmetrical == true) { + if (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){ + if (not gw_dst || not 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->name().c_str(), srcName, - route->gw_src->name().c_str()); + XBT_DEBUG("Load NetzoneRoute from %s@%s to %s@%s", dstName, gw_dst->getCname(), srcName, gw_src->getCname()); if (edge) - THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, route->gw_dst->name().c_str(), srcName, - route->gw_src->name().c_str()); + THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, gw_dst->getCname(), srcName, + 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; + if (gw_dst && gw_src) { + NetPoint* gw_tmp = gw_src; + gw_src = gw_dst; + gw_dst = gw_tmp; } - sg_platf_route_cbarg_t link_route_back = newExtendedRoute(hierarchy_, route, 0); + RouteCreationArgs* link_route_back = + newExtendedRoute(hierarchy_, src, dst, gw_src, gw_dst, link_list, symmetrical, 0); newRoute(dst->id(), src->id(), link_route_back); } }