X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a7430c3a3c007a1746ac3d8ff320058a66e70b64..346c06db41ebb088e88351d8381d0c232d2ddbb5:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 3acd4b11d9..53a5d6223e 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -12,7 +12,12 @@ #include "surf/surf_routing.h" #include "surf/surfxml_parse_values.h" +/** + * @ingroup SURF_build_api + * @brief A library containing all known workstations + */ xbt_lib_t host_lib; + int ROUTING_HOST_LEVEL; //Routing level int SURF_CPU_LEVEL; //Surf cpu level int SURF_WKS_LEVEL; //Surf workstation level @@ -22,6 +27,10 @@ int SD_HOST_LEVEL; //Simdag level int COORD_HOST_LEVEL=0; //Coordinates level int NS3_HOST_LEVEL; //host node for ns3 +/** + * @ingroup SURF_build_api + * @brief A library containing all known links + */ xbt_lib_t link_lib; int SD_LINK_LEVEL; //Simdag level int SURF_LINK_LEVEL; //Surf level @@ -34,12 +43,24 @@ int NS3_ASR_LEVEL; //host node for ns3 static xbt_dict_t random_value = NULL; +/** @brief Retrieve a routing edge from its name + * + * Routing edges are either CPU/workstation and routers, whatever + */ +sg_routing_edge_t sg_routing_edge_by_name_or_null(const char *name) { + sg_routing_edge_t net_elm = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL); + if(!net_elm) net_elm = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); + return net_elm; +} + /* Global vars */ -routing_global_t global_routing = NULL; +routing_platf_t routing_platf = NULL; AS_t current_routing = NULL; /* global parse functions */ xbt_dynar_t parsed_link_list = NULL; /* temporary store of current list link of a route */ +extern xbt_dynar_t mount_list; + static const char *src = NULL; /* temporary store the source name of a route */ static const char *dst = NULL; /* temporary store the destination name of a route */ static char *gw_src = NULL; /* temporary store the gateway source name of a route */ @@ -77,7 +98,7 @@ struct s_model_type routing_models[] = { {"DijkstraCache", "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)", model_dijkstracache_create, model_dijkstra_both_end}, - {"none", "No routing (usable with Constant network only)", + {"none", "No routing (Unless you know what you are doing, avoid using this mode in combination with a non Constant network model).", model_none_create, NULL}, {"RuleBased", "Rule-Based routing data (...)", model_rulebased_create, NULL}, @@ -93,24 +114,31 @@ struct s_model_type routing_models[] = { */ static void parse_S_host(sg_platf_host_cbarg_t host) { - network_element_info_t info = NULL; + sg_routing_edge_t info = NULL; if (current_routing->hierarchy == SURF_ROUTING_NULL) current_routing->hierarchy = SURF_ROUTING_BASE; xbt_assert(!xbt_lib_get_or_null(host_lib, host->id, ROUTING_HOST_LEVEL), "Reading a host, processing unit \"%s\" already exists", host->id); - current_routing->parse_PU(current_routing, host->id); - info = xbt_new0(s_network_element_info_t, 1); + info = xbt_new0(s_network_element_t, 1); info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_HOST; + info->name = xbt_strdup(host->id); + info->id = current_routing->parse_PU(current_routing, (void *) info); xbt_lib_set(host_lib, host->id, ROUTING_HOST_LEVEL, (void *) info); + XBT_DEBUG("Having set name '%s' id '%d'",host->id,info->id); + + if(mount_list){ + xbt_lib_set(storage_lib, host->id, ROUTING_STORAGE_HOST_LEVEL, (void *) mount_list); + mount_list = NULL; + } + if (host->coord && strcmp(host->coord, "")) { unsigned int cursor; char*str; if (!COORD_HOST_LEVEL) - xbt_die ("To use host coordinates, please add --cfg=coordinates:yes to your command line"); - + xbt_die ("To use host coordinates, please add --cfg=network/coordinates:yes to your command line"); /* Pre-parse the host coordinates -- FIXME factorize with routers by overloading the routing->parse_PU function*/ xbt_dynar_t ctn_str = xbt_str_split_str(host->coord, " "); xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); @@ -121,6 +149,7 @@ static void parse_S_host(sg_platf_host_cbarg_t host) xbt_dynar_shrink(ctn, 0); xbt_dynar_free(&ctn_str); xbt_lib_set(host_lib, host->id, COORD_HOST_LEVEL, (void *) ctn); + XBT_DEBUG("Having set host coordinates for '%s'",host->id); } } @@ -129,26 +158,27 @@ static void parse_S_host(sg_platf_host_cbarg_t host) */ static void parse_S_router(sg_platf_router_cbarg_t router) { - network_element_info_t info = NULL; + sg_routing_edge_t info = NULL; if (current_routing->hierarchy == SURF_ROUTING_NULL) current_routing->hierarchy = SURF_ROUTING_BASE; xbt_assert(!xbt_lib_get_or_null(as_router_lib, router->id, ROUTING_ASR_LEVEL), "Reading a router, processing unit \"%s\" already exists", router->id); - current_routing->parse_PU(current_routing, router->id); - info = xbt_new0(s_network_element_info_t, 1); + info = xbt_new0(s_network_element_t, 1); info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_ROUTER; - + info->name = xbt_strdup(router->id); + info->id = current_routing->parse_PU(current_routing, (void *) info); xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info); + XBT_DEBUG("Having set name '%s' id '%d'",router->id,info->id); + if (strcmp(router->coord, "")) { unsigned int cursor; char*str; if (!COORD_ASR_LEVEL) - xbt_die ("To use host coordinates, please add --cfg=coordinates:yes to your command line"); - + xbt_die ("To use host coordinates, please add --cfg=network/coordinates:yes to your command line"); /* Pre-parse the host coordinates */ xbt_dynar_t ctn_str = xbt_str_split_str(router->coord, " "); xbt_dynar_t ctn = xbt_dynar_new(sizeof(double),NULL); @@ -159,6 +189,7 @@ static void parse_S_router(sg_platf_router_cbarg_t router) xbt_dynar_shrink(ctn, 0); xbt_dynar_free(&ctn_str); xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn); + XBT_DEBUG("Having set router coordinates for '%s'",router->id); } } @@ -168,13 +199,10 @@ static void parse_S_router(sg_platf_router_cbarg_t router) */ static void routing_parse_S_route(void) { - if (src != NULL && dst != NULL && parsed_link_list != NULL) - THROWF(arg_error, 0, "Route between %s to %s can not be defined", - A_surfxml_route_src, A_surfxml_route_dst); src = A_surfxml_route_src; dst = A_surfxml_route_dst; xbt_assert(strlen(src) > 0 || strlen(dst) > 0, - "Some limits are null in the route between \"%s\" and \"%s\"", + "Missing end-points while defining route \"%s\"->\"%s\"", src, dst); parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } @@ -184,17 +212,13 @@ static void routing_parse_S_route(void) */ static void routing_parse_S_ASroute(void) { - if (src != NULL && dst != NULL && parsed_link_list != NULL) - THROWF(arg_error, 0, "Route between %s to %s can not be defined", - A_surfxml_ASroute_src, A_surfxml_ASroute_dst); src = A_surfxml_ASroute_src; dst = A_surfxml_ASroute_dst; gw_src = A_surfxml_ASroute_gw_src; gw_dst = A_surfxml_ASroute_gw_dst; - xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 - || strlen(gw_dst) > 0, - "Some limits are null in the route between \"%s\" and \"%s\"", - src, dst); + xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0, + "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", + src, dst,gw_src,gw_dst); parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } @@ -203,21 +227,30 @@ static void routing_parse_S_ASroute(void) */ static void routing_parse_S_bypassRoute(void) { - if (src != NULL && dst != NULL && parsed_link_list != NULL) - THROWF(arg_error, 0, - "Bypass Route between %s to %s can not be defined", - A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst); src = A_surfxml_bypassRoute_src; dst = A_surfxml_bypassRoute_dst; - gw_src = A_surfxml_bypassRoute_gw_src; - gw_dst = A_surfxml_bypassRoute_gw_dst; - xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 - || strlen(gw_dst) > 0, - "Some limits are null in the route between \"%s\" and \"%s\"", - src, dst); + gw_src = NULL; + gw_dst = NULL; + xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0, + "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", + src, dst,gw_src,gw_dst); parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } +/** + * \brief Set the end points for a bypassASroute + */ +static void routing_parse_S_bypassASroute(void) +{ + src = A_surfxml_bypassASroute_src; + dst = A_surfxml_bypassASroute_dst; + gw_src = A_surfxml_bypassASroute_gw_src; + gw_dst = A_surfxml_bypassASroute_gw_dst; + xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0, + "Missing end-points while defining route \"%s\"->\"%s\" (with %s and %s as gateways)", + src, dst,gw_src,gw_dst); + parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); +} /** * \brief Set a new link on the actual list of link for a route or ASroute from XML */ @@ -264,8 +297,18 @@ static void routing_parse_E_ASroute(void) { route_t e_route = xbt_new0(s_route_t, 1); e_route->link_list = parsed_link_list; - e_route->src_gateway = xbt_strdup(gw_src); - e_route->dst_gateway = xbt_strdup(gw_dst); + + if (!strcmp(current_routing->model_desc->name,"RuleBased")) { + // DIRTY PERL HACK AHEAD: with the rulebased routing, the {src,dst}_gateway fields + // store the provided name instead of the entity directly (model_rulebased_parse_ASroute knows) + // + // This is because the user will provide something like "^AS_(.*)$" instead of the proper name of a given entity + e_route->src_gateway = (sg_routing_edge_t) gw_src; + e_route->dst_gateway = (sg_routing_edge_t) gw_dst; + } else { + e_route->src_gateway = sg_routing_edge_by_name_or_null(gw_src); + e_route->dst_gateway = sg_routing_edge_by_name_or_null(gw_dst); + } xbt_assert(current_routing->parse_ASroute, "no defined method \"set_ASroute\" in \"%s\"", current_routing->name); @@ -285,8 +328,27 @@ static void routing_parse_E_bypassRoute(void) { route_t e_route = xbt_new0(s_route_t, 1); e_route->link_list = parsed_link_list; - e_route->src_gateway = xbt_strdup(gw_src); - e_route->dst_gateway = xbt_strdup(gw_dst); + + xbt_assert(current_routing->parse_bypassroute, + "Bypassing mechanism not implemented by routing '%s'", + current_routing->name); + + current_routing->parse_bypassroute(current_routing, src, dst, e_route); + parsed_link_list = NULL; + src = NULL; + dst = NULL; + gw_src = NULL; + gw_dst = NULL; +} +/** + * \brief Store the bypass route by calling the set_bypassroute function of the current routing component + */ +static void routing_parse_E_bypassASroute(void) +{ + route_t e_route = xbt_new0(s_route_t, 1); + e_route->link_list = parsed_link_list; + e_route->src_gateway = sg_routing_edge_by_name_or_null(gw_src); + e_route->dst_gateway = sg_routing_edge_by_name_or_null(gw_dst); xbt_assert(current_routing->parse_bypassroute, "Bypassing mechanism not implemented by routing '%s'", current_routing->name); @@ -317,6 +379,10 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) routing_model_description_t model = NULL; int cpt; + xbt_assert(!xbt_lib_get_or_null + (as_router_lib, AS_id, ROUTING_ASR_LEVEL), + "The AS \"%s\" already exists", AS_id); + /* search the routing model */ for (cpt = 0; routing_models[cpt].name; cpt++) if (!strcmp(wanted_routing_type, routing_models[cpt].name)) @@ -328,7 +394,7 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) for (cpt = 0; routing_models[cpt].name; cpt++) fprintf(stderr, " %s: %s\n", routing_models[cpt].name, routing_models[cpt].desc); - xbt_die(NULL); + xbt_die("dying"); } /* make a new routing component */ @@ -337,13 +403,16 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) new_as->hierarchy = SURF_ROUTING_NULL; new_as->name = xbt_strdup(AS_id); - if (current_routing == NULL && global_routing->root == NULL) { + sg_routing_edge_t info = NULL; + info = xbt_new0(s_network_element_t, 1); + + if (current_routing == NULL && routing_platf->root == NULL) { /* it is the first one */ new_as->routing_father = NULL; - global_routing->root = new_as; - - } else if (current_routing != NULL && global_routing->root != NULL) { + routing_platf->root = new_as; + info->id = -1; + } else if (current_routing != NULL && routing_platf->root != NULL) { xbt_assert(!xbt_dict_get_or_null (current_routing->routing_sons, AS_id), @@ -357,12 +426,23 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) xbt_dict_set(current_routing->routing_sons, AS_id, (void *) new_as, NULL); /* add to the father element list */ - current_routing->parse_AS(current_routing, AS_id); + info->id = current_routing->parse_AS(current_routing, (void *) info); } else { THROWF(arg_error, 0, "All defined components must be belong to a AS"); } + + info->rc_component = new_as->routing_father; + info->rc_type = SURF_NETWORK_ELEMENT_AS; + info->name = new_as->name; + + xbt_lib_set(as_router_lib, new_as->name, ROUTING_ASR_LEVEL, + (void *) info); + XBT_DEBUG("Having set name '%s' id '%d'",new_as->name,info->id); + /* set the new current component of the tree */ current_routing = new_as; + current_routing->net_elem = info; + } /** @@ -382,16 +462,6 @@ void routing_AS_end() if (current_routing == NULL) { THROWF(arg_error, 0, "Close an AS, but none was under construction"); } else { - network_element_info_t info = NULL; - xbt_assert(!xbt_lib_get_or_null - (as_router_lib, current_routing->name, ROUTING_ASR_LEVEL), - "The AS \"%s\" already exists", current_routing->name); - info = xbt_new0(s_network_element_info_t, 1); - info->rc_component = current_routing->routing_father; - info->rc_type = SURF_NETWORK_ELEMENT_AS; - xbt_lib_set(as_router_lib, current_routing->name, ROUTING_ASR_LEVEL, - (void *) info); - if (current_routing->model_desc->end) current_routing->model_desc->end(current_routing); current_routing = current_routing->routing_father; @@ -409,7 +479,7 @@ void routing_AS_end() * Get the common father of the to processing units, and the first different * father in the chain */ -static void elements_father(const char *src, const char *dst, +static void elements_father(sg_routing_edge_t src, sg_routing_edge_t dst, AS_t * res_father, AS_t * res_src, AS_t * res_dst) @@ -427,19 +497,17 @@ static void elements_father(const char *src, const char *dst, AS_t father; /* (1) find the as where the src and dst are located */ - network_element_info_t src_data = xbt_lib_get_or_null(host_lib, src, - ROUTING_HOST_LEVEL); - network_element_info_t dst_data = xbt_lib_get_or_null(host_lib, dst, - ROUTING_HOST_LEVEL); - if (!src_data) - src_data = xbt_lib_get_or_null(as_router_lib, src, ROUTING_ASR_LEVEL); - if (!dst_data) - dst_data = xbt_lib_get_or_null(as_router_lib, dst, ROUTING_ASR_LEVEL); + sg_routing_edge_t src_data = src; + sg_routing_edge_t dst_data = dst; src_as = src_data->rc_component; dst_as = dst_data->rc_component; +#ifndef NDEBUG + char* src_name = src_data->name; + char* dst_name = dst_data->name; +#endif xbt_assert(src_as && dst_as, - "Ask for route \"from\"(%s) or \"to\"(%s) no found", src, dst); + "Ask for route \"from\"(%s) or \"to\"(%s) no found", src_name, dst_name); /* (2) find the path to the root routing component */ for (current = src_as; current != NULL; current = current->routing_father) { @@ -486,96 +554,76 @@ static void elements_father(const char *src, const char *dst, * This function is called by "get_route" and "get_latency". It allows to walk * recursively through the ASes tree. */ -static void _get_route_and_latency(const char *src, const char *dst, +static void _get_route_and_latency(sg_routing_edge_t src, sg_routing_edge_t dst, xbt_dynar_t * links, double *latency) { - void *link; - unsigned int cpt; s_route_t route; memset(&route,0,sizeof(route)); - XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src, dst); + XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src->name, dst->name); xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method"); /* Find how src and dst are interconnected */ AS_t common_father, src_father, dst_father; elements_father(src, dst, &common_father, &src_father, &dst_father); + XBT_DEBUG("elements_father: common father '%s' src_father '%s' dst_father '%s'", + common_father->name,src_father->name,dst_father->name); - /* If src and dst are in the same AS, life is good */ - if (src_father == dst_father) { /* SURF_ROUTING_BASE */ - - route.link_list = *links; - - common_father->get_route_and_latency(common_father, src, dst, &route,latency); + /* Check whether a direct bypass is defined */ + route_t e_route_bypass = NULL; + if (common_father->get_bypass_route) + e_route_bypass = common_father->get_bypass_route(common_father, src, dst, latency); - xbt_free(route.src_gateway); - xbt_free(route.dst_gateway); + /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */ + if (e_route_bypass) { + xbt_dynar_merge(links,&(e_route_bypass->link_list)); + generic_free_route(e_route_bypass); return; } - /* If we are here, src and dst are not in the same AS; check whether a direct bypass is defined */ - - route_t e_route_bypass = NULL; - if (common_father->get_bypass_route) - e_route_bypass = common_father->get_bypass_route(common_father, src, dst); - - if (e_route_bypass) { /* Common ancestor is kind enough to declare a bypass route from src to dst -- use it and bail out */ - if (latency) - xbt_die("Bypass cannot work yet with get_latency"); // FIXME: get_bypass_route should update the latency itself, just like get_route + /* If src and dst are in the same AS, life is good */ + if (src_father == dst_father) { /* SURF_ROUTING_BASE */ -// // FIXME this path is never tested. I need examples to check the bypass mechanism... -// THROW_UNIMPLEMENTED; // let's warn the users of the problem - xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) { - xbt_dynar_push(*links, &link); - } + route.link_list = *links; - generic_free_route(e_route_bypass); + common_father->get_route_and_latency(common_father, src, dst, &route,latency); return; } - /* Not in the same AS, no bypass. We'll have to find our path between the ASes recursively*/ - route.link_list = xbt_dynar_new(global_routing->size_of_link, NULL); - common_father->get_route_and_latency(common_father, src_father->name, dst_father->name, &route,latency); + route.link_list = xbt_dynar_new(sizeof(sg_routing_link_t), NULL); + // Find the net_card corresponding to father + sg_routing_edge_t src_father_net_elm = src_father->net_elem; + sg_routing_edge_t dst_father_net_elm = dst_father->net_elem; + + common_father->get_route_and_latency(common_father, src_father_net_elm, dst_father_net_elm, &route,latency); xbt_assert((route.src_gateway != NULL) && (route.dst_gateway != NULL), - "bad gateways for route from \"%s\" to \"%s\"", src, dst); + "bad gateways for route from \"%s\" to \"%s\"", src->name, dst->name); - char*src_gateway = route.src_gateway; - char*dst_gateway = route.dst_gateway; + sg_routing_edge_t src_gateway_net_elm = route.src_gateway; + sg_routing_edge_t dst_gateway_net_elm = route.dst_gateway; /* If source gateway is not our source, we have to recursively find our way up to this point */ - if (strcmp(src, src_gateway)) - _get_route_and_latency(src, src_gateway, links, latency); + if (src != src_gateway_net_elm) + _get_route_and_latency(src, src_gateway_net_elm, links, latency); - xbt_dynar_foreach(route.link_list, cpt, link) { - xbt_dynar_push(*links, &link); - } + xbt_dynar_merge(links,&(route.link_list)); /* If dest gateway is not our destination, we have to recursively find our way from this point */ // FIXME why can't I factorize it the same way than [src;src_gw] without breaking the examples?? - if (strcmp(dst_gateway, dst)) { - xbt_dynar_t route_dst = xbt_dynar_new(global_routing->size_of_link,NULL); - - _get_route_and_latency(dst_gateway, dst, &route_dst, latency); - - xbt_dynar_foreach(route_dst, cpt, link) { - xbt_dynar_push(*links, &link); - } - xbt_dynar_free(&route_dst); + if (dst_gateway_net_elm != dst) { + _get_route_and_latency(dst_gateway_net_elm, dst, links, latency); } - - xbt_free(src_gateway); - xbt_free_f(dst_gateway); xbt_dynar_free(&route.link_list); } /** * \brief Find a route between hosts * - * \param src the source host name - * \param dst the destination host name + * \param src the network_element_t for src host + * \param dst the network_element_t for dst host * \param route where to store the list of links. * If *route=NULL, create a short lived dynar. Else, fill the provided dynar * \param latency where to store the latency experienced on the path (or NULL if not interested) @@ -585,18 +633,20 @@ static void _get_route_and_latency(const char *src, const char *dst, * walk through the routing components tree and find a route between hosts * by calling the differents "get_route" functions in each routing component. */ -void routing_get_route_and_latency(const char *src, const char *dst, +void routing_get_route_and_latency(sg_routing_edge_t src, + sg_routing_edge_t dst, xbt_dynar_t * route, double *latency) { + XBT_DEBUG("routing_get_route_and_latency from %s to %s",src->name,dst->name); if (!*route) { - xbt_dynar_reset(global_routing->last_route); - *route = global_routing->last_route; + xbt_dynar_reset(routing_platf->last_route); + *route = routing_platf->last_route; } _get_route_and_latency(src, dst, route, latency); xbt_assert(!latency || *latency >= 0.0, - "negative latency on route between \"%s\" and \"%s\"", src, dst); + "negative latency on route between \"%s\" and \"%s\"", src->name, dst->name); } static xbt_dynar_t recursive_get_onelink_routes(AS_t rc) @@ -604,43 +654,30 @@ static xbt_dynar_t recursive_get_onelink_routes(AS_t rc) xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free); //adding my one link routes - unsigned int cpt; - void *link; xbt_dynar_t onelink_mine = rc->get_onelink_routes(rc); - if (onelink_mine) { - xbt_dynar_foreach(onelink_mine, cpt, link) { - xbt_dynar_push(ret, &link); - } - } + if (onelink_mine) + xbt_dynar_merge(&ret,&onelink_mine); + //recursing char *key; xbt_dict_cursor_t cursor = NULL; AS_t rc_child; xbt_dict_foreach(rc->routing_sons, cursor, key, rc_child) { xbt_dynar_t onelink_child = recursive_get_onelink_routes(rc_child); - if (onelink_child) { - xbt_dynar_foreach(onelink_child, cpt, link) { - xbt_dynar_push(ret, &link); - } - } + if (onelink_child) + xbt_dynar_merge(&ret,&onelink_child); } return ret; } static xbt_dynar_t get_onelink_routes(void) { - return recursive_get_onelink_routes(global_routing->root); + return recursive_get_onelink_routes(routing_platf->root); } e_surf_network_element_type_t routing_get_network_element_type(const char *name) { - network_element_info_t rc = NULL; - - rc = xbt_lib_get_or_null(host_lib, name, ROUTING_HOST_LEVEL); - if (rc) - return rc->rc_type; - - rc = xbt_lib_get_or_null(as_router_lib, name, ROUTING_ASR_LEVEL); + sg_routing_edge_t rc = sg_routing_edge_by_name_or_null(name); if (rc) return rc->rc_type; @@ -652,15 +689,14 @@ e_surf_network_element_type_t routing_get_network_element_type(const char *name) * * Make a global routing structure and set all the parsing functions. */ -void routing_model_create(size_t size_of_links, void *loopback) +void routing_model_create( void *loopback) { /* config the uniq global routing */ - global_routing = xbt_new0(s_routing_global_t, 1); - global_routing->root = NULL; - global_routing->get_onelink_routes = get_onelink_routes; - global_routing->loopback = loopback; - global_routing->size_of_link = size_of_links; - global_routing->last_route = xbt_dynar_new(global_routing->size_of_link,NULL); + routing_platf = xbt_new0(s_routing_platf_t, 1); + routing_platf->root = NULL; + routing_platf->get_onelink_routes = get_onelink_routes; + routing_platf->loopback = loopback; + routing_platf->last_route = xbt_dynar_new(sizeof(sg_routing_link_t),NULL); /* no current routing at moment */ current_routing = NULL; } @@ -712,7 +748,6 @@ void routing_model_create(size_t size_of_links, void *loopback) /* ************************************************************************** */ /* ************************* GENERIC PARSE FUNCTIONS ************************ */ - static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) { char *host_id, *groups, *link_id = NULL; @@ -734,10 +769,12 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) xbt_dict_set(patterns, "suffix", xbt_strdup(cluster->suffix), NULL); } - XBT_DEBUG("", cluster->id); sg_platf_new_AS_begin(cluster->id, "Cluster"); + current_routing->link_up_down_list + = xbt_dynar_new(sizeof(s_surf_parsing_link_up_down_t),NULL); + //Make all hosts radical_elements = xbt_str_split(cluster->radical, ","); xbt_dynar_foreach(radical_elements, iter, groups) { @@ -803,23 +840,22 @@ static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) link.policy = cluster->sharing_policy; sg_platf_new_link(&link); - surf_parsing_link_up_down_t info = - xbt_new0(s_surf_parsing_link_up_down_t, 1); + s_surf_parsing_link_up_down_t info; + if (link.policy == SURF_LINK_FULLDUPLEX) { char *tmp_link = bprintf("%s_UP", link_id); - info->link_up = + info.link_up = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); free(tmp_link); tmp_link = bprintf("%s_DOWN", link_id); - info->link_down = + info.link_down = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL); free(tmp_link); } else { - info->link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL); - info->link_down = info->link_up; + info.link_up = xbt_lib_get_or_null(link_lib, link_id, SURF_LINK_LEVEL); + info.link_down = info.link_up; } - surf_routing_cluster_add_link(host_id, info); - + xbt_dynar_push(current_routing->link_up_down_list,&info); xbt_free(link_id); xbt_free(host_id); } @@ -1119,6 +1155,8 @@ void routing_register_callbacks() surfxml_add_callback(STag_surfxml_ASroute_cb_list, &routing_parse_S_ASroute); surfxml_add_callback(STag_surfxml_bypassRoute_cb_list, &routing_parse_S_bypassRoute); + surfxml_add_callback(STag_surfxml_bypassASroute_cb_list, + &routing_parse_S_bypassASroute); surfxml_add_callback(ETag_surfxml_link_ctn_cb_list, &routing_parse_link_ctn); @@ -1126,12 +1164,18 @@ void routing_register_callbacks() surfxml_add_callback(ETag_surfxml_ASroute_cb_list, &routing_parse_E_ASroute); surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list, &routing_parse_E_bypassRoute); + surfxml_add_callback(ETag_surfxml_bypassASroute_cb_list, + &routing_parse_E_bypassASroute); sg_platf_cluster_add_cb(routing_parse_cluster); sg_platf_peer_add_cb(routing_parse_peer); sg_platf_postparse_add_cb(routing_parse_postparse); + /* we care about the ASes while parsing the platf. Incredible, isnt it? */ + sg_platf_AS_end_add_cb(routing_AS_end); + sg_platf_AS_begin_add_cb(routing_AS_begin); + #ifdef HAVE_TRACING instr_routing_define_callbacks(); #endif @@ -1159,9 +1203,9 @@ static void finalize_rec(AS_t as) { /** \brief Frees all memory allocated by the routing module */ void routing_exit(void) { - if (!global_routing) + if (!routing_platf) return; - xbt_dynar_free(&global_routing->last_route); - finalize_rec(global_routing->root); - xbt_free(global_routing); + xbt_dynar_free(&routing_platf->last_route); + finalize_rec(routing_platf->root); + xbt_free(routing_platf); }