X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/54d06bd3a321bcec5204d3308171663449691640..ea97700f4d2ec9adfcd537e8a86e6d146c50a37c:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 1777929aa8..658d80c5e4 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -32,13 +32,12 @@ 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; -model_type_t current_routing_model = NULL; +AS_t current_routing = NULL; +routing_model_description_t current_routing_model = NULL; /* global parse functions */ xbt_dynar_t link_list = NULL; /* temporary store of current list link of a route */ @@ -70,25 +69,25 @@ typedef enum { struct s_model_type routing_models[] = { {"Full", "Full routing data (fast, large memory requirements, fully expressive)", - model_full_create, NULL,NULL, model_full_end}, + model_full_create, model_full_end}, {"Floyd", "Floyd routing data (slow initialization, fast lookup, lesser memory requirements, shortest path routing only)", - model_floyd_create, NULL,NULL, model_floyd_end}, + model_floyd_create, model_floyd_end}, {"Dijkstra", "Dijkstra routing data (fast initialization, slow lookup, small memory requirements, shortest path routing only)", - model_dijkstra_create, NULL,NULL, model_dijkstra_both_end}, + model_dijkstra_create, model_dijkstra_both_end}, {"DijkstraCache", "Dijkstra routing data (fast initialization, fast lookup, small memory requirements, shortest path routing only)", - model_dijkstracache_create, NULL,NULL, model_dijkstra_both_end}, + model_dijkstracache_create, model_dijkstra_both_end}, {"none", "No routing (usable with Constant network only)", - model_none_create, NULL, NULL, NULL}, + model_none_create, NULL}, {"RuleBased", "Rule-Based routing data (...)", - model_rulebased_create, NULL, NULL, NULL}, + model_rulebased_create, NULL}, {"Vivaldi", "Vivaldi routing", - model_vivaldi_create, NULL, NULL, NULL}, + model_vivaldi_create, NULL}, {"Cluster", "Cluster routing", - model_cluster_create, NULL, NULL, NULL}, - {NULL, NULL, NULL, NULL, NULL, NULL} + model_cluster_create, NULL}, + {NULL, NULL, NULL, NULL} }; /** @@ -102,7 +101,7 @@ 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->set_processing_unit)) (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; @@ -129,7 +128,7 @@ static void parse_S_router(sg_platf_router_cbarg_t router) "Reading a router, processing unit \"%s\" already exists", router->id); - (*(current_routing->set_processing_unit)) (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; @@ -228,12 +227,12 @@ static void routing_parse_link_ctn(void) */ static void routing_parse_E_route(void) { - name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1); + route_extended_t route = xbt_new0(s_route_extended_t, 1); route->generic_route.link_list = link_list; - xbt_assert(current_routing->set_route, + xbt_assert(current_routing->parse_route, "no defined method \"set_route\" in \"%s\"", current_routing->name); - (*(current_routing->set_route)) (current_routing, src, dst, route); + (*(current_routing->parse_route)) (current_routing, src, dst, route); link_list = NULL; src = NULL; dst = NULL; @@ -244,14 +243,14 @@ static void routing_parse_E_route(void) */ static void routing_parse_E_ASroute(void) { - name_route_extended_t e_route = xbt_new0(s_name_route_extended_t, 1); + route_extended_t e_route = xbt_new0(s_route_extended_t, 1); e_route->generic_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->set_ASroute, + xbt_assert(current_routing->parse_ASroute, "no defined method \"set_ASroute\" in \"%s\"", current_routing->name); - (*(current_routing->set_ASroute)) (current_routing, src, dst, e_route); + (*(current_routing->parse_ASroute)) (current_routing, src, dst, e_route); link_list = NULL; src = NULL; dst = NULL; @@ -268,10 +267,10 @@ static void routing_parse_E_bypassRoute(void) e_route->generic_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->set_bypassroute, + xbt_assert(current_routing->parse_bypassroute, "Bypassing mechanism not implemented by routing '%s'", current_routing->name); - (*(current_routing->set_bypassroute)) (current_routing, src, dst, e_route); + (*(current_routing->parse_bypassroute)) (current_routing, src, dst, e_route); link_list = NULL; src = NULL; dst = NULL; @@ -292,14 +291,12 @@ static void routing_parse_E_bypassRoute(void) * @param AS_id name of this autonomous system. Must be unique in the platform * @param wanted_routing_type one of Full, Floyd, Dijkstra or similar. Full list in the variable routing_models, in src/surf/surf_routing.c */ -void routing_AS_open(const char *AS_id, const char *wanted_routing_type) +void routing_AS_begin(const char *AS_id, const char *wanted_routing_type) { - routing_component_t new_routing; - model_type_t model = NULL; + AS_t new_routing; + routing_model_description_t model = NULL; int cpt; - surf_parse_models_setup(); /* ensure that the models are created after the last tag and before the first -like */ - /* search the routing model */ for (cpt = 0; routing_models[cpt].name; cpt++) if (!strcmp(wanted_routing_type, routing_models[cpt].name)) @@ -315,7 +312,7 @@ void routing_AS_open(const char *AS_id, const char *wanted_routing_type) } /* make a new routing component */ - new_routing = (routing_component_t) (*(model->create)) (); + new_routing = (AS_t) (*(model->create)) (); new_routing->routing = model; new_routing->hierarchy = SURF_ROUTING_NULL; new_routing->name = xbt_strdup(AS_id); @@ -341,17 +338,10 @@ void routing_AS_open(const char *AS_id, const char *wanted_routing_type) xbt_dict_set(current_routing->routing_sons, AS_id, (void *) new_routing, NULL); /* add to the father element list */ - (*(current_routing->set_autonomous_system)) (current_routing, AS_id); - /* unload the prev parse rules */ - if (current_routing->routing->unload) - (*(current_routing->routing->unload)) (); - + (*(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 parse rules */ - if (new_routing->routing->load) - (*(new_routing->routing->load)) (); /* set the new current component of the tree */ current_routing = new_routing; } @@ -367,7 +357,7 @@ void routing_AS_open(const char *AS_id, const char *wanted_routing_type) * even if you add stuff to a closed AS * */ -void routing_AS_close() +void routing_AS_end() { if (current_routing == NULL) { @@ -383,36 +373,14 @@ void routing_AS_close() xbt_lib_set(as_router_lib, current_routing->name, ROUTING_ASR_LEVEL, (void *) info); - if (current_routing->routing->unload) - (*(current_routing->routing->unload)) (); if (current_routing->routing->end) (*(current_routing->routing->end)) (); current_routing = current_routing->routing_father; - if (current_routing != NULL && current_routing->routing->load != NULL) - (*(current_routing->routing->load)) (); } } /* Aux Business methods */ -/** - * \brief Get the AS name of the element - * - * \param name the host name - * - */ -static char *elements_As_name(const char *name) -{ - routing_component_t as_comp; - - /* (1) find the as where the host is located */ - as_comp = ((network_element_info_t) - xbt_lib_get_or_null(host_lib, name, - ROUTING_HOST_LEVEL))->rc_component; - return as_comp->name; -} - - /** * \brief Get the AS father and the first elements of the chain * @@ -423,21 +391,21 @@ static char *elements_As_name(const char *name) * 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, @@ -505,9 +473,9 @@ static void _get_route_latency(const char *src, const char *dst, 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; + AS_t common_father; + AS_t src_father; + AS_t dst_father; elements_father(src, dst, &common_father, &src_father, &dst_father); if (src_father == dst_father) { /* SURF_ROUTING_BASE */ @@ -692,27 +660,12 @@ static xbt_dynar_t get_route_no_cleanup(const char *src, const char *dst) return route; } -/*Get Latency*/ -static double get_latency(const char *src, const char *dst) -{ +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 int surf_parse_models_setup_already_called = 0; -/* Call the last initialization functions, that must be called after the - * tag, if any, and before the first of cluster|peer|AS|trace|trace_connect - */ -void surf_parse_models_setup() -{ - if (surf_parse_models_setup_already_called) - return; - surf_parse_models_setup_already_called = 1; - surf_config_models_setup(); -} - - /** * \brief Recursive function for finalize * @@ -721,44 +674,32 @@ void surf_parse_models_setup() * 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); - } +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); + + xbt_dict_free(&as->routing_sons); + xbt_free(as->name); + as->finalize(as); } /** * \brief Generic method: delete all the routing structures * * walk through the routing components tree and delete the structures - * by calling the differents "finalize" functions in each routing component + * 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 */ +static void finalize(void) { + finalize_rec(global_routing->root); + xbt_dynar_free(&global_routing->last_route); xbt_free(global_routing); - /* make sure that we will reinit the models while loading the platf once reinited -- HACK but there is no proper surf_routing_init() */ - surf_parse_models_setup_already_called = 0; } -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); @@ -774,7 +715,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) { @@ -882,14 +823,14 @@ void routing_model_create(size_t size_of_links, void *loopback) static void routing_parse_cluster(void) { 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(); + 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); @@ -901,7 +842,7 @@ static void routing_parse_cluster(void) xbt_dynar_t radical_ends; XBT_DEBUG("", struct_cluster->id); - sg_platf_new_AS_open(struct_cluster->id, "Cluster"); + sg_platf_new_AS_begin(struct_cluster->id, "Cluster"); //Make all hosts radical_elements = xbt_str_split(struct_cluster->radical, ","); @@ -933,8 +874,7 @@ static void routing_parse_cluster(void) if (strcmp(struct_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_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); @@ -942,8 +882,8 @@ static void routing_parse_cluster(void) 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); + 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); @@ -1080,43 +1020,14 @@ static void routing_parse_cluster(void) 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_close(); + sg_platf_new_AS_end(); XBT_DEBUG(" "); + xbt_dict_free(&patterns); // no op if it were never set } -/* - * This function take a string and replace parameters from patterns dict. - * It returns the new value. - */ -static char *replace_random_parameter(char *string) -{ - char *test_string = NULL; - - if (xbt_dict_size(random_value) == 0) - return string; - - string = xbt_str_varsubst(string, patterns); // for patterns of cluster - test_string = bprintf("${%s}", string); - test_string = xbt_str_varsubst(test_string, random_value); //Add ${xxxxx} for random Generator - - if (strcmp(test_string, "")) { //if not empty, keep this value. - xbt_free(string); - string = test_string; - } //In other case take old value (without ${}) - else - free(test_string); - return string; -} - -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) @@ -1133,7 +1044,7 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) surfxml_bufferstack_push(1); XBT_DEBUG("", peer->id); - sg_platf_new_AS_open(peer->id, "Full"); + sg_platf_new_AS_begin(peer->id, "Full"); XBT_DEBUG(" "); host_id = HOST_PEER(peer->id); @@ -1219,7 +1130,7 @@ static void routing_parse_peer(sg_platf_peer_cbarg_t peer) SURFXML_END_TAG(route); XBT_DEBUG(""); - sg_platf_new_AS_close(); + sg_platf_new_AS_end(); XBT_DEBUG(" "); //xbt_dynar_free(&tab_elements_num);