X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/840bd4689d1c44baf35062cb5707e761b4e0f652..f96c4337f949604e5d4e4b30f3ff6418ddf831ee:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 434ddf14f8..3a5f19f20c 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -19,7 +19,7 @@ int SURF_WKS_LEVEL; //Surf workstation level int SIMIX_HOST_LEVEL; //Simix level int MSG_HOST_LEVEL; //Msg level int SD_HOST_LEVEL; //Simdag level -int COORD_HOST_LEVEL; //Coordinates level +int COORD_HOST_LEVEL=0; //Coordinates level int NS3_HOST_LEVEL; //host node for ns3 xbt_lib_t link_lib; @@ -32,16 +32,14 @@ int ROUTING_ASR_LEVEL; //Routing level int COORD_ASR_LEVEL; //Coordinates level int NS3_ASR_LEVEL; //host node for ns3 -static xbt_dict_t patterns = NULL; static xbt_dict_t random_value = NULL; /* Global vars */ routing_global_t global_routing = NULL; -routing_component_t current_routing = NULL; -routing_model_description_t current_routing_model = NULL; +AS_t current_routing = NULL; /* global parse functions */ -xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */ +xbt_dynar_t parsed_link_list = NULL; /* temporary store of current list link of a route */ 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 */ @@ -52,7 +50,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); static void routing_parse_peer(sg_platf_peer_cbarg_t peer); /* peer bypass */ static void routing_parse_Srandom(void); /* random bypass */ -static char *replace_random_parameter(char *chaine); static void routing_parse_postparse(void); /* this lines are only for replace use like index in the model table */ @@ -102,17 +99,27 @@ static void parse_S_host(sg_platf_host_cbarg_t host) 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); + current_routing->parse_PU(current_routing, host->id); info = xbt_new0(s_network_element_info_t, 1); info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_HOST; xbt_lib_set(host_lib, host->id, ROUTING_HOST_LEVEL, (void *) info); if (host->coord && strcmp(host->coord, "")) { + unsigned int cursor; + char*str; + if (!COORD_HOST_LEVEL) - xbt_die - ("To use coordinates, you must set configuration 'coordinates' to 'yes'"); - xbt_dynar_t ctn = xbt_str_split_str(host->coord, " "); + xbt_die ("To use host coordinates, please add --cfg=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); + xbt_dynar_foreach(ctn_str,cursor, str) { + double val = atof(str); + xbt_dynar_push(ctn,&val); + } xbt_dynar_shrink(ctn, 0); + xbt_dynar_free(&ctn_str); xbt_lib_set(host_lib, host->id, COORD_HOST_LEVEL, (void *) ctn); } } @@ -129,18 +136,28 @@ static void parse_S_router(sg_platf_router_cbarg_t router) "Reading a router, processing unit \"%s\" already exists", router->id); - (*(current_routing->parse_PU)) (current_routing, router->id); + current_routing->parse_PU(current_routing, router->id); info = xbt_new0(s_network_element_info_t, 1); info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_ROUTER; xbt_lib_set(as_router_lib, router->id, ROUTING_ASR_LEVEL, (void *) info); if (strcmp(router->coord, "")) { + unsigned int cursor; + char*str; + if (!COORD_ASR_LEVEL) - xbt_die - ("To use coordinates, you must set configuration 'coordinates' to 'yes'"); - xbt_dynar_t ctn = xbt_str_split_str(router->coord, " "); + xbt_die ("To use host coordinates, please add --cfg=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); + xbt_dynar_foreach(ctn_str,cursor, str) { + double val = atof(str); + xbt_dynar_push(ctn,&val); + } xbt_dynar_shrink(ctn, 0); + xbt_dynar_free(&ctn_str); xbt_lib_set(as_router_lib, router->id, COORD_ASR_LEVEL, (void *) ctn); } } @@ -151,7 +168,7 @@ static void parse_S_router(sg_platf_router_cbarg_t router) */ static void routing_parse_S_route(void) { - if (src != NULL && dst != NULL && link_list != NULL) + 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; @@ -159,7 +176,7 @@ static void routing_parse_S_route(void) xbt_assert(strlen(src) > 0 || strlen(dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); - link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); + parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } /** @@ -167,7 +184,7 @@ static void routing_parse_S_route(void) */ static void routing_parse_S_ASroute(void) { - if (src != NULL && dst != NULL && link_list != NULL) + 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; @@ -178,7 +195,7 @@ static void routing_parse_S_ASroute(void) || strlen(gw_dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); - link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); + parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } /** @@ -186,7 +203,7 @@ static void routing_parse_S_ASroute(void) */ static void routing_parse_S_bypassRoute(void) { - if (src != NULL && dst != NULL && link_list != NULL) + 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); @@ -198,7 +215,7 @@ static void routing_parse_S_bypassRoute(void) || strlen(gw_dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); - link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); + parsed_link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); } /** @@ -220,7 +237,7 @@ static void routing_parse_link_ctn(void) link_id = bprintf("%s_DOWN", A_surfxml_link_ctn_id); break; } - xbt_dynar_push(link_list, &link_id); + xbt_dynar_push(parsed_link_list, &link_id); } /** @@ -228,13 +245,14 @@ static void routing_parse_link_ctn(void) */ static void routing_parse_E_route(void) { - route_extended_t route = xbt_new0(s_route_extended_t, 1); - route->generic_route.link_list = link_list; + route_t route = xbt_new0(s_route_t, 1); + route->link_list = parsed_link_list; xbt_assert(current_routing->parse_route, "no defined method \"set_route\" in \"%s\"", current_routing->name); - (*(current_routing->parse_route)) (current_routing, src, dst, route); - link_list = NULL; + current_routing->parse_route(current_routing, src, dst, route); + generic_free_route(route); + parsed_link_list = NULL; src = NULL; dst = NULL; } @@ -244,15 +262,16 @@ static void routing_parse_E_route(void) */ static void routing_parse_E_ASroute(void) { - route_extended_t e_route = xbt_new0(s_route_extended_t, 1); - e_route->generic_route.link_list = link_list; + 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_ASroute, "no defined method \"set_ASroute\" in \"%s\"", current_routing->name); - (*(current_routing->parse_ASroute)) (current_routing, src, dst, e_route); - link_list = NULL; + current_routing->parse_ASroute(current_routing, src, dst, e_route); + generic_free_route(e_route); + parsed_link_list = NULL; src = NULL; dst = NULL; gw_src = NULL; @@ -264,15 +283,15 @@ static void routing_parse_E_ASroute(void) */ static void routing_parse_E_bypassRoute(void) { - route_extended_t e_route = xbt_new0(s_route_extended_t, 1); - e_route->generic_route.link_list = link_list; + 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); - link_list = NULL; + current_routing->parse_bypassroute(current_routing, src, dst, e_route); + parsed_link_list = NULL; src = NULL; dst = NULL; gw_src = NULL; @@ -294,7 +313,7 @@ static void routing_parse_E_bypassRoute(void) */ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) { - routing_component_t new_routing; + AS_t new_as; routing_model_description_t model = NULL; int cpt; @@ -313,17 +332,16 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) } /* make a new routing component */ - new_routing = (routing_component_t) (*(model->create)) (); - new_routing->routing = model; - new_routing->hierarchy = SURF_ROUTING_NULL; - new_routing->name = xbt_strdup(AS_id); - new_routing->routing_sons = xbt_dict_new(); + new_as = (AS_t) model->create(); + new_as->model_desc = model; + new_as->hierarchy = SURF_ROUTING_NULL; + new_as->name = xbt_strdup(AS_id); if (current_routing == NULL && global_routing->root == NULL) { /* it is the first one */ - new_routing->routing_father = NULL; - global_routing->root = new_routing; + new_as->routing_father = NULL; + global_routing->root = new_as; } else if (current_routing != NULL && global_routing->root != NULL) { @@ -331,20 +349,20 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) (current_routing->routing_sons, AS_id), "The AS \"%s\" already exists", AS_id); /* it is a part of the tree */ - new_routing->routing_father = current_routing; + new_as->routing_father = current_routing; /* set the father behavior */ if (current_routing->hierarchy == SURF_ROUTING_NULL) current_routing->hierarchy = SURF_ROUTING_RECURSIVE; /* add to the sons dictionary */ xbt_dict_set(current_routing->routing_sons, AS_id, - (void *) new_routing, NULL); + (void *) new_as, NULL); /* add to the father element list */ - (*(current_routing->parse_AS)) (current_routing, AS_id); + current_routing->parse_AS(current_routing, AS_id); } else { THROWF(arg_error, 0, "All defined components must be belong to a AS"); } /* set the new current component of the tree */ - current_routing = new_routing; + current_routing = new_as; } /** @@ -374,8 +392,8 @@ void routing_AS_end() xbt_lib_set(as_router_lib, current_routing->name, ROUTING_ASR_LEVEL, (void *) info); - if (current_routing->routing->end) - (*(current_routing->routing->end)) (); + if (current_routing->model_desc->end) + current_routing->model_desc->end(current_routing); current_routing = current_routing->routing_father; } } @@ -392,21 +410,21 @@ void routing_AS_end() * father in the chain */ static void elements_father(const char *src, const char *dst, - routing_component_t * res_father, - routing_component_t * res_src, - routing_component_t * res_dst) + AS_t * res_father, + AS_t * res_src, + AS_t * res_dst) { xbt_assert(src && dst, "bad parameters for \"elements_father\" method"); #define ELEMENTS_FATHER_MAXDEPTH 16 /* increase if it is not enough */ - routing_component_t src_as, dst_as; - routing_component_t path_src[ELEMENTS_FATHER_MAXDEPTH]; - routing_component_t path_dst[ELEMENTS_FATHER_MAXDEPTH]; + AS_t src_as, dst_as; + AS_t path_src[ELEMENTS_FATHER_MAXDEPTH]; + AS_t path_dst[ELEMENTS_FATHER_MAXDEPTH]; int index_src = 0; int index_dst = 0; - routing_component_t current; - routing_component_t current_src; - routing_component_t current_dst; - routing_component_t father; + AS_t current; + AS_t current_src; + AS_t current_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, @@ -462,257 +480,129 @@ static void elements_father(const char *src, const char *dst, * * \param src the source host name * \param dst the destination host name - * \param *e_route the route where the links are stored + * \param *route the route where the links are stored. It is either NULL or a ready to use dynar * \param *latency the latency, if needed * * This function is called by "get_route" and "get_latency". It allows to walk - * recursively through the routing components tree. + * recursively through the ASes tree. */ -static void _get_route_latency(const char *src, const char *dst, - xbt_dynar_t * route, double *latency) +static void _get_route_and_latency(const char *src, const char *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_assert(src && dst, "bad parameters for \"_get_route_latency\" method"); - routing_component_t common_father; - routing_component_t src_father; - routing_component_t dst_father; + /* 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); + /* If src and dst are in the same AS, life is good */ if (src_father == dst_father) { /* SURF_ROUTING_BASE */ - route_extended_t e_route = NULL; - if (route) { - e_route = common_father->get_route(common_father, src, dst); - xbt_assert(e_route, "no route between \"%s\" and \"%s\"", src, dst); - *route = e_route->generic_route.link_list; - } - if (latency) { - *latency = common_father->get_latency(common_father, src, dst, e_route); - xbt_assert(*latency >= 0.0, - "latency error on route between \"%s\" and \"%s\"", src, dst); - } - if (e_route) { - xbt_free(e_route->src_gateway); - xbt_free(e_route->dst_gateway); - xbt_free(e_route); - } - - } else { /* SURF_ROUTING_RECURSIVE */ + route.link_list = *links; - route_extended_t e_route_bypass = NULL; - if (common_father->get_bypass_route) - e_route_bypass = common_father->get_bypass_route(common_father, src, dst); + common_father->get_route_and_latency(common_father, src, dst, &route,latency); - xbt_assert(!latency || !e_route_bypass, - "Bypass cannot work yet with get_latency"); + xbt_free(route.src_gateway); + xbt_free(route.dst_gateway); + return; + } - route_extended_t e_route_cnt = e_route_bypass - ? e_route_bypass : common_father->get_route(common_father, - src_father->name, - dst_father->name); + /* If we are here, src and dst are not in the same AS; check whether a direct bypass is defined */ - xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", - src_father->name, dst_father->name); + route_t e_route_bypass = NULL; + if (common_father->get_bypass_route) + e_route_bypass = common_father->get_bypass_route(common_father, src, dst); - xbt_assert((e_route_cnt->src_gateway == NULL) == - (e_route_cnt->dst_gateway == NULL), - "bad gateway for route between \"%s\" and \"%s\"", 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 (route) { - *route = xbt_dynar_new(global_routing->size_of_link, NULL); - } - if (latency) { - *latency = common_father->get_latency(common_father, - src_father->name, dst_father->name, - e_route_cnt); - xbt_assert(*latency >= 0.0, - "latency error on route between \"%s\" and \"%s\"", - src_father->name, dst_father->name); + // 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); } - void *link; - unsigned int cpt; - - if (strcmp(src, e_route_cnt->src_gateway)) { - double latency_src; - xbt_dynar_t route_src; - - _get_route_latency(src, e_route_cnt->src_gateway, - (route ? &route_src : NULL), - (latency ? &latency_src : NULL)); - if (route) { - xbt_assert(route_src, "no route between \"%s\" and \"%s\"", - src, e_route_cnt->src_gateway); - xbt_dynar_foreach(route_src, cpt, link) { - xbt_dynar_push(*route, &link); - } - xbt_dynar_free(&route_src); - } - if (latency) { - xbt_assert(latency_src >= 0.0, - "latency error on route between \"%s\" and \"%s\"", - src, e_route_cnt->src_gateway); - *latency += latency_src; - } - } + generic_free_route(e_route_bypass); + return; + } - if (route) { - xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { - xbt_dynar_push(*route, &link); - } - } - if (strcmp(e_route_cnt->dst_gateway, dst)) { - double latency_dst; - xbt_dynar_t route_dst; - - _get_route_latency(e_route_cnt->dst_gateway, dst, - (route ? &route_dst : NULL), - (latency ? &latency_dst : NULL)); - if (route) { - xbt_assert(route_dst, "no route between \"%s\" and \"%s\"", - e_route_cnt->dst_gateway, dst); - xbt_dynar_foreach(route_dst, cpt, link) { - xbt_dynar_push(*route, &link); - } - xbt_dynar_free(&route_dst); - } - if (latency) { - xbt_assert(latency_dst >= 0.0, - "latency error on route between \"%s\" and \"%s\"", - e_route_cnt->dst_gateway, dst); - *latency += latency_dst; - } - } + /* Not in the same AS, no bypass. We'll have to find our path between the ASes recursively*/ - generic_free_extended_route(e_route_cnt); - } -} + 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); -/** - * \brief Generic function for get_route, get_route_no_cleanup, and get_latency - */ -static void get_route_latency(const char *src, const char *dst, - xbt_dynar_t * route, double *latency, int cleanup) -{ - _get_route_latency(src, dst, route, latency); - xbt_assert(!route || *route, "no route between \"%s\" and \"%s\"", src, dst); - xbt_assert(!latency || *latency >= 0.0, - "latency error on route between \"%s\" and \"%s\"", src, dst); - if (route) { - xbt_dynar_free(&global_routing->last_route); - global_routing->last_route = cleanup ? *route : NULL; + xbt_assert((route.src_gateway != NULL) && (route.dst_gateway != NULL), + "bad gateways for route from \"%s\" to \"%s\"", src, dst); + + *links = xbt_dynar_new(global_routing->size_of_link, NULL); + + char*src_gateway = route.src_gateway; + char*dst_gateway = 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); + + xbt_dynar_foreach(route.link_list, cpt, link) { + xbt_dynar_push(*links, &link); } -} -/** - * \brief Generic method: find a route between hosts - * - * \param src the source host name - * \param dst the destination host name - * - * walk through the routing components tree and find a route between hosts - * by calling the differents "get_route" functions in each routing component. - * No need to free the returned dynar. It will be freed at the next call. - */ -static xbt_dynar_t get_route(const char *src, const char *dst) -{ - xbt_dynar_t route = NULL; - get_route_latency(src, dst, &route, NULL, 1); - return route; -} + /* 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); -/** - * \brief Generic method: find a route between hosts - * - * \param src the source host name - * \param dst the destination host name - * - * same as get_route, but return NULL if any exception is raised. - */ -static xbt_dynar_t get_route_or_null(const char *src, const char *dst) -{ - xbt_dynar_t route = NULL; - xbt_ex_t exception; - TRY { - get_route_latency(src, dst, &route, NULL, 1); - } CATCH(exception) { - xbt_ex_free(exception); - return NULL; } - return route; } /** - * \brief Generic method: find a route between hosts + * \brief Find a route between hosts * * \param src the source host name * \param dst the destination host name + * \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) + * It is the caller responsability to initialize latency to 0 (we add to provided route) + * \pre route!=NULL * * walk through the routing components tree and find a route between hosts * by calling the differents "get_route" functions in each routing component. - * Leaves the caller the responsability to clean the returned dynar. */ -static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst) +void routing_get_route_and_latency(const char *src, const char *dst, + xbt_dynar_t * route, double *latency) { - xbt_dynar_t route = NULL; - get_route_latency(src, dst, &route, NULL, 0); - return route; -} + static xbt_dynar_t last_route = NULL; -/*Get Latency*/ -static double get_latency(const char *src, const char *dst) -{ - double latency = -1.0; - get_route_latency(src, dst, NULL, &latency, 0); - return latency; -} + int need_cleanup = !(*route); -/** - * \brief Recursive function for finalize - * - * \param rc the source host name - * - * This fuction is call by "finalize". It allow to finalize the - * AS or routing components. It delete all the structures. - */ -static void _finalize(routing_component_t rc) -{ - if (rc) { - xbt_dict_cursor_t cursor = NULL; - char *key; - routing_component_t elem; - xbt_dict_foreach(rc->routing_sons, cursor, key, elem) { - _finalize(elem); - } - xbt_dict_t tmp_sons = rc->routing_sons; - char *tmp_name = rc->name; - xbt_dict_free(&tmp_sons); - xbt_free(tmp_name); - xbt_assert(rc->finalize, "no defined method \"finalize\" in \"%s\"", - current_routing->name); - (*(rc->finalize)) (rc); + if (need_cleanup) { + xbt_dynar_free(&last_route); + last_route = *route = xbt_dynar_new(global_routing->size_of_link,NULL); } -} -/** - * \brief Generic method: delete all the routing structures - * - * walk through the routing components tree and delete the structures - * by calling the different "finalize" functions in each routing component - */ -static void finalize(void) -{ - /* delete recursively all the tree */ - _finalize(global_routing->root); - /* delete last_route */ - xbt_dynar_free(&(global_routing->last_route)); - /* delete global routing structure */ - xbt_free(global_routing); + _get_route_and_latency(src, dst, route, latency); + + xbt_assert(!latency || *latency >= 0.0, + "negative latency on route between \"%s\" and \"%s\"", src, dst); } -static xbt_dynar_t recursive_get_onelink_routes(routing_component_t rc) +static xbt_dynar_t recursive_get_onelink_routes(AS_t rc) { xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free); @@ -728,7 +618,7 @@ static xbt_dynar_t recursive_get_onelink_routes(routing_component_t rc) //recursing char *key; xbt_dict_cursor_t cursor = NULL; - routing_component_t rc_child; + 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) { @@ -745,7 +635,7 @@ static xbt_dynar_t get_onelink_routes(void) return recursive_get_onelink_routes(global_routing->root); } -e_surf_network_element_type_t get_network_element_type(const char *name) +e_surf_network_element_type_t routing_get_network_element_type(const char *name) { network_element_info_t rc = NULL; @@ -770,17 +660,9 @@ void routing_model_create(size_t size_of_links, void *loopback) /* config the uniq global routing */ global_routing = xbt_new0(s_routing_global_t, 1); global_routing->root = NULL; - global_routing->get_route = get_route; - global_routing->get_route_or_null = get_route_or_null; - global_routing->get_latency = get_latency; - global_routing->get_route_no_cleanup = get_route_no_cleanup; global_routing->get_onelink_routes = get_onelink_routes; - global_routing->get_route_latency = get_route_latency; - global_routing->get_network_element_type = get_network_element_type; - global_routing->finalize = finalize; global_routing->loopback = loopback; global_routing->size_of_link = size_of_links; - global_routing->last_route = NULL; /* no current routing at moment */ current_routing = NULL; } @@ -833,34 +715,34 @@ void routing_model_create(size_t size_of_links, void *loopback) /* ************************* GENERIC PARSE FUNCTIONS ************************ */ -static void routing_parse_cluster(void) +static void routing_parse_cluster(sg_platf_cluster_cbarg_t cluster) { char *host_id, *groups, *link_id = NULL; + xbt_dict_t patterns = NULL; s_sg_platf_host_cbarg_t host; s_sg_platf_link_cbarg_t link; - if (strcmp(struct_cluster->availability_trace, "") - || strcmp(struct_cluster->state_trace, "")) { - if (xbt_dict_size(patterns) == 0) - patterns = xbt_dict_new(); - xbt_dict_set(patterns, "id", xbt_strdup(struct_cluster->id), free); - xbt_dict_set(patterns, "prefix", xbt_strdup(struct_cluster->prefix), free); - xbt_dict_set(patterns, "suffix", xbt_strdup(struct_cluster->suffix), free); - } - unsigned int iter; int start, end, i; xbt_dynar_t radical_elements; xbt_dynar_t radical_ends; - XBT_DEBUG("", struct_cluster->id); - sg_platf_new_AS_begin(struct_cluster->id, "Cluster"); + if (strcmp(cluster->availability_trace, "") + || strcmp(cluster->state_trace, "")) { + patterns = xbt_dict_new(); + xbt_dict_set(patterns, "id", xbt_strdup(cluster->id), free); + xbt_dict_set(patterns, "prefix", xbt_strdup(cluster->prefix), free); + xbt_dict_set(patterns, "suffix", xbt_strdup(cluster->suffix), free); + } + + + XBT_DEBUG("", cluster->id); + sg_platf_new_AS_begin(cluster->id, "Cluster"); //Make all hosts - radical_elements = xbt_str_split(struct_cluster->radical, ","); + radical_elements = xbt_str_split(cluster->radical, ","); xbt_dynar_foreach(radical_elements, iter, groups) { - memset(&host, 0, sizeof(host)); radical_ends = xbt_str_split(groups, "-"); start = surf_parse_get_int(xbt_dynar_get_as(radical_ends, 0, char *)); @@ -878,66 +760,49 @@ static void routing_parse_cluster(void) } for (i = start; i <= end; i++) { host_id = - bprintf("%s%d%s", struct_cluster->prefix, i, struct_cluster->suffix); - link_id = bprintf("%s_link_%d", struct_cluster->id, i); + bprintf("%s%d%s", cluster->prefix, i, cluster->suffix); + link_id = bprintf("%s_link_%d", cluster->id, i); + + XBT_DEBUG("", host_id, cluster->power); - XBT_DEBUG("", host_id, - struct_cluster->power); + memset(&host, 0, sizeof(host)); host.id = host_id; - if (strcmp(struct_cluster->availability_trace, "")) { + if (strcmp(cluster->availability_trace, "")) { xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free); - char *tmp_availability_file = - xbt_strdup(struct_cluster->availability_trace); - xbt_str_varsubst(tmp_availability_file, patterns); - XBT_DEBUG("\tavailability_file=\"%s\"", tmp_availability_file); - host.power_trace = tmgr_trace_new(tmp_availability_file); - xbt_free(tmp_availability_file); + char *avail_file = xbt_str_varsubst(cluster->availability_trace, patterns); + XBT_DEBUG("\tavailability_file=\"%s\"", avail_file); + host.power_trace = tmgr_trace_new(avail_file); + xbt_free(avail_file); } else { XBT_DEBUG("\tavailability_file=\"\""); } - if (strcmp(struct_cluster->state_trace, "")) { - char *tmp_state_file = xbt_strdup(struct_cluster->state_trace); - xbt_str_varsubst(tmp_state_file, patterns); - XBT_DEBUG("\tstate_file=\"%s\"", tmp_state_file); - host.state_trace = tmgr_trace_new(tmp_state_file); - xbt_free(tmp_state_file); + + if (strcmp(cluster->state_trace, "")) { + char *avail_file = xbt_str_varsubst(cluster->state_trace, patterns); + XBT_DEBUG("\tstate_file=\"%s\"", avail_file); + host.state_trace = tmgr_trace_new(avail_file); + xbt_free(avail_file); } else { XBT_DEBUG("\tstate_file=\"\""); } - host.power_peak = struct_cluster->power; + host.power_peak = cluster->power; host.power_scale = 1.0; - host.core_amount = struct_cluster->core_amount; + host.core_amount = cluster->core_amount; host.initial_state = SURF_RESOURCE_ON; host.coord = ""; sg_platf_new_host(&host); XBT_DEBUG(""); XBT_DEBUG("", link_id, - struct_cluster->bw, struct_cluster->lat); + cluster->bw, cluster->lat); memset(&link, 0, sizeof(link)); link.id = link_id; - link.bandwidth = struct_cluster->bw; - link.latency = struct_cluster->lat; + link.bandwidth = cluster->bw; + link.latency = cluster->lat; link.state = SURF_RESOURCE_ON; - - switch (struct_cluster->sharing_policy) { - case A_surfxml_cluster_sharing_policy_SHARED: - link.policy = SURF_LINK_SHARED; - break; - case A_surfxml_cluster_sharing_policy_FULLDUPLEX: - link.policy = SURF_LINK_FULLDUPLEX; - break; - case A_surfxml_cluster_sharing_policy_FATPIPE: - link.policy = SURF_LINK_FATPIPE; - break; - default: - surf_parse_error(bprintf - ("Invalid cluster sharing policy for cluster %s", - struct_cluster->id)); - break; - } + link.policy = cluster->sharing_policy; sg_platf_new_link(&link); surf_parsing_link_up_down_t info = @@ -965,88 +830,50 @@ static void routing_parse_cluster(void) } xbt_dynar_free(&radical_elements); - // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, and it's very useful to connect clusters together + // Add a router. It is magically used thanks to the way in which surf_routing_cluster is written, + // and it's very useful to connect clusters together XBT_DEBUG(" "); - XBT_DEBUG("", struct_cluster->router_id); - s_sg_platf_router_cbarg_t router; + XBT_DEBUG("", cluster->router_id); char *newid = NULL; + s_sg_platf_router_cbarg_t router; memset(&router, 0, sizeof(router)); - router.id = struct_cluster->router_id; + router.id = cluster->router_id; router.coord = ""; if (!router.id || !strcmp(router.id, "")) router.id = newid = - bprintf("%s%s_router%s", struct_cluster->prefix, struct_cluster->id, - struct_cluster->suffix); + bprintf("%s%s_router%s", cluster->prefix, cluster->id, + cluster->suffix); sg_platf_new_router(&router); free(newid); //Make the backbone - if ((struct_cluster->bb_bw != 0) && (struct_cluster->bb_lat != 0)) { - char *link_backbone = bprintf("%s_backbone", struct_cluster->id); + if ((cluster->bb_bw != 0) && (cluster->bb_lat != 0)) { + char *link_backbone = bprintf("%s_backbone", cluster->id); XBT_DEBUG("", link_backbone, - struct_cluster->bb_bw, struct_cluster->bb_lat); + cluster->bb_bw, cluster->bb_lat); memset(&link, 0, sizeof(link)); link.id = link_backbone; - link.bandwidth = struct_cluster->bb_bw; - link.latency = struct_cluster->bb_lat; + link.bandwidth = cluster->bb_bw; + link.latency = cluster->bb_lat; link.state = SURF_RESOURCE_ON; - - switch (struct_cluster->bb_sharing_policy) { - case A_surfxml_cluster_bb_sharing_policy_FATPIPE: - link.policy = SURF_LINK_FATPIPE; - break; - case A_surfxml_cluster_bb_sharing_policy_SHARED: - link.policy = SURF_LINK_SHARED; - break; - default: - surf_parse_error(bprintf - ("Invalid bb sharing policy in cluster %s", - struct_cluster->id)); - break; - } + link.policy = cluster->bb_sharing_policy; sg_platf_new_link(&link); - surf_parsing_link_up_down_t info = - xbt_new0(s_surf_parsing_link_up_down_t, 1); - info->link_up = - xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL); - info->link_down = info->link_up; - surf_routing_cluster_add_link(struct_cluster->id, info); + surf_routing_cluster_add_backbone(current_routing, xbt_lib_get_or_null(link_lib, link_backbone, SURF_LINK_LEVEL)); free(link_backbone); } - XBT_DEBUG(" "); - - char *new_suffix = xbt_strdup(""); - - radical_elements = xbt_str_split(struct_cluster->suffix, "."); - xbt_dynar_foreach(radical_elements, iter, groups) { - if (strcmp(groups, "")) { - char *old_suffix = new_suffix; - new_suffix = bprintf("%s\\.%s", old_suffix, groups); - free(old_suffix); - } - } - - xbt_dynar_free(&radical_elements); - xbt_free(new_suffix); - - if (strcmp(struct_cluster->availability_trace, "") - || strcmp(struct_cluster->state_trace, "")) - xbt_dict_free(&patterns); - XBT_DEBUG(""); sg_platf_new_AS_end(); XBT_DEBUG(" "); + xbt_dict_free(&patterns); // no op if it were never set } -static void routing_parse_postparse(void) -{ +static void routing_parse_postparse(void) { xbt_dict_free(&random_value); - xbt_dict_free(&patterns); } static void routing_parse_peer(sg_platf_peer_cbarg_t peer) @@ -1084,6 +911,7 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) host.power_trace = peer->availability_trace; host.state_trace = peer->state_trace; host.core_amount = 1; + host.coord = peer->coord; sg_platf_new_host(&host); @@ -1212,7 +1040,7 @@ static void routing_parse_Srandom(void) random_id, random->min, random->max, random->mean, random->std, random->generator, random->seed, random_radical); - if (xbt_dict_size(random_value) == 0) + if (!random_value) random_value = xbt_dict_new(); if (!strcmp(random_radical, "")) { @@ -1250,7 +1078,7 @@ static void routing_parse_Srandom(void) } break; default: - XBT_INFO("Malformed radical"); + XBT_CRITICAL("Malformed radical"); break; } res = random_generate(random); @@ -1284,7 +1112,7 @@ void routing_register_callbacks() surfxml_add_callback(ETag_surfxml_bypassRoute_cb_list, &routing_parse_E_bypassRoute); - surfxml_add_callback(STag_surfxml_cluster_cb_list, &routing_parse_cluster); + sg_platf_cluster_add_cb(routing_parse_cluster); sg_platf_peer_add_cb(routing_parse_peer); sg_platf_postparse_add_cb(routing_parse_postparse); @@ -1293,3 +1121,31 @@ void routing_register_callbacks() instr_routing_define_callbacks(); #endif } + +/** + * \brief Recursive function for finalize + * + * \param rc the source host name + * + * This fuction is call by "finalize". It allow to finalize the + * AS or routing components. It delete all the structures. + */ +static void finalize_rec(AS_t as) { + xbt_dict_cursor_t cursor = NULL; + char *key; + AS_t elem; + + xbt_dict_foreach(as->routing_sons, cursor, key, elem) { + finalize_rec(elem); + } + + as->finalize(as); +} + +/** \brief Frees all memory allocated by the routing module */ +void routing_exit(void) { + if (!global_routing) + return; + finalize_rec(global_routing->root); + xbt_free(global_routing); +}