X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1847d1441271d076b3de449c8853031ea208ce8f..9fb274493911c49b0e1e9ef4b19c81adea5ff7c8:/src/kernel/routing/DijkstraZone.cpp diff --git a/src/kernel/routing/DijkstraZone.cpp b/src/kernel/routing/DijkstraZone.cpp index 8808698485..c6f52a0814 100644 --- a/src/kernel/routing/DijkstraZone.cpp +++ b/src/kernel/routing/DijkstraZone.cpp @@ -13,27 +13,18 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf /* Free functions */ -static void route_cache_elem_free(void* e) +static void graph_node_data_free(void* n) { - route_cache_element_t elm = (route_cache_element_t)e; - if (elm) { - xbt_free(elm->pred_arr); - xbt_free(elm); - } -} - -static void graph_node_map_elem_free(void* e) -{ - graph_node_map_element_t elm = (graph_node_map_element_t)e; - xbt_free(elm); + graph_node_data_t data = static_cast(n); + delete data; } static void graph_edge_data_free(void* e) // FIXME: useless code duplication { - sg_platf_route_cbarg_t e_route = (sg_platf_route_cbarg_t)e; + sg_platf_route_cbarg_t e_route = static_cast(e); if (e_route) { delete e_route->link_list; - xbt_free(e_route); + delete e_route; } } @@ -50,8 +41,6 @@ void DijkstraZone::seal() /* Create the topology graph */ if (not routeGraph_) routeGraph_ = xbt_graph_new_graph(1, nullptr); - if (not graphNodeMap_) - graphNodeMap_ = xbt_dict_new_homogeneous(&graph_node_map_elem_free); /* Add the loopback if needed */ if (surf_network_model->loopback_ && hierarchy_ == RoutingMode::base) { @@ -68,7 +57,7 @@ void DijkstraZone::seal() } if (not found) { - sg_platf_route_cbarg_t e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1); + 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_); xbt_graph_new_edge(routeGraph_, node, node, e_route); @@ -80,28 +69,27 @@ void DijkstraZone::seal() xbt_dynar_t nodes = xbt_graph_get_nodes(routeGraph_); xbt_dynar_foreach (nodes, cursor, node) { - graph_node_data_t data = (graph_node_data_t)xbt_graph_node_get_data(node); + graph_node_data_t data = static_cast(xbt_graph_node_get_data(node)); data->graph_id = cursor; } } xbt_node_t DijkstraZone::routeGraphNewNode(int id, int graph_id) { - graph_node_data_t data = xbt_new0(struct graph_node_data, 1); + graph_node_data_t data = new s_graph_node_data_t; data->id = id; data->graph_id = graph_id; 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); + graphNodeMap_.emplace(id, node); return node; } -graph_node_map_element_t DijkstraZone::nodeMapSearch(int id) +xbt_node_t DijkstraZone::nodeMapSearch(int id) { - return (graph_node_map_element_t)xbt_dict_get_or_null_ext(graphNodeMap_, (char*)(&id), sizeof(int)); + auto ret = graphNodeMap_.find(id); + return ret == graphNodeMap_.end() ? nullptr : ret->second; } /* Parsing */ @@ -112,14 +100,14 @@ void DijkstraZone::newRoute(int src_id, int dst_id, sg_platf_route_cbarg_t e_rou 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) { @@ -144,16 +132,14 @@ 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 */ - 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 = ((graph_node_data_t)xbt_graph_node_get_data(src_elm->node))->graph_id; - int dst_node_id = ((graph_node_data_t)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) { @@ -165,7 +151,7 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb if (edge == nullptr) THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name().c_str(), dst->name().c_str()); - sg_platf_route_cbarg_t e_route = (sg_platf_route_cbarg_t)xbt_graph_edge_get_data(edge); + 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); @@ -174,19 +160,14 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb } } - route_cache_element_t elm = nullptr; - if (routeCache_) { /* cache mode */ - elm = (route_cache_element_t)xbt_dict_get_or_null_ext(routeCache_, (char*)(&src_id), sizeof(int)); - } - - 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 = xbt_new0(double, nr_nodes); /* link cost from src to other hosts */ - pred_arr = xbt_new0(int, nr_nodes); /* predecessors in path from src */ - xbt_heap_t pqueue = xbt_heap_new(nr_nodes, xbt_free_f); + std::vector cost_arr(nr_nodes); /* link cost from src to other hosts */ + pred_arr.resize(nr_nodes); /* predecessors in path from src */ + xbt_heap_t pqueue = xbt_heap_new(nr_nodes, nullptr); /* initialize */ cost_arr[src_node_id] = 0.0; @@ -199,8 +180,7 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb pred_arr[i] = 0; /* initialize priority queue */ - int* nodeid = xbt_new0(int, 1); - *nodeid = i; + int* nodeid = new int(i); xbt_heap_push(pqueue, nodeid, cost_arr[i]); } @@ -213,25 +193,22 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb xbt_dynar_foreach (xbt_graph_node_get_outedges(v_node), cursor, edge) { xbt_node_t u_node = xbt_graph_edge_get_target(edge); - graph_node_data_t data = (graph_node_data_t)xbt_graph_node_get_data(u_node); + 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 = (sg_platf_route_cbarg_t)xbt_graph_edge_get_data(edge); + 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 = xbt_new0(int, 1); - *nodeid = u_id; + int* nodeid = new int(u_id); xbt_heap_push(pqueue, nodeid, cost_arr[u_id]); } } /* free item popped from pqueue */ - xbt_free(v_id); + delete v_id; } - - xbt_free(cost_arr); xbt_heap_free(pqueue); } @@ -248,7 +225,7 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb if (edge == nullptr) THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name().c_str(), dst->name().c_str()); - sg_platf_route_cbarg_t e_route = (sg_platf_route_cbarg_t)xbt_graph_edge_get_data(edge); + sg_platf_route_cbarg_t e_route = static_cast(xbt_graph_edge_get_data(edge)); NetPoint* prev_gw_src = gw_src; gw_src = e_route->gw_src; @@ -278,7 +255,6 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb if (lat) *lat += static_cast(link)->latency(); } - size++; } if (hierarchy_ == RoutingMode::recursive) { @@ -286,31 +262,19 @@ void DijkstraZone::getLocalRoute(NetPoint* src, NetPoint* dst, sg_platf_route_cb route->gw_dst = first_gw; } - if (routeCache_ && elm == nullptr) { - /* add to predecessor list of the current src-host to cache */ - elm = xbt_new0(struct route_cache_element, 1); - elm->pred_arr = pred_arr; - elm->size = size; - xbt_dict_set_ext(routeCache_, (char*)(&src_id), sizeof(int), (xbt_dictelm_t)elm, nullptr); - } - - if (not routeCache_) - xbt_free(pred_arr); + if (not cached_) + routeCache_.clear(); } DijkstraZone::~DijkstraZone() { - xbt_graph_free_graph(routeGraph_, &xbt_free_f, &graph_edge_data_free, &xbt_free_f); - xbt_dict_free(&graphNodeMap_); - xbt_dict_free(&routeCache_); + xbt_graph_free_graph(routeGraph_, &graph_node_data_free, &graph_edge_data_free, nullptr); } /* 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) { - if (cached) - routeCache_ = xbt_dict_new_homogeneous(&route_cache_elem_free); } void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) @@ -325,8 +289,6 @@ void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) /* Create the topology graph */ if (not routeGraph_) routeGraph_ = xbt_graph_new_graph(1, nullptr); - if (not graphNodeMap_) - graphNodeMap_ = xbt_dict_new_homogeneous(&graph_node_map_elem_free); /* we don't check whether the route already exist, because the algorithm may find another path through some other * nodes */ @@ -337,20 +299,23 @@ void DijkstraZone::addRoute(sg_platf_route_cbarg_t route) // Symmetrical YES if (route->symmetrical == true) { - if (not route->gw_dst && not route->gw_src) - XBT_DEBUG("Load Route from \"%s\" to \"%s\"", 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_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 (edge) - THROWF(arg_error, 0, "Route from %s@%s to %s@%s already exists", dstName, route->gw_dst->name().c_str(), srcName, + if (not route->gw_dst || not route->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()); + 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()); + } if (route->gw_dst && route->gw_src) { NetPoint* gw_tmp = route->gw_src;