X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f06041cf2c450457a0b47a49b66b19cb9133c18e..104c3ca5da690c2296039f8e59dd47f1b496621e:/src/surf/surf_routing_floyd.cpp diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp index e87df4f4e7..4036f0b17c 100644 --- a/src/surf/surf_routing_floyd.cpp +++ b/src/surf/surf_routing_floyd.cpp @@ -1,11 +1,12 @@ -/* 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 * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "surf_routing_floyd.hpp" -#include "network_interface.hpp" +#include "src/surf/surf_routing_private.hpp" +#include "src/surf/surf_routing_floyd.hpp" +#include "src/surf/network_interface.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf"); @@ -13,17 +14,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route_floyd, surf, "Routing part of surf"); #define TO_FLOYD_PRED(i,j) (p_predecessorTable)[(i)+(j)*table_size] #define TO_FLOYD_LINK(i,j) (p_linkTable)[(i)+(j)*table_size] -AS_t model_floyd_create(void) -{ - return new AsFloyd(); -} +namespace simgrid { +namespace surf { -void model_floyd_end(AS_t current_routing) +AsFloyd::AsFloyd(const char*name) + : AsGeneric(name) { - static_cast(current_routing)->end(); -} - -AsFloyd::AsFloyd(): AsGeneric() { p_predecessorTable = NULL; p_costTable = NULL; p_linkTable = NULL; @@ -32,17 +28,17 @@ AsFloyd::AsFloyd(): AsGeneric() { AsFloyd::~AsFloyd(){ int i, j; int table_size; - table_size = (int)xbt_dynar_length(p_indexNetworkElm); + table_size = (int)xbt_dynar_length(vertices_); if (p_linkTable == NULL) // Dealing with a parse error in the file? - return; + 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)); - } + for (j = 0; j < table_size; j++) { + routing_route_free(TO_FLOYD_LINK(i, j)); + } xbt_free(p_linkTable); /* Delete bypass dict */ - xbt_dict_free(&p_bypassRoutes); + xbt_dict_free(&bypassRoutes_); /* Delete predecessor and cost table */ xbt_free(p_predecessorTable); xbt_free(p_costTable); @@ -51,26 +47,26 @@ AsFloyd::~AsFloyd(){ /* Business methods */ xbt_dynar_t AsFloyd::getOneLinkRoutes() { - xbt_dynar_t ret = xbt_dynar_new(sizeof(OnelinkPtr), xbt_free_f); + 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; - sg_routing_edge_t src_elm, dst_elm; - int table_size = xbt_dynar_length(p_indexNetworkElm); + sg_netcard_t src_elm, dst_elm; + int table_size = 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, RoutingEdgePtr); - dst_elm = xbt_dynar_get_as(p_indexNetworkElm, dst, RoutingEdgePtr); + 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); - OnelinkPtr onelink; - if (p_hierarchy == SURF_ROUTING_BASE) + Onelink *onelink; + 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); @@ -82,41 +78,41 @@ 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(NetCard *src, NetCard *dst, sg_platf_route_cbarg_t res, double *lat) { /* set utils vars */ - size_t table_size = xbt_dynar_length(p_indexNetworkElm); + size_t table_size = xbt_dynar_length(vertices_); this->srcDstCheck(src, dst); /* create a result route */ xbt_dynar_t route_stack = xbt_dynar_new(sizeof(sg_platf_route_cbarg_t), NULL); int pred; - int cur = dst->getId(); + int cur = dst->id(); do { - pred = TO_FLOYD_PRED(src->getId(), cur); + pred = TO_FLOYD_PRED(src->id(), cur); if (pred == -1) - 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()); xbt_dynar_push_as(route_stack, sg_platf_route_cbarg_t, TO_FLOYD_LINK(pred, cur)); cur = pred; - } while (cur != src->getId()); + } while (cur != src->id()); - if (p_hierarchy == SURF_ROUTING_RECURSIVE) { + if (hierarchy_ == SURF_ROUTING_RECURSIVE) { res->gw_src = xbt_dynar_getlast_as(route_stack, sg_platf_route_cbarg_t)->gw_src; res->gw_dst = xbt_dynar_getfirst_as(route_stack, sg_platf_route_cbarg_t)->gw_dst; } - sg_routing_edge_t prev_dst_gw = NULL; + sg_netcard_t prev_dst_gw = NULL; while (!xbt_dynar_is_empty(route_stack)) { sg_platf_route_cbarg_t e_route = xbt_dynar_pop_as(route_stack, sg_platf_route_cbarg_t); xbt_dynar_t links; void *link; unsigned int cpt; - if (p_hierarchy == SURF_ROUTING_RECURSIVE && prev_dst_gw != NULL - && strcmp(prev_dst_gw->getName(), e_route->gw_src->getName())) { - routing_get_route_and_latency(prev_dst_gw, e_route->gw_src, + if (hierarchy_ == SURF_ROUTING_RECURSIVE && prev_dst_gw != NULL + && strcmp(prev_dst_gw->name(), e_route->gw_src->name())) { + routing_platf->getRouteAndLatency(prev_dst_gw, e_route->gw_src, &res->link_list, lat); } @@ -124,7 +120,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; @@ -136,23 +132,18 @@ static int floyd_pointer_resource_cmp(const void *a, const void *b) { return a != b; } -void AsFloyd::parseASroute(sg_platf_route_cbarg_t route){ - parseRoute(route); -} - void AsFloyd::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; /* set the size of table routing */ - int table_size = (int)xbt_dynar_length(p_indexNetworkElm); - RoutingEdgePtr src_net_elm, dst_net_elm; + int table_size = (int)xbt_dynar_length(vertices_); - src_net_elm = sg_routing_edge_by_name_or_null(src); - dst_net_elm = sg_routing_edge_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); @@ -178,14 +169,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->getName(), dst, route->gw_dst->getName()); + route->gw_src->name(), dst, route->gw_dst->name()); if(route->gw_dst->getRcType() == SURF_NETWORK_ELEMENT_NULL) - surf_parse_error("The dst_gateway '%s' does not exist!",route->gw_dst->getName()); + surf_parse_error("The dst_gateway '%s' does not exist!",route->gw_dst->name()); if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL) - surf_parse_error("The src_gateway '%s' does not exist!",route->gw_src->getName()); + surf_parse_error("The src_gateway '%s' does not exist!",route->gw_src->name()); } - if(TO_FLOYD_LINK(src_net_elm->getId(), dst_net_elm->getId())) + if(TO_FLOYD_LINK(src_net_elm->id(), dst_net_elm->id())) { char * link_name; @@ -193,48 +184,46 @@ 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); } xbt_assert(!xbt_dynar_compare( - TO_FLOYD_LINK(src_net_elm->getId(), dst_net_elm->getId())->link_list, + TO_FLOYD_LINK(src_net_elm->id(), dst_net_elm->id())->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->getId(), dst_net_elm->getId()) = - newExtendedRoute(p_hierarchy, route, 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 */ + TO_FLOYD_LINK(src_net_elm->id(), dst_net_elm->id()) = + newExtendedRoute(hierarchy_, route, 1); + TO_FLOYD_PRED(src_net_elm->id(), dst_net_elm->id()) = src_net_elm->id(); + TO_FLOYD_COST(src_net_elm->id(), dst_net_elm->id()) = + ((TO_FLOYD_LINK(src_net_elm->id(), dst_net_elm->id()))->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->getId(), src_net_elm->getId())) + if(TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id())) { 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->getName(), src, route->gw_dst->getName()); + XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, route->gw_src->name(), src, route->gw_dst->name()); + char * link_name; - unsigned int i; xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); - for(i=xbt_dynar_length(route->link_list) ;i>0 ;i--) - { + for(int 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); } xbt_assert(!xbt_dynar_compare( - TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId())->link_list, + TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id())->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); @@ -243,8 +232,8 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) { if(route->gw_dst && route->gw_src) { - sg_routing_edge_t gw_src = route->gw_src; - sg_routing_edge_t gw_dst = route->gw_dst; + sg_netcard_t gw_src = route->gw_src; + sg_netcard_t gw_dst = route->gw_dst; route->gw_src = gw_dst; route->gw_dst = gw_src; } @@ -253,23 +242,23 @@ 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->getName(), src, route->gw_dst->getName()); + route->gw_src->name(), src, route->gw_dst->name()); - TO_FLOYD_LINK(dst_net_elm->getId(), src_net_elm->getId()) = - newExtendedRoute(p_hierarchy, route, 0); - 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 */ + TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id()) = + newExtendedRoute(hierarchy_, route, 0); + TO_FLOYD_PRED(dst_net_elm->id(), src_net_elm->id()) = dst_net_elm->id(); + TO_FLOYD_COST(dst_net_elm->id(), src_net_elm->id()) = + ((TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id()))->link_list)->used; /* count of links, old model assume 1 */ } } xbt_dynar_free(&route->link_list); } -void AsFloyd::end(){ +void AsFloyd::Seal(){ unsigned int i, j, a, b, c; /* set the size of table routing */ - size_t table_size = xbt_dynar_length(p_indexNetworkElm); + size_t table_size = xbt_dynar_length(vertices_); if(!p_linkTable) { /* Create Cost, Predecessor and Link tables */ @@ -287,7 +276,7 @@ void AsFloyd::end(){ } /* Add the loopback if needed */ - if (routing_platf->p_loopback && p_hierarchy == SURF_ROUTING_BASE) { + if (routing_platf->p_loopback && hierarchy_ == SURF_ROUTING_BASE) { for (i = 0; i < table_size; i++) { sg_platf_route_cbarg_t e_route = TO_FLOYD_LINK(i, i); if (!e_route) { @@ -319,3 +308,6 @@ void AsFloyd::end(){ } } } + +} +}