From 7a2239ec54871d5915bcda2805058dda328b5795 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Paul=20B=C3=A9daride?= Date: Mon, 14 Oct 2013 11:00:20 +0200 Subject: [PATCH] Add Floyd routing --- include/simgrid/platf.h | 2 +- src/surf/surf_routing_floyd.c | 4 +- src/surf/surf_routing_floyd.cpp | 300 +++++++++++++++++++++++++++++- src/surf/surf_routing_floyd.hpp | 44 +++++ src/surf/surf_routing_generic.hpp | 2 + 5 files changed, 347 insertions(+), 5 deletions(-) create mode 100644 src/surf/surf_routing_floyd.hpp diff --git a/include/simgrid/platf.h b/include/simgrid/platf.h index 2b1f15c3cf..2fa1d1f180 100644 --- a/include/simgrid/platf.h +++ b/include/simgrid/platf.h @@ -10,7 +10,7 @@ #include -typedef void *sg_routing_link_t; /* The actual type is model-dependent so use void* instead*/ +typedef void *sg_routing_link_t; /* FIXME:The actual type is model-dependent so use void* instead*/ typedef struct RoutingEdge *sg_routing_edge_t; #ifdef __cplusplus diff --git a/src/surf/surf_routing_floyd.c b/src/surf/surf_routing_floyd.c index 0f08c52a98..b7160b15d5 100644 --- a/src/surf/surf_routing_floyd.c +++ b/src/surf/surf_routing_floyd.c @@ -179,7 +179,7 @@ void model_floyd_end(AS_t current_routing) } /* Add the loopback if needed */ - if (routing_platf->loopback && current_routing->hierarchy == SURF_ROUTING_BASE) { + if (routing_platf->p_loopback && current_routing->p_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) { @@ -187,7 +187,7 @@ void model_floyd_end(AS_t current_routing) 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->loopback); + xbt_dynar_push(e_route->link_list, &routing_platf->p_loopback); TO_FLOYD_LINK(i, i) = e_route; TO_FLOYD_PRED(i, i) = i; TO_FLOYD_COST(i, i) = 1; diff --git a/src/surf/surf_routing_floyd.cpp b/src/surf/surf_routing_floyd.cpp index 28d759635c..f3c72ab316 100644 --- a/src/surf/surf_routing_floyd.cpp +++ b/src/surf/surf_routing_floyd.cpp @@ -1,14 +1,310 @@ #include "surf_routing_private.h" +#include "surf_routing_floyd.hpp" +#include "network.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] + AS_t model_floyd_create(void) -{//FIXME: +{ + return new AsFloyd(); } void model_floyd_end(AS_t current_routing) { -//FIXME: + static_cast(current_routing)->end(); +} + +AsFloyd::AsFloyd(): AsGeneric() { +} + +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); +} + +/* Business methods */ +xbt_dynar_t AsFloyd::getOneLinkRoutes() +{ + xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free); + 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); + 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); + 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); + onelink_t onelink = xbt_new0(s_onelink_t, 1); + onelink->link_ptr = link; + if (p_hierarchy == SURF_ROUTING_BASE) { + onelink->src = src_elm; + onelink->dst = dst_elm; + } else if (p_hierarchy == SURF_ROUTING_RECURSIVE) { + onelink->src = route->gw_src; + onelink->dst = route->gw_dst; + } + xbt_dynar_push(ret, &onelink); + } + } + } + + return ret; +} + +void AsFloyd::getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t res, double *lat) +{ + + /* set utils vars */ + size_t table_size = xbt_dynar_length(p_indexNetworkElm); + + 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->m_id; + do { + pred = TO_FLOYD_PRED(src->m_id, cur); + if (pred == -1) + THROWF(arg_error, 0, "No route from '%s' to '%s'", src->p_name, dst->p_name); + xbt_dynar_push_as(route_stack, sg_platf_route_cbarg_t, TO_FLOYD_LINK(pred, cur)); + cur = pred; + } while (cur != src->m_id); + + if (p_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; + 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; + NetworkCm02LinkPtr 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); + } + + links = e_route->link_list; + xbt_dynar_foreach(links, cpt, link) { + xbt_dynar_push_as(res->link_list, sg_routing_link_t, link); + if (lat) + *lat += link->getLatency(); + } + + prev_dst_gw = e_route->gw_dst; + } + xbt_dynar_free(&route_stack); +} + +static int floyd_pointer_resource_cmp(const void *a, const void *b) { + return a != b; +} + +void AsFloyd::parseRoute(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; + + src_net_elm = sg_routing_edge_by_name_or_null(src); + dst_net_elm = sg_routing_edge_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); + + if(!p_linkTable) + { + int i,j; + /* 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 */ + + /* Initialize costs and predecessors */ + for (i = 0; i < table_size; i++) + for (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 */ + } + } + 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); + } + 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 */ + } + + 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->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); + 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--) + { + 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); + 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, + link_route_to_test, + (int_f_cpvoid_cpvoid_t) floyd_pointer_resource_cmp), + "The route between \"%s\" and \"%s\" already exists", src,dst); + } + 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; + } + + if(!route->gw_src && !route->gw_dst) + 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); + + 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_dynar_free(&route->link_list); +} + +void AsFloyd::end(){ + unsigned int i, j, a, b, c; + + /* set the size of table routing */ + size_t table_size = xbt_dynar_length(p_indexNetworkElm); + + if(!p_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 */ + + /* Initialize costs and predecessors */ + for (i = 0; i < table_size; i++) + for (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 */ + } + } + + /* Add the loopback if needed */ + if (routing_platf->p_loopback && p_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) { + 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); + TO_FLOYD_LINK(i, i) = e_route; + TO_FLOYD_PRED(i, i) = i; + TO_FLOYD_COST(i, i) = 1; + } + } + } + /* Calculate path costs */ + for (c = 0; c < table_size; c++) { + for (a = 0; a < table_size; a++) { + for (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) < + TO_FLOYD_COST(a, b))) { + TO_FLOYD_COST(a, b) = + TO_FLOYD_COST(a, c) + TO_FLOYD_COST(c, b); + TO_FLOYD_PRED(a, b) = TO_FLOYD_PRED(c, b); + } + } + } + } + } } diff --git a/src/surf/surf_routing_floyd.hpp b/src/surf/surf_routing_floyd.hpp new file mode 100644 index 0000000000..72ada10070 --- /dev/null +++ b/src/surf/surf_routing_floyd.hpp @@ -0,0 +1,44 @@ +#include "surf_routing_generic.hpp" + +#ifndef SURF_ROUTING_FLOYD_HPP_ +#define SURF_ROUTING_FLOYD_HPP_ + + +/*********** + * Classes * + ***********/ +class AsFloyd; +typedef AsFloyd *AsFloydPtr; + +class AsFloyd: public AsGeneric { +public: + AsFloyd(); + ~AsFloyd(); + + void getRouteAndLatency(RoutingEdgePtr src, RoutingEdgePtr dst, sg_platf_route_cbarg_t into, double *latency); + xbt_dynar_t getOneLinkRoutes(); + void parseRoute(sg_platf_route_cbarg_t route); + void end(); + //void parseASroute(sg_platf_route_cbarg_t route); + + //void getGraph(xbt_graph_t graph, xbt_dict_t nodes, xbt_dict_t edges); + //sg_platf_route_cbarg_t getBypassRoute(RoutingEdgePtr src, RoutingEdgePtr dst, double *lat); + + /* The parser calls the following functions to inform the routing models + * that a new element is added to the AS currently built. + * + * Of course, only the routing model of this AS is informed, not every ones */ + //int parsePU(RoutingEdgePtr elm); /* A host or a router, whatever */ + //int parseAS(RoutingEdgePtr elm); + + //virtual void parseBypassroute(sg_platf_route_cbarg_t e_route)=0; + + /* vars for calculate the floyd algorith. */ + int *p_predecessorTable; + double *p_costTable; + sg_platf_route_cbarg_t *p_linkTable; +}; + + + +#endif /* SURF_ROUTING_FLOYD_HPP_ */ diff --git a/src/surf/surf_routing_generic.hpp b/src/surf/surf_routing_generic.hpp index 7c99e58fdd..ae6a6153ce 100644 --- a/src/surf/surf_routing_generic.hpp +++ b/src/surf/surf_routing_generic.hpp @@ -6,6 +6,8 @@ class AsGeneric; typedef AsGeneric *AsGenericPtr; +void generic_free_route(sg_platf_route_cbarg_t route); + class AsGeneric : public AsNone { public: AsGeneric(); -- 2.20.1