X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40d89d6d59e95c796444491689c9848e3c7fa332..fbc5196e44c92ef4ccda2fb737423e373c03d6f9:/src/surf/surf_routing_floyd.cpp diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp index b1b6909c3a..9a51912215 100644 --- a/src/surf/surf_routing_floyd.cpp +++ b/src/surf/surf_routing_floyd.cpp @@ -10,9 +10,9 @@ 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] -#define TO_FLOYD_LINK(i,j) (p_linkTable)[(i)+(j)*table_size] +#define TO_FLOYD_COST(i,j) (costTable_)[(i)+(j)*table_size] +#define TO_FLOYD_PRED(i,j) (predecessorTable_)[(i)+(j)*table_size] +#define TO_FLOYD_LINK(i,j) (linkTable_)[(i)+(j)*table_size] namespace simgrid { namespace surf { @@ -20,28 +20,28 @@ namespace surf { AsFloyd::AsFloyd(const char*name) : AsGeneric(name) { - p_predecessorTable = NULL; - p_costTable = NULL; - p_linkTable = NULL; + predecessorTable_ = NULL; + costTable_ = NULL; + linkTable_ = NULL; } AsFloyd::~AsFloyd(){ int i, j; int table_size; table_size = (int)xbt_dynar_length(vertices_); - if (p_linkTable == NULL) // Dealing with a parse error in the file? + if (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++) { routing_route_free(TO_FLOYD_LINK(i, j)); } - xbt_free(p_linkTable); + xbt_free(linkTable_); /* Delete bypass dict */ xbt_dict_free(&bypassRoutes_); /* Delete predecessor and cost table */ - xbt_free(p_predecessorTable); - xbt_free(p_costTable); + xbt_free(predecessorTable_); + xbt_free(costTable_); } /* Business methods */ @@ -49,7 +49,7 @@ xbt_dynar_t AsFloyd::getOneLinkRoutes() { 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); + route->link_list = xbt_dynar_new(sizeof(Link*), NULL); int src,dst; sg_netcard_t src_elm, dst_elm; @@ -81,10 +81,9 @@ xbt_dynar_t AsFloyd::getOneLinkRoutes() 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(vertices_); - this->srcDstCheck(src, dst); + getRouteCheckParams(src, dst); /* create a result route */ xbt_dynar_t route_stack = xbt_dynar_new(sizeof(sg_platf_route_cbarg_t), NULL); @@ -110,15 +109,13 @@ void AsFloyd::getRouteAndLatency(NetCard *src, NetCard *dst, sg_platf_route_cbar void *link; unsigned int cpt; - 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); + 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); } links = e_route->link_list; xbt_dynar_foreach(links, cpt, link) { - xbt_dynar_push_as(res->link_list, sg_routing_link_t, link); + xbt_dynar_push_as(res->link_list, Link*, (Link*)link); if (lat) *lat += static_cast(link)->getLatency(); } @@ -132,84 +129,55 @@ static int floyd_pointer_resource_cmp(const void *a, const void *b) { return a != b; } -void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) +void AsFloyd::addRoute(sg_platf_route_cbarg_t route) { - const char *src = route->src; - const char *dst = route->dst; - /* set the size of table routing */ int table_size = (int)xbt_dynar_length(vertices_); - NetCard *src_net_elm = sg_netcard_by_name_or_null(src); - NetCard *dst_net_elm = sg_netcard_by_name_or_null(dst); + NetCard *src = sg_netcard_by_name_or_null(route->src); + NetCard *dst = sg_netcard_by_name_or_null(route->dst); - xbt_assert(src_net_elm, "Network elements %s not found", src); - xbt_assert(dst_net_elm, "Network elements %s not found", dst); + addRouteCheckParams(route); - if(!p_linkTable) - { - int i,j; + if(!linkTable_) { /* Create Cost, Predecessor and Link tables */ - p_costTable = xbt_new0(double, table_size * table_size); /* link cost from host to host */ - p_predecessorTable = xbt_new0(int, table_size * table_size); /* predecessor host numbers */ - p_linkTable = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* actual link between src and dst */ + costTable_ = xbt_new0(double, table_size * table_size); /* link cost from host to host */ + predecessorTable_ = xbt_new0(int, table_size * table_size); /* predecessor host numbers */ + linkTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* actual link between src and dst */ /* Initialize costs and predecessors */ - for (i = 0; i < table_size; i++) - for (j = 0; j < table_size; j++) { + for (int i = 0; i < table_size; i++) + for (int j = 0; j < table_size; j++) { TO_FLOYD_COST(i, j) = DBL_MAX; TO_FLOYD_PRED(i, j) = -1; - TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */ + TO_FLOYD_LINK(i, j) = NULL; } } - 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->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->name()); - if(route->gw_src->getRcType() == SURF_NETWORK_ELEMENT_NULL) - surf_parse_error("The src_gateway '%s' does not exist!",route->gw_src->name()); - } - - if(TO_FLOYD_LINK(src_net_elm->id(), dst_net_elm->id())) - { - char * link_name; - unsigned int cpt; - 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 = 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->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); - } + /* Check that the route does not already exist */ + if (route->gw_dst) // AS route (to adapt the error message, if any) + xbt_assert(nullptr == TO_FLOYD_LINK(src->id(), dst->id()), + "The route between %s@%s and %s@%s already exists (Rq: routes are symmetrical by default).", + src->name(),route->gw_src->name(),dst->name(),route->gw_dst->name()); else - { - 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 */ - } + xbt_assert(nullptr == TO_FLOYD_LINK(src->id(), dst->id()), + "The route between %s and %s already exists (Rq: routes are symmetrical by default).", src->name(),dst->name()); + + TO_FLOYD_LINK(src->id(), dst->id()) = newExtendedRoute(hierarchy_, route, 1); + TO_FLOYD_PRED(src->id(), dst->id()) = src->id(); + TO_FLOYD_COST(src->id(), dst->id()) = ((TO_FLOYD_LINK(src->id(), dst->id()))->link_list)->used; + if (route->symmetrical == TRUE) { - if(TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id())) + if(TO_FLOYD_LINK(dst->id(), src->id())) { if(!route->gw_dst && !route->gw_src) - XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src); + XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst->name(), src->name()); else - XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, route->gw_src->name(), src, route->gw_dst->name()); + XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst->name(), route->gw_src->name(), src->name(), route->gw_dst->name()); char * link_name; - xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); + xbt_dynar_t link_route_to_test = xbt_dynar_new(sizeof(Link*), NULL); 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 = Link::byName(link_name); @@ -217,10 +185,10 @@ 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->id(), src_net_elm->id())->link_list, + TO_FLOYD_LINK(dst->id(), src->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); + "The route between \"%s\" and \"%s\" already exists", src->name(),dst->name()); } else { @@ -231,52 +199,51 @@ void AsFloyd::parseRoute(sg_platf_route_cbarg_t route) } if(!route->gw_src && !route->gw_dst) - XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src); + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst->name(), src->name()); else - XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, - route->gw_src->name(), src, route->gw_dst->name()); + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst->name(), + route->gw_src->name(), src->name(), route->gw_dst->name()); - TO_FLOYD_LINK(dst_net_elm->id(), src_net_elm->id()) = + TO_FLOYD_LINK(dst->id(), src->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 */ + TO_FLOYD_PRED(dst->id(), src->id()) = dst->id(); + TO_FLOYD_COST(dst->id(), src->id()) = + ((TO_FLOYD_LINK(dst->id(), src->id()))->link_list)->used; /* count of links, old model assume 1 */ } } xbt_dynar_free(&route->link_list); } void AsFloyd::Seal(){ - unsigned int i, j, a, b, c; /* set the size of table routing */ size_t table_size = xbt_dynar_length(vertices_); - if(!p_linkTable) { + if(!linkTable_) { /* Create Cost, Predecessor and Link tables */ - p_costTable = xbt_new0(double, table_size * table_size); /* link cost from host to host */ - p_predecessorTable = xbt_new0(int, table_size * table_size); /* predecessor host numbers */ - p_linkTable = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* actual link between src and dst */ + costTable_ = xbt_new0(double, table_size * table_size); /* link cost from host to host */ + predecessorTable_ = xbt_new0(int, table_size * table_size); /* predecessor host numbers */ + linkTable_ = xbt_new0(sg_platf_route_cbarg_t, table_size * table_size); /* actual link between src and dst */ /* Initialize costs and predecessors */ - for (i = 0; i < table_size; i++) - for (j = 0; j < table_size; j++) { + for (unsigned int i = 0; i < table_size; i++) + for (unsigned int j = 0; j < table_size; j++) { TO_FLOYD_COST(i, j) = DBL_MAX; TO_FLOYD_PRED(i, j) = -1; - TO_FLOYD_LINK(i, j) = NULL; /* fixed, missing in the previous version */ + TO_FLOYD_LINK(i, j) = NULL; } } /* Add the loopback if needed */ - if (routing_platf->p_loopback && hierarchy_ == SURF_ROUTING_BASE) { - for (i = 0; i < table_size; i++) { + if (routing_platf->loopback_ && hierarchy_ == SURF_ROUTING_BASE) { + for (unsigned int i = 0; i < table_size; i++) { sg_platf_route_cbarg_t e_route = TO_FLOYD_LINK(i, i); if (!e_route) { e_route = xbt_new0(s_sg_platf_route_cbarg_t, 1); e_route->gw_src = NULL; e_route->gw_dst = NULL; - e_route->link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); - xbt_dynar_push(e_route->link_list, &routing_platf->p_loopback); + e_route->link_list = xbt_dynar_new(sizeof(Link*), NULL); + xbt_dynar_push(e_route->link_list, &routing_platf->loopback_); TO_FLOYD_LINK(i, i) = e_route; TO_FLOYD_PRED(i, i) = i; TO_FLOYD_COST(i, i) = 1; @@ -284,9 +251,9 @@ void AsFloyd::Seal(){ } } /* Calculate path costs */ - for (c = 0; c < table_size; c++) { - for (a = 0; a < table_size; a++) { - for (b = 0; b < table_size; b++) { + for (unsigned int c = 0; c < table_size; c++) { + for (unsigned int a = 0; a < table_size; a++) { + for (unsigned int b = 0; b < table_size; b++) { if (TO_FLOYD_COST(a, c) < DBL_MAX && TO_FLOYD_COST(c, b) < DBL_MAX) { if (TO_FLOYD_COST(a, b) == DBL_MAX || (TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b) <