X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40d3b67a85d3234e873dd757fa6d863d58707534..3dbeba193df2e406bd9eff5be73c8bce0db0185e:/src/surf/surf_routing_floyd.cpp diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp index 6bd1969333..e87df4f4e7 100644 --- a/src/surf/surf_routing_floyd.cpp +++ b/src/surf/surf_routing_floyd.cpp @@ -1,15 +1,13 @@ -/* Copyright (c) 2009-2013. The SimGrid Team. +/* Copyright (c) 2009-2014. 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_floyd.hpp" -#include "network.hpp" +#include "network_interface.hpp" -extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf"); -} #define TO_FLOYD_COST(i,j) (p_costTable)[(i)+(j)*table_size] #define TO_FLOYD_PRED(i,j) (p_predecessorTable)[(i)+(j)*table_size] @@ -26,28 +24,34 @@ void model_floyd_end(AS_t current_routing) } AsFloyd::AsFloyd(): AsGeneric() { + p_predecessorTable = NULL; + p_costTable = NULL; + p_linkTable = NULL; } AsFloyd::~AsFloyd(){ int i, j; int table_size; table_size = (int)xbt_dynar_length(p_indexNetworkElm); - /* Delete link_table */ - for (i = 0; i < table_size; i++) - for (j = 0; j < table_size; j++) - generic_free_route(TO_FLOYD_LINK(i, j)); - xbt_free(p_linkTable); - /* Delete bypass dict */ - xbt_dict_free(&p_bypassRoutes); - /* Delete predecessor and cost table */ - xbt_free(p_predecessorTable); - xbt_free(p_costTable); + if (p_linkTable == NULL) // Dealing with a parse error in the file? + return; + /* Delete link_table */ + for (i = 0; i < table_size; i++) + for (j = 0; j < table_size; j++) { + generic_free_route(TO_FLOYD_LINK(i, j)); + } + xbt_free(p_linkTable); + /* Delete bypass dict */ + xbt_dict_free(&p_bypassRoutes); + /* Delete predecessor and cost table */ + xbt_free(p_predecessorTable); + xbt_free(p_costTable); } /* Business methods */ xbt_dynar_t AsFloyd::getOneLinkRoutes() { - xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free); + xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), 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); @@ -89,14 +93,14 @@ void AsFloyd::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_plat /* create a result route */ xbt_dynar_t route_stack = xbt_dynar_new(sizeof(sg_platf_route_cbarg_t), NULL); int pred; - int cur = dst->m_id; + int cur = dst->getId(); do { - pred = TO_FLOYD_PRED(src->m_id, cur); + pred = TO_FLOYD_PRED(src->getId(), cur); if (pred == -1) - 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()); xbt_dynar_push_as(route_stack, sg_platf_route_cbarg_t, TO_FLOYD_LINK(pred, cur)); cur = pred; - } while (cur != src->m_id); + } while (cur != src->getId()); if (p_hierarchy == SURF_ROUTING_RECURSIVE) { res->gw_src = xbt_dynar_getlast_as(route_stack, sg_platf_route_cbarg_t)->gw_src; @@ -111,7 +115,7 @@ void AsFloyd::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_plat unsigned int cpt; if (p_hierarchy == SURF_ROUTING_RECURSIVE && prev_dst_gw != NULL - && strcmp(prev_dst_gw->p_name, e_route->gw_src->p_name)) { + && strcmp(prev_dst_gw->getName(), e_route->gw_src->getName())) { routing_get_route_and_latency(prev_dst_gw, e_route->gw_src, &res->link_list, lat); } @@ -120,7 +124,7 @@ void AsFloyd::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_plat xbt_dynar_foreach(links, cpt, link) { xbt_dynar_push_as(res->link_list, sg_routing_link_t, link); if (lat) - *lat += dynamic_cast(static_cast(link))->getLatency(); + *lat += static_cast(link)->getLatency(); } prev_dst_gw = e_route->gw_dst; @@ -174,14 +178,14 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) else{ as_route = 1; XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, - route->gw_src->p_name, dst, route->gw_dst->p_name); - if(route->gw_dst->p_rcType == SURF_NETWORK_ELEMENT_NULL) - xbt_die("The dst_gateway '%s' does not exist!",route->gw_dst->p_name); - if(route->gw_src->p_rcType == SURF_NETWORK_ELEMENT_NULL) - xbt_die("The src_gateway '%s' does not exist!",route->gw_src->p_name); + route->gw_src->getName(), dst, route->gw_dst->getName()); + if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL) + surf_parse_error("The dst_gateway '%s' does not exist!",route->gw_dst->getName()); + if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL) + surf_parse_error("The src_gateway '%s' does not exist!",route->gw_src->getName()); } - if(TO_FLOYD_LINK(src_net_elm->m_id, dst_net_elm->m_id)) + if(TO_FLOYD_LINK(src_net_elm->getId(), dst_net_elm->getId())) { char * link_name; @@ -194,31 +198,31 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) xbt_dynar_push(link_route_to_test,&link); } xbt_assert(!xbt_dynar_compare( - TO_FLOYD_LINK(src_net_elm->m_id, dst_net_elm->m_id)->link_list, + TO_FLOYD_LINK(src_net_elm->getId(), dst_net_elm->getId())->link_list, link_route_to_test, (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists", src,dst); } else { - TO_FLOYD_LINK(src_net_elm->m_id, dst_net_elm->m_id) = + TO_FLOYD_LINK(src_net_elm->getId(), dst_net_elm->getId()) = newExtendedRoute(p_hierarchy, route, 1); - TO_FLOYD_PRED(src_net_elm->m_id, dst_net_elm->m_id) = src_net_elm->m_id; - TO_FLOYD_COST(src_net_elm->m_id, dst_net_elm->m_id) = - ((TO_FLOYD_LINK(src_net_elm->m_id, dst_net_elm->m_id))->link_list)->used; /* count of links, old model assume 1 */ + TO_FLOYD_PRED(src_net_elm->getId(), dst_net_elm->getId()) = src_net_elm->getId(); + TO_FLOYD_COST(src_net_elm->getId(), dst_net_elm->getId()) = + ((TO_FLOYD_LINK(src_net_elm->getId(), dst_net_elm->getId()))->link_list)->used; /* count of links, old model assume 1 */ } if ( (route->symmetrical == TRUE && as_route == 0) || (route->symmetrical == TRUE && as_route == 1) ) { - if(TO_FLOYD_LINK(dst_net_elm->m_id, src_net_elm->m_id)) + if(TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId())) { if(!route->gw_dst && !route->gw_src) XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src); else XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, - route->gw_src->p_name, src, route->gw_dst->p_name); + route->gw_src->getName(), src, route->gw_dst->getName()); char * link_name; unsigned int i; xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); @@ -230,7 +234,7 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) xbt_dynar_push(link_route_to_test,&link); } xbt_assert(!xbt_dynar_compare( - TO_FLOYD_LINK(dst_net_elm->m_id, src_net_elm->m_id)->link_list, + TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId())->link_list, link_route_to_test, (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists", src,dst); @@ -249,13 +253,13 @@ void AsFloyd::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_src->p_name, src, route->gw_dst->p_name); + route->gw_src->getName(), src, route->gw_dst->getName()); - TO_FLOYD_LINK(dst_net_elm->m_id, src_net_elm->m_id) = + TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId()) = newExtendedRoute(p_hierarchy, route, 0); - TO_FLOYD_PRED(dst_net_elm->m_id, src_net_elm->m_id) = dst_net_elm->m_id; - TO_FLOYD_COST(dst_net_elm->m_id, src_net_elm->m_id) = - ((TO_FLOYD_LINK(dst_net_elm->m_id, src_net_elm->m_id))->link_list)->used; /* count of links, old model assume 1 */ + TO_FLOYD_PRED(dst_net_elm->getId(), src_net_elm->getId()) = dst_net_elm->getId(); + TO_FLOYD_COST(dst_net_elm->getId(), src_net_elm->getId()) = + ((TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId()))->link_list)->used; /* count of links, old model assume 1 */ } } xbt_dynar_free(&route->link_list);