X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b6f037cf41a18ef8974469496e710093d8e1ab75..82230d737404aa70c3c2b5824d97109f1f129d58:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index 4c2d62c2bb..85dfd1a640 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"); @@ -19,13 +21,10 @@ static void graph_node_data_free(void* n) delete data; } -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 e_route; } /* Utility functions */ @@ -58,8 +57,7 @@ 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_); + e_route->link_list.push_back(surf_network_model->loopback_); xbt_graph_new_edge(routeGraph_, node, node, e_route); } } @@ -132,8 +130,6 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb 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 */ @@ -151,31 +147,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)); - 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; @@ -188,14 +179,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; @@ -204,22 +195,15 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb 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 */ + 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]); + 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 */ @@ -233,7 +217,7 @@ 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)); @@ -244,28 +228,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) { @@ -273,16 +255,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() @@ -292,7 +266,7 @@ 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) { } @@ -300,8 +274,8 @@ void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) { 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); @@ -329,11 +303,11 @@ void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) 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, 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->name().c_str(), srcName, - route->gw_src->name().c_str()); + 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) {