X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c9b8ae2a235057d3eac28aa41a2ff89ba7b331d..ece2a48768fd651b376314538a44fe06da2abec0:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 0f6c426f7c..a9630d2eb0 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; @@ -50,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 */ @@ -100,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); } } @@ -127,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); } } @@ -226,12 +245,12 @@ 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 = 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); + current_routing->parse_route(current_routing, src, dst, route); link_list = NULL; src = NULL; dst = NULL; @@ -242,14 +261,14 @@ 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 = 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); + current_routing->parse_ASroute(current_routing, src, dst, e_route); link_list = NULL; src = NULL; dst = NULL; @@ -262,14 +281,14 @@ 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 = 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); + current_routing->parse_bypassroute(current_routing, src, dst, e_route); link_list = NULL; src = NULL; dst = NULL; @@ -311,11 +330,10 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) } /* make a new routing component */ - new_as = (AS_t) (*(model->create)) (); + new_as = (AS_t) model->create(); new_as->model_desc = model; new_as->hierarchy = SURF_ROUTING_NULL; new_as->name = xbt_strdup(AS_id); - new_as->routing_sons = xbt_dict_new(); if (current_routing == NULL && global_routing->root == NULL) { @@ -337,7 +355,7 @@ 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); + current_routing->parse_AS(current_routing, AS_id); } else { THROWF(arg_error, 0, "All defined components must be belong to a AS"); } @@ -373,7 +391,7 @@ void routing_AS_end() (void *) info); if (current_routing->model_desc->end) - (*(current_routing->model_desc->end)) (current_routing); + current_routing->model_desc->end(current_routing); current_routing = current_routing->routing_father; } } @@ -460,183 +478,152 @@ 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 * route, double *latency) { + void *link; + unsigned int cpt; + XBT_DEBUG("Solve route/latency \"%s\" to \"%s\"", src, dst); xbt_assert(src && dst, "bad parameters for \"_get_route_latency\" method"); - AS_t common_father; - AS_t src_father; - AS_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); - } + route_t e_route = xbt_new0(s_route_t, 1); + e_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); - } else { /* SURF_ROUTING_RECURSIVE */ + common_father->get_route(common_father, src, dst, e_route); + *route = e_route->link_list; - 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); + if (latency) + *latency += common_father->get_latency(common_father, src, dst, e_route); - xbt_assert(!latency || !e_route_bypass, - "Bypass cannot work yet with get_latency"); + xbt_free(e_route->src_gateway); + xbt_free(e_route->dst_gateway); + xbt_free(e_route); + 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: that limitation seems supurious to me -- check with alvin - 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); - } + *route = xbt_dynar_new(global_routing->size_of_link, NULL); - 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; - } + xbt_dynar_foreach(e_route_bypass->link_list, cpt, link) { + xbt_dynar_push(*route, &link); } - if (route) { - xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { - xbt_dynar_push(*route, &link); - } - } + generic_free_route(e_route_bypass); + return; + } - 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*/ + + route_t e_route_cnt = xbt_new0(s_route_t, 1); + e_route_cnt->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); + common_father->get_route(common_father, src_father->name, dst_father->name, e_route_cnt); + + xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", + src_father->name, dst_father->name); + + xbt_assert((e_route_cnt->src_gateway == NULL) == + (e_route_cnt->dst_gateway == NULL), + "bad gateway for route between \"%s\" and \"%s\"", src, dst); + + *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); + } + + + /* If source gateway is not our source, we have to recursively find our way up to this point */ + if (strcmp(src, e_route_cnt->src_gateway)) { + xbt_dynar_t route_src; + + _get_route_and_latency(src, e_route_cnt->src_gateway, + (route ? &route_src : NULL), + latency); + + xbt_dynar_foreach(route_src, cpt, link) { + xbt_dynar_push(*route, &link); } + xbt_dynar_free(&route_src); + } - generic_free_extended_route(e_route_cnt); + xbt_dynar_foreach(e_route_cnt->link_list, cpt, link) { + xbt_dynar_push(*route, &link); } -} -/** - * \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) -{ - static xbt_dynar_t last_route = NULL; + /* If dest gateway is not our destination, we have to recursively find our way from this point */ + if (strcmp(e_route_cnt->dst_gateway, dst)) { + xbt_dynar_t route_dst; + + _get_route_and_latency(e_route_cnt->dst_gateway, dst, + (route ? &route_dst : NULL), + latency); + + xbt_dynar_foreach(route_dst, cpt, link) { + xbt_dynar_push(*route, &link); + } + xbt_dynar_free(&route_dst); - _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(&last_route); - last_route = cleanup ? *route : NULL; } -} -/** - * \brief 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. - */ -xbt_dynar_t routing_get_route(const char *src, const char *dst) { - xbt_dynar_t route = NULL; - get_route_latency(src, dst, &route, NULL, 1); - return route; + generic_free_route(e_route_cnt); } /** - * \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; + + int need_cleanup = !(*route); + + if (need_cleanup) { + xbt_dynar_free(&last_route); + last_route = *route = xbt_dynar_new(global_routing->size_of_link,NULL); + } + + _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(AS_t rc) @@ -697,9 +684,7 @@ 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_no_cleanup = get_route_no_cleanup; global_routing->get_onelink_routes = get_onelink_routes; - global_routing->get_route_latency = get_route_latency; global_routing->loopback = loopback; global_routing->size_of_link = size_of_links; /* no current routing at moment */ @@ -754,7 +739,7 @@ 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; @@ -762,26 +747,26 @@ static void routing_parse_cluster(void) 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, "")) { - 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 *)); @@ -799,65 +784,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, - struct_cluster->power); + XBT_DEBUG("", host_id, 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_str_varsubst(struct_cluster->availability_trace, 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_str_varsubst(struct_cluster->state_trace, 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 = @@ -885,75 +854,42 @@ 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); - XBT_DEBUG(""); sg_platf_new_AS_end(); XBT_DEBUG(" "); @@ -999,6 +935,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); @@ -1127,7 +1064,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, "")) { @@ -1165,7 +1102,7 @@ static void routing_parse_Srandom(void) } break; default: - XBT_INFO("Malformed radical"); + XBT_CRITICAL("Malformed radical"); break; } res = random_generate(random); @@ -1199,7 +1136,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); @@ -1222,11 +1159,10 @@ static void finalize_rec(AS_t as) { char *key; AS_t elem; - xbt_dict_foreach(as->routing_sons, cursor, key, elem) - finalize_rec(elem); + xbt_dict_foreach(as->routing_sons, cursor, key, elem) { + finalize_rec(elem); + } - xbt_dict_free(&as->routing_sons); - xbt_free(as->name); as->finalize(as); }