X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a243b4c3535f516d05259cac06963c422d4aadc0..fbc5196e44c92ef4ccda2fb737423e373c03d6f9:/src/surf/surf_routing_floyd.cpp diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp index 17472ea80a..9a51912215 100644 --- a/src/surf/surf_routing_floyd.cpp +++ b/src/surf/surf_routing_floyd.cpp @@ -1,72 +1,72 @@ -/* 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_floyd.hpp" -#include "network.hpp" +#include "src/surf/surf_routing_private.hpp" +#include "src/surf/surf_routing_floyd.hpp" +#include "src/surf/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] -#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] -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() { + predecessorTable_ = NULL; + costTable_ = NULL; + linkTable_ = NULL; } AsFloyd::~AsFloyd(){ int i, j; - size_t table_size; - table_size = 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); + int table_size; + table_size = (int)xbt_dynar_length(vertices_); + 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(linkTable_); + /* Delete bypass dict */ + xbt_dict_free(&bypassRoutes_); + /* Delete predecessor and cost table */ + xbt_free(predecessorTable_); + xbt_free(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); + route->link_list = xbt_dynar_new(sizeof(Link*), 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); @@ -78,49 +78,46 @@ 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); + getRouteCheckParams(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->m_id; + int cur = dst->id(); do { - pred = TO_FLOYD_PRED(src->m_id, cur); + pred = TO_FLOYD_PRED(src->id(), 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->name(), dst->name()); 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->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->p_name, e_route->gw_src->p_name)) { - routing_get_route_and_latency(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 += dynamic_cast(static_cast(link))->getLatency(); + *lat += static_cast(link)->getLatency(); } prev_dst_gw = e_route->gw_dst; @@ -132,166 +129,121 @@ 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) +void AsFloyd::addRoute(sg_platf_route_cbarg_t route) { - char *src = (char*)(route->src); - char *dst = (char*)(route->dst); - - int as_route = 0; - /* set the size of table routing */ - size_t table_size = 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 = 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{ - 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); - } - - if(TO_FLOYD_LINK(src_net_elm->m_id, dst_net_elm->m_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 = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); - 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->m_id, dst_net_elm->m_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->m_id, dst_net_elm->m_id) = - 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 */ - } + 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 && as_route == 0) - || (route->symmetrical == TRUE && as_route == 1) - ) - { - if(TO_FLOYD_LINK(dst_net_elm->m_id, src_net_elm->m_id)) + if (route->symmetrical == TRUE) { + 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->p_name, src, route->gw_dst->p_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; - 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--) - { + 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 = 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->m_id, src_net_elm->m_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 - { - 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; - route->gw_src = gw_dst; - route->gw_dst = gw_src; + else { + + if(route->gw_dst && route->gw_src) { + NetCard* gw_tmp = route->gw_src; + route->gw_src = route->gw_dst; + route->gw_dst = gw_tmp; } 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->p_name, src, route->gw_dst->p_name); - - TO_FLOYD_LINK(dst_net_elm->m_id, src_net_elm->m_id) = - 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 */ + 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->id(), src->id()) = + newExtendedRoute(hierarchy_, route, 0); + 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::end(){ - unsigned int i, j, a, b, c; +void AsFloyd::Seal(){ /* 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) { + 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 && p_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; @@ -299,9 +251,9 @@ void AsFloyd::end(){ } } /* 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) < @@ -315,3 +267,6 @@ void AsFloyd::end(){ } } } + +} +}