X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/17023af1f7484d0592aa37f08bcd35e7dda3efe3..104c3ca5da690c2296039f8e59dd47f1b496621e:/src/surf/surf_routing_dijkstra.cpp diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp index c5cf6a33a9..d1e3350cca 100644 --- a/src/surf/surf_routing_dijkstra.cpp +++ b/src/surf/surf_routing_dijkstra.cpp @@ -48,11 +48,8 @@ void AsDijkstra::Seal() if(!p_graphNodeMap) p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free); - if (m_cached && !p_routeCache) - p_routeCache = xbt_dict_new_homogeneous(&route_cache_elem_free); - /* Add the loopback if needed */ - if (routing_platf->p_loopback && p_hierarchy == SURF_ROUTING_BASE) + if (routing_platf->p_loopback && hierarchy_ == SURF_ROUTING_BASE) addLoopback(); /* initialize graph indexes in nodes after graph has been built */ @@ -171,20 +168,20 @@ xbt_dynar_t AsDijkstra::getOneLinkRoutes() int src,dst; NetCard *src_elm, *dst_elm; - int table_size = (int)xbt_dynar_length(p_indexNetworkElm); + int table_size = (int)xbt_dynar_length(vertices_); for(src=0; src < table_size; src++) { for(dst=0; dst< table_size; dst++) { xbt_dynar_reset(route->link_list); - src_elm = xbt_dynar_get_as(p_indexNetworkElm, src, NetCard*); - dst_elm = xbt_dynar_get_as(p_indexNetworkElm, dst, NetCard*); + src_elm = xbt_dynar_get_as(vertices_, src, NetCard*); + dst_elm = xbt_dynar_get_as(vertices_, dst, NetCard*); this->getRouteAndLatency(src_elm, dst_elm,route, NULL); if (xbt_dynar_length(route->link_list) == 1) { void *link = *(void **) xbt_dynar_get_ptr(route->link_list, 0); Onelink *onelink; - if (p_hierarchy == SURF_ROUTING_BASE) + if (hierarchy_ == SURF_ROUTING_BASE) onelink = new Onelink(link, src_elm, dst_elm); - else if (p_hierarchy == SURF_ROUTING_RECURSIVE) + else if (hierarchy_ == SURF_ROUTING_RECURSIVE) onelink = new Onelink(link, route->gw_src, route->gw_dst); else onelink = new Onelink(link, NULL, NULL); @@ -201,33 +198,22 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c /* set utils vars */ srcDstCheck(src, dst); - int *src_id = src->getIdPtr(); - int *dst_id = dst->getIdPtr(); - - if (!src_id || !dst_id) - THROWF(arg_error,0,"No route from '%s' to '%s'",src->getName(),dst->getName()); + int src_id = src->id(); + int dst_id = dst->id(); int *pred_arr = NULL; - int src_node_id = 0; - int dst_node_id = 0; - int *nodeid = NULL; - int v; sg_platf_route_cbarg_t e_route; int size = 0; unsigned int cpt; void *link; - xbt_dynar_t links = NULL; - route_cache_element_t elm = NULL; xbt_dynar_t nodes = xbt_graph_get_nodes(p_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); + graph_node_map_element_t src_elm = nodeMapSearch(src_id); + graph_node_map_element_t dst_elm = nodeMapSearch(dst_id); - src_node_id = ((graph_node_data_t) - xbt_graph_node_get_data(src_elm->node))->graph_id; - dst_node_id = ((graph_node_data_t) - xbt_graph_node_get_data(dst_elm->node))->graph_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; /* if the src and dst are the same */ if (src_node_id == dst_node_id) { @@ -237,12 +223,11 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c xbt_edge_t edge = xbt_graph_get_edge(p_routeGraph, node_s_v, node_e_v); if (edge == NULL) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getName(), dst->getName()); + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name(), dst->name()); e_route = (sg_platf_route_cbarg_t) xbt_graph_edge_get_data(edge); - links = e_route->link_list; - xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_foreach(e_route->link_list, cpt, link) { xbt_dynar_unshift(route->link_list, &link); if (lat) *lat += static_cast(link)->getLatency(); @@ -250,29 +235,25 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c } - if (m_cached) { - /*check if there is a cached predecessor list avail */ + route_cache_element_t elm = NULL; + if (p_routeCache) { /* cache mode */ elm = (route_cache_element_t) - xbt_dict_get_or_null_ext(p_routeCache, (char *) (&src_id), - sizeof(int)); + xbt_dict_get_or_null_ext(p_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 */ - double *cost_arr = NULL; - xbt_heap_t pqueue = NULL; - int i = 0; + } else { /* not cached mode, or cache miss */ int nr_nodes = xbt_dynar_length(nodes); - cost_arr = xbt_new0(double, nr_nodes); /* link cost from src to other hosts */ + 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 */ - pqueue = xbt_heap_new(nr_nodes, xbt_free_f); + xbt_heap_t pqueue = xbt_heap_new(nr_nodes, xbt_free_f); /* initialize */ cost_arr[src_node_id] = 0.0; - for (i = 0; i < nr_nodes; i++) { + for (int i = 0; i < nr_nodes; i++) { if (i != src_node_id) { cost_arr[i] = DBL_MAX; } @@ -280,7 +261,7 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c pred_arr[i] = 0; /* initialize priority queue */ - nodeid = xbt_new0(int, 1); + int *nodeid = xbt_new0(int, 1); *nodeid = i; xbt_heap_push(pqueue, nodeid, cost_arr[i]); @@ -290,11 +271,10 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c while (xbt_heap_size(pqueue) > 0) { int *v_id = (int *) xbt_heap_pop(pqueue); xbt_node_t v_node = xbt_dynar_get_as(nodes, *v_id, xbt_node_t); - xbt_dynar_t out_edges = xbt_graph_node_get_outedges(v_node); xbt_edge_t edge = NULL; unsigned int cursor; - xbt_dynar_foreach(out_edges, cursor, edge) { + 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); int u_id = data->graph_id; @@ -304,7 +284,7 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c 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]; - nodeid = xbt_new0(int, 1); + int *nodeid = xbt_new0(int, 1); *nodeid = u_id; xbt_heap_push(pqueue, nodeid, cost_arr[u_id]); } @@ -322,15 +302,13 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c NetCard *gw_src = NULL, *gw_dst, *prev_gw_src, *first_gw = NULL; NetCard *gw_dst_net_elm = NULL, *prev_gw_src_net_elm = NULL; - for (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); + 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); xbt_node_t node_v = xbt_dynar_get_as(nodes, v, xbt_node_t); - xbt_edge_t edge = - xbt_graph_get_edge(p_routeGraph, node_pred_v, node_v); + xbt_edge_t edge = xbt_graph_get_edge(p_routeGraph, node_pred_v, node_v); if (edge == NULL) - THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getName(), dst->getName()); + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->name(), dst->name()); prev_gw_src = gw_src; @@ -341,16 +319,15 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c if (v == dst_node_id) first_gw = gw_dst; - if (p_hierarchy == SURF_ROUTING_RECURSIVE && v != dst_node_id - && strcmp(gw_dst->getName(), prev_gw_src->getName())) { + if (hierarchy_ == SURF_ROUTING_RECURSIVE && v != dst_node_id + && strcmp(gw_dst->name(), prev_gw_src->name())) { xbt_dynar_t e_route_as_to_as=NULL; routing_platf->getRouteAndLatency(gw_dst_net_elm, prev_gw_src_net_elm, &e_route_as_to_as, NULL); if (edge == NULL) - THROWF(arg_error,0,"No route from '%s' to '%s'", src->getName(), dst->getName()); - links = e_route_as_to_as; + THROWF(arg_error,0,"No route from '%s' to '%s'", src->name(), dst->name()); int pos = 0; - xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_foreach(e_route_as_to_as, cpt, link) { xbt_dynar_insert_at(route->link_list, pos, &link); if (lat) *lat += static_cast(link)->getLatency(); @@ -358,8 +335,7 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c } } - links = e_route->link_list; - xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_foreach(e_route->link_list, cpt, link) { xbt_dynar_unshift(route->link_list, &link); if (lat) *lat += static_cast(link)->getLatency(); @@ -367,109 +343,59 @@ void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_c size++; } - if (p_hierarchy == SURF_ROUTING_RECURSIVE) { + if (hierarchy_ == SURF_ROUTING_RECURSIVE) { route->gw_src = gw_src; route->gw_dst = first_gw; } - if (m_cached && elm == NULL) { + if (p_routeCache && elm == NULL) { /* 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(p_routeCache, (char *) (&src_id), sizeof(int), - (xbt_dictelm_t) elm, NULL); + xbt_dict_set_ext(p_routeCache, (char *) (&src_id), sizeof(int), (xbt_dictelm_t) elm, NULL); } - if (!m_cached) + if (!p_routeCache) xbt_free(pred_arr); } AsDijkstra::~AsDijkstra() { - xbt_graph_free_graph(p_routeGraph, &xbt_free_f, - &graph_edge_data_free, &xbt_free_f); + xbt_graph_free_graph(p_routeGraph, &xbt_free_f, &graph_edge_data_free, &xbt_free_f); xbt_dict_free(&p_graphNodeMap); - if (m_cached) - xbt_dict_free(&p_routeCache); + xbt_dict_free(&p_routeCache); } /* Creation routing model functions */ -AsDijkstra::AsDijkstra() : AsGeneric() { -} - -AsDijkstra::AsDijkstra(bool cached) : AsGeneric(), m_cached(cached) -{ - p_routeGraph = NULL; - p_graphNodeMap = NULL; - p_routeCache = NULL; - /*new_component->generic_routing.parse_route = model_dijkstra_both_parse_route; - new_component->generic_routing.parse_ASroute = model_dijkstra_both_parse_route; - new_component->generic_routing.get_route_and_latency = dijkstra_get_route_and_latency; - new_component->generic_routing.get_onelink_routes = - dijkstra_get_onelink_routes; - new_component->generic_routing.get_graph = generic_get_graph; - new_component->generic_routing.finalize = dijkstra_finalize; - new_component->cached = cached;*/ -} - -void AsDijkstra::end() +AsDijkstra::AsDijkstra(const char*name, bool cached) + : AsGeneric(name) { - xbt_node_t node = NULL; - unsigned int cursor2; - xbt_dynar_t nodes = NULL; - - /* Create the topology graph */ - if(!p_routeGraph) - p_routeGraph = xbt_graph_new_graph(1, NULL); - if(!p_graphNodeMap) - p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free); - - if (m_cached && !p_routeCache) + if (cached) p_routeCache = xbt_dict_new_homogeneous(&route_cache_elem_free); - - /* Add the loopback if needed */ - if (routing_platf->p_loopback && p_hierarchy == SURF_ROUTING_BASE) - addLoopback(); - - /* initialize graph indexes in nodes after graph has been built */ - nodes = xbt_graph_get_nodes(p_routeGraph); - - xbt_dynar_foreach(nodes, cursor2, node) { - graph_node_data_t data = (graph_node_data_t) xbt_graph_node_get_data(node); - data->graph_id = cursor2; - } - -} - -void AsDijkstra::parseASroute(sg_platf_route_cbarg_t route) -{ - parseRoute(route); } void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route) { - char *src = (char*)(route->src); - char *dst = (char*)(route->dst); + const char *src = route->src; + const char *dst = route->dst; int as_route = 0; if(!route->gw_dst && !route->gw_src) XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); else{ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, - route->gw_src->getName(), dst, route->gw_dst->getName()); + route->gw_src->name(), dst, route->gw_dst->name()); as_route = 1; if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL) - surf_parse_error("The gw_dst '%s' does not exist!",route->gw_dst->getName()); + surf_parse_error("The gw_dst '%s' does not exist!",route->gw_dst->name()); if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL) - surf_parse_error("The gw_src '%s' does not exist!",route->gw_src->getName()); + surf_parse_error("The gw_src '%s' does not exist!",route->gw_src->name()); } - NetCard *src_net_elm, *dst_net_elm; - - src_net_elm = sg_netcard_by_name_or_null(src); - dst_net_elm = sg_netcard_by_name_or_null(dst); + NetCard *src_net_elm = sg_netcard_by_name_or_null(src); + NetCard *dst_net_elm = sg_netcard_by_name_or_null(dst); xbt_assert(src_net_elm, "Network elements %s not found", src); xbt_assert(dst_net_elm, "Network elements %s not found", dst); @@ -480,40 +406,32 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route) if(!p_graphNodeMap) p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free); - if (m_cached && !p_routeCache) - p_routeCache = xbt_dict_new_homogeneous(&route_cache_elem_free); - - sg_platf_route_cbarg_t e_route = newExtendedRoute(p_hierarchy, route, 1); - newRoute(src_net_elm->getId(), dst_net_elm->getId(), e_route); + sg_platf_route_cbarg_t e_route = newExtendedRoute(hierarchy_, route, 1); + newRoute(src_net_elm->id(), dst_net_elm->id(), e_route); // Symmetrical YES - if ( (route->symmetrical == TRUE && as_route == 0) - || (route->symmetrical == TRUE && as_route == 1) - ) - { + if ( (route->symmetrical == TRUE && as_route == 0) || (route->symmetrical == TRUE && as_route == 1) ) { if(!route->gw_dst && !route->gw_src) XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src); else XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, - route->gw_dst->getName(), src, route->gw_src->getName()); + route->gw_dst->name(), src, route->gw_src->name()); xbt_dynar_t nodes = xbt_graph_get_nodes(p_routeGraph); - xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_net_elm->getId(), xbt_node_t); - xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_net_elm->getId(), xbt_node_t); - xbt_edge_t edge = - xbt_graph_get_edge(p_routeGraph, node_e_v, node_s_v); + xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_net_elm->id(), xbt_node_t); + xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_net_elm->id(), xbt_node_t); + xbt_edge_t edge = xbt_graph_get_edge(p_routeGraph, node_e_v, node_s_v); if (edge) - THROWF(arg_error,0,"(AS)Route from '%s' to '%s' already exists",src,dst); + THROWF(arg_error,0, "Route from '%s' to '%s' already exists",src,dst); if (route->gw_dst && route->gw_src) { - NetCard *gw_tmp; - gw_tmp = route->gw_src; + NetCard *gw_tmp = route->gw_src; route->gw_src = route->gw_dst; route->gw_dst = gw_tmp; } - sg_platf_route_cbarg_t link_route_back = newExtendedRoute(p_hierarchy, route, 0); - newRoute(dst_net_elm->getId(), src_net_elm->getId(), link_route_back); + sg_platf_route_cbarg_t link_route_back = newExtendedRoute(hierarchy_, route, 0); + newRoute(dst_net_elm->id(), src_net_elm->id(), link_route_back); } xbt_dynar_free(&route->link_list); }