X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/5e52cdafc655354a1c98193c817fc205d5be353e..333c41b2486c95a8ea84588190524d34f91c3524:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 0f469d5fe9..7ad72d3c5e 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -292,7 +292,7 @@ static void routing_parse_E_bypassRoute(void) */ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) { - AS_t new_routing; + AS_t new_as; routing_model_description_t model = NULL; int cpt; @@ -311,17 +311,16 @@ void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) } /* make a new routing component */ - new_routing = (AS_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) { @@ -329,20 +328,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); } 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; } /** @@ -372,8 +371,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)) (current_routing); + if (current_routing->model_desc->end) + (*(current_routing->model_desc->end)) (current_routing); current_routing = current_routing->routing_father; } } @@ -594,18 +593,20 @@ static void _get_route_latency(const char *src, const char *dst, 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; + _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_dynar_free(&last_route); + last_route = cleanup ? *route : NULL; } } /** - * \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 @@ -614,34 +615,12 @@ static void get_route_latency(const char *src, const char *dst, * 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 routing_get_route(const char *src, const char *dst) { xbt_dynar_t route = NULL; get_route_latency(src, dst, &route, NULL, 1); return route; } -/** - * \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 * @@ -659,13 +638,6 @@ static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst) return route; } -static double get_latency(const char *src, const char *dst) { - double latency = -1.0; - get_route_latency(src, dst, NULL, &latency, 0); - return latency; -} - - static xbt_dynar_t recursive_get_onelink_routes(AS_t rc) { xbt_dynar_t ret = xbt_dynar_new(sizeof(onelink_t), xbt_free); @@ -699,7 +671,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; @@ -724,16 +696,11 @@ 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->loopback = loopback; global_routing->size_of_link = size_of_links; - global_routing->last_route = NULL; /* no current routing at moment */ current_routing = NULL; } @@ -794,6 +761,11 @@ static void routing_parse_cluster(void) s_sg_platf_host_cbarg_t host; s_sg_platf_link_cbarg_t link; + unsigned int iter; + int start, end, i; + xbt_dynar_t radical_elements; + xbt_dynar_t radical_ends; + if (strcmp(struct_cluster->availability_trace, "") || strcmp(struct_cluster->state_trace, "")) { patterns = xbt_dict_new(); @@ -802,10 +774,6 @@ static void routing_parse_cluster(void) 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"); @@ -813,7 +781,6 @@ static void routing_parse_cluster(void) //Make all hosts radical_elements = xbt_str_split(struct_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 *)); @@ -834,25 +801,25 @@ static void routing_parse_cluster(void) bprintf("%s%d%s", struct_cluster->prefix, i, struct_cluster->suffix); link_id = bprintf("%s_link_%d", struct_cluster->id, i); - XBT_DEBUG("", host_id, - struct_cluster->power); + XBT_DEBUG("", host_id, struct_cluster->power); + + memset(&host, 0, sizeof(host)); host.id = host_id; if (strcmp(struct_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(struct_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); + char *avail_file = xbt_str_varsubst(struct_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=\"\""); } @@ -917,11 +884,12 @@ 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; char *newid = NULL; + s_sg_platf_router_cbarg_t router; memset(&router, 0, sizeof(router)); router.id = struct_cluster->router_id; router.coord = ""; @@ -960,32 +928,11 @@ static void routing_parse_cluster(void) 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(" "); @@ -1254,11 +1201,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); } @@ -1267,6 +1213,5 @@ void routing_exit(void) { if (!global_routing) return; finalize_rec(global_routing->root); - xbt_dynar_free(&global_routing->last_route); xbt_free(global_routing); }