X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/95f98f86ddeb28cea15e126929f48d196160a316..dad398b4437e937d222bafff987814b8f2d80409:/src/surf/surf_routing_dijkstra.cpp diff --git a/src/surf/surf_routing_dijkstra.cpp b/src/surf/surf_routing_dijkstra.cpp index d3ae3358d5..62776a1bd4 100644 --- a/src/surf/surf_routing_dijkstra.cpp +++ b/src/surf/surf_routing_dijkstra.cpp @@ -1,18 +1,14 @@ -/* Copyright (c) 2009-2013. The SimGrid Team. +/* Copyright (c) 2009-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "surf_routing_dijkstra.hpp" -#include "network.hpp" +#include "src/surf/surf_routing_private.hpp" +#include "src/surf/surf_routing_dijkstra.hpp" +#include "src/surf/network_interface.hpp" -/* Global vars */ -extern routing_platf_t routing_platf; - -extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_dijkstra, surf, "Routing part of surf -- dijkstra routing logic"); -} /* Free functions */ @@ -41,16 +37,17 @@ static void graph_edge_data_free(void *e) // FIXME: useless code duplication } AS_t model_dijkstra_create(void){ - return new AsDijkstra(0); + return new simgrid::surf::AsDijkstra(0); } AS_t model_dijkstracache_create(void){ - return new AsDijkstra(1); + return new simgrid::surf::AsDijkstra(1); } void model_dijkstra_both_end(AS_t as) { - AsDijkstraPtr THIS_AS = static_cast(as); + simgrid::surf::AsDijkstra *THIS_AS + = static_cast(as); xbt_node_t node = NULL; unsigned int cursor2; xbt_dynar_t nodes = NULL; @@ -79,6 +76,9 @@ void model_dijkstra_both_end(AS_t as) /* Utility functions */ +namespace simgrid { +namespace surf { + xbt_node_t AsDijkstra::routeGraphNewNode(int id, int graph_id) { xbt_node_t node = NULL; @@ -178,23 +178,23 @@ void AsDijkstra::addLoopback() { xbt_dynar_t AsDijkstra::getOnelinkRoutes() { - xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free); + xbt_dynar_t ret = xbt_dynar_new(sizeof(Onelink*), xbt_free_f); sg_platf_route_cbarg_t route = xbt_new0(s_sg_platf_route_cbarg_t,1); route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t),NULL); int src,dst; - RoutingEdgePtr src_elm, dst_elm; - size_t table_size = xbt_dynar_length(p_indexNetworkElm); + NetCard *src_elm, *dst_elm; + int table_size = (int)xbt_dynar_length(p_indexNetworkElm); 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, RoutingEdgePtr); - dst_elm = xbt_dynar_get_as(p_indexNetworkElm, dst, RoutingEdgePtr); + src_elm = xbt_dynar_get_as(p_indexNetworkElm, src, NetCard*); + dst_elm = xbt_dynar_get_as(p_indexNetworkElm, 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); - OnelinkPtr onelink; + Onelink *onelink; if (p_hierarchy == SURF_ROUTING_BASE) onelink = new Onelink(link, src_elm, dst_elm); else if (p_hierarchy == SURF_ROUTING_RECURSIVE) @@ -208,17 +208,17 @@ xbt_dynar_t AsDijkstra::getOnelinkRoutes() return ret; } -void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t route, double *lat) +void AsDijkstra::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t route, double *lat) { /* set utils vars */ srcDstCheck(src, dst); - int *src_id = &(src->m_id); - int *dst_id = &(dst->m_id); + 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->p_name,dst->p_name); + THROWF(arg_error,0,"No route from '%s' to '%s'",src->getName(),dst->getName()); int *pred_arr = NULL; int src_node_id = 0; @@ -250,7 +250,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p 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->p_name, dst->p_name); + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getName(), dst->getName()); e_route = (sg_platf_route_cbarg_t) xbt_graph_edge_get_data(edge); @@ -258,7 +258,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p xbt_dynar_foreach(links, cpt, link) { xbt_dynar_unshift(route->link_list, &link); if (lat) - *lat += dynamic_cast(static_cast(link))->getLatency(); + *lat += static_cast(link)->getLatency(); } } @@ -280,7 +280,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p int nr_nodes = xbt_dynar_length(nodes); 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); + pqueue = xbt_heap_new(nr_nodes, xbt_free_f); /* initialize */ cost_arr[src_node_id] = 0.0; @@ -332,8 +332,8 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p } /* compose route path with links */ - RoutingEdgePtr gw_src = NULL, gw_dst, prev_gw_src, first_gw = NULL; - RoutingEdgePtr gw_dst_net_elm = NULL, prev_gw_src_net_elm = NULL; + 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 = @@ -343,7 +343,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p 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->p_name, dst->p_name); + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->getName(), dst->getName()); prev_gw_src = gw_src; @@ -355,18 +355,18 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p first_gw = gw_dst; if (p_hierarchy == SURF_ROUTING_RECURSIVE && v != dst_node_id - && strcmp(gw_dst->p_name, prev_gw_src->p_name)) { + && strcmp(gw_dst->getName(), prev_gw_src->getName())) { 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->p_name, dst->p_name); + THROWF(arg_error,0,"No route from '%s' to '%s'", src->getName(), dst->getName()); links = e_route_as_to_as; int pos = 0; xbt_dynar_foreach(links, cpt, link) { xbt_dynar_insert_at(route->link_list, pos, &link); if (lat) - *lat += dynamic_cast(static_cast(link))->getLatency(); + *lat += static_cast(link)->getLatency(); pos++; } } @@ -375,7 +375,7 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p xbt_dynar_foreach(links, cpt, link) { xbt_dynar_unshift(route->link_list, &link); if (lat) - *lat += dynamic_cast(static_cast(link))->getLatency(); + *lat += static_cast(link)->getLatency(); } size++; } @@ -400,8 +400,8 @@ void AsDijkstra::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_p AsDijkstra::~AsDijkstra() { - xbt_graph_free_graph(p_routeGraph, &xbt_free, - &graph_edge_data_free, &xbt_free); + 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); @@ -409,10 +409,17 @@ AsDijkstra::~AsDijkstra() /* Creation routing model functions */ -AsDijkstra::AsDijkstra() : AsGeneric(), m_cached(0) {} +AsDijkstra::AsDijkstra() : AsGeneric(), m_cached(0) { + p_routeGraph = NULL; + p_graphNodeMap = NULL; + p_routeCache = NULL; +} AsDijkstra::AsDijkstra(int 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; @@ -435,7 +442,7 @@ void AsDijkstra::end() if(!p_graphNodeMap) p_graphNodeMap = xbt_dict_new_homogeneous(&graph_node_map_elem_free); - if (m_cached && p_routeCache) + if (m_cached && !p_routeCache) p_routeCache = xbt_dict_new_homogeneous(&route_cache_elem_free); /* Add the loopback if needed */ @@ -467,18 +474,18 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route) 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->p_name, dst, route->gw_dst->p_name); + route->gw_src->getName(), dst, route->gw_dst->getName()); as_route = 1; - if(route->gw_dst->p_rcType == SURF_NETWORK_ELEMENT_NULL) - xbt_die("The gw_dst '%s' does not exist!",route->gw_dst->p_name); - if(route->gw_src->p_rcType == SURF_NETWORK_ELEMENT_NULL) - xbt_die("The gw_src '%s' does not exist!",route->gw_src->p_name); + if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL) + surf_parse_error("The gw_dst '%s' does not exist!",route->gw_dst->getName()); + if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL) + surf_parse_error("The gw_src '%s' does not exist!",route->gw_src->getName()); } - RoutingEdgePtr src_net_elm, dst_net_elm; + NetCard *src_net_elm, *dst_net_elm; - src_net_elm = sg_routing_edge_by_name_or_null(src); - dst_net_elm = sg_routing_edge_by_name_or_null(dst); + src_net_elm = sg_netcard_by_name_or_null(src); + 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); @@ -493,7 +500,7 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route) 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->m_id, dst_net_elm->m_id, e_route); + newRoute(src_net_elm->getId(), dst_net_elm->getId(), e_route); // Symmetrical YES if ( (route->symmetrical == TRUE && as_route == 0) @@ -504,11 +511,11 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route) 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->p_name, src, route->gw_src->p_name); + route->gw_dst->getName(), src, route->gw_src->getName()); xbt_dynar_t nodes = xbt_graph_get_nodes(p_routeGraph); - xbt_node_t node_s_v = xbt_dynar_get_as(nodes, src_net_elm->m_id, xbt_node_t); - xbt_node_t node_e_v = xbt_dynar_get_as(nodes, dst_net_elm->m_id, xbt_node_t); + 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); @@ -516,13 +523,16 @@ void AsDijkstra::parseRoute(sg_platf_route_cbarg_t route) THROWF(arg_error,0,"(AS)Route from '%s' to '%s' already exists",src,dst); if (route->gw_dst && route->gw_src) { - RoutingEdgePtr gw_tmp; + NetCard *gw_tmp; 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->m_id, src_net_elm->m_id, link_route_back); + newRoute(dst_net_elm->getId(), src_net_elm->getId(), link_route_back); } xbt_dynar_free(&route->link_list); } + +} +}