X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6de03ecc4e630732984a0673512a5d15fd75e270..638b21d2071c77f39da2f322156f05f75bf91517:/src/surf/surf_routing_floyd.cpp diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp index f116c4e8cc..8309a02721 100644 --- a/src/surf/surf_routing_floyd.cpp +++ b/src/surf/surf_routing_floyd.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2009-2014. 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 @@ -15,14 +15,17 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf"); AS_t model_floyd_create(void) { - return new AsFloyd(); + return new simgrid::surf::AsFloyd(); } void model_floyd_end(AS_t current_routing) { - static_cast(current_routing)->end(); + static_cast(current_routing)->end(); } +namespace simgrid { +namespace surf { + AsFloyd::AsFloyd(): AsGeneric() { p_predecessorTable = NULL; p_costTable = NULL; @@ -33,22 +36,25 @@ 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(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); @@ -58,13 +64,13 @@ xbt_dynar_t AsFloyd::getOneLinkRoutes() 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, RoutingEdge*); + dst_elm = xbt_dynar_get_as(p_indexNetworkElm, dst, RoutingEdge*); 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) @@ -79,7 +85,7 @@ xbt_dynar_t AsFloyd::getOneLinkRoutes() return ret; } -void AsFloyd::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t res, double *lat) +void AsFloyd::getRouteAndLatency(RoutingEdge *src, RoutingEdge *dst, sg_platf_route_cbarg_t res, double *lat) { /* set utils vars */ @@ -121,7 +127,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 += static_cast(link)->getLatency(); + *lat += static_cast(link)->getLatency(); } prev_dst_gw = e_route->gw_dst; @@ -146,7 +152,7 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) /* set the size of table routing */ int table_size = (int)xbt_dynar_length(p_indexNetworkElm); - RoutingEdgePtr src_net_elm, dst_net_elm; + RoutingEdge *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); @@ -177,9 +183,9 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->gw_src->getName(), dst, route->gw_dst->getName()); if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL) - xbt_die("The dst_gateway '%s' does not exist!",route->gw_dst->getName()); + surf_parse_error("The dst_gateway '%s' does not exist!",route->gw_dst->getName()); if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL) - xbt_die("The src_gateway '%s' does not exist!",route->gw_src->getName()); + surf_parse_error("The src_gateway '%s' does not exist!",route->gw_src->getName()); } if(TO_FLOYD_LINK(src_net_elm->getId(), dst_net_elm->getId())) @@ -190,7 +196,7 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); xbt_dynar_foreach(route->link_list,cpt,link_name) { - void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); + void *link = Link::byName(link_name); xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } @@ -226,7 +232,7 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) for(i=xbt_dynar_length(route->link_list) ;i>0 ;i--) { link_name = xbt_dynar_get_as(route->link_list,i-1,char *); - void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); + void *link = Link::byName(link_name); xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } @@ -316,3 +322,6 @@ void AsFloyd::end(){ } } } + +} +}