X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/edaeb118d3d0fddbfab76e914c5a112459011540..0d6362e34f929c97e70df53728b4eb466d9d2e96:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 45d863e651..f13e80a0e7 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -74,6 +74,7 @@ static void routing_parse_Sconfig(void); /*config Tag */ static void routing_parse_Econfig(void); /*config Tag */ static char* replace_random_parameter(char * chaine); +static void clean_dict_random(void); /* this lines are only for replace use like index in the model table */ typedef enum { @@ -214,7 +215,7 @@ static double vivaldi_get_link_latency (routing_component_t rc,const char *src, /** * \brief Add a "host" to the network element list */ -void parse_S_host(const char *host_id, const char* coord) +static void parse_S_host(const char *host_id, const char* coord) { network_element_info_t info = NULL; if (current_routing->hierarchy == SURF_ROUTING_NULL) @@ -262,6 +263,14 @@ static void parse_E_host_XML(void) parse_E_host(); } +/* + * \brief Add a host to the network element list from lua script + */ +static void parse_S_host_lua(const char *host_id, const char *coord) +{ + parse_S_host(host_id, coord); +} + /** * \brief Add a "router" to the network element list @@ -297,7 +306,7 @@ static void parse_S_router(void) /** * \brief Set the endponints for a route */ -void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id) +static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id) { if (src != NULL && dst != NULL && link_list != NULL) THROW2(arg_error, 0, "Route between %s to %s can not be defined", @@ -319,6 +328,14 @@ static void parse_S_route_new_and_endpoints_XML(void) A_surfxml_route_dst); } +/** + * \brief Set the endpoints for a route from lua + */ +static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char *id_dst) +{ + parse_S_route_new_and_endpoints(id_src, id_dst); +} + /** * \brief Set the endponints and gateways for a ASroute */ @@ -361,7 +378,7 @@ static void parse_S_bypassRoute_new_and_endpoints(void) /** * \brief Set a new link on the actual list of link for a route or ASroute */ -void parse_E_link_ctn_new_elem(const char *link_id) +static void parse_E_link_ctn_new_elem(const char *link_id) { char *val; val = xbt_strdup(link_id); @@ -388,10 +405,18 @@ static void parse_E_link_ctn_new_elem_XML(void) } } +/** + * \brief Set a new link on the actual list of link for a route or ASroute from lua + */ +static void parse_E_link_c_ctn_new_elem_lua(const char *link_id) +{ + parse_E_link_ctn_new_elem(link_id); +} + /** * \brief Store the route by calling the set_route function of the current routing component */ -void parse_E_route_store_route(void) +static void parse_E_route_store_route(void) { name_route_extended_t route = xbt_new0(s_name_route_extended_t, 1); route->generic_route.link_list = link_list; @@ -451,7 +476,7 @@ static void parse_E_bypassRoute_store_route(void) * make the new structure and * set the parsing functions to allows parsing the part of the routing tree */ -void parse_S_AS(char *AS_id, char *AS_routing) +static void parse_S_AS(char *AS_id, char *AS_routing) { routing_component_t new_routing; model_type_t model = NULL; @@ -531,13 +556,22 @@ static void parse_S_AS_XML(void) } } +/* + * define the routing model type of routing component from lua script + */ +static void parse_S_AS_lua(char *id, char *mode) +{ + parse_S_AS(id, mode); +} + + /** * \brief Finish the creation of a new routing component * * When you finish to read the routing component, other structures must be created. * the "end" method allow to do that for any routing model type */ -void parse_E_AS(const char *AS_id) +static void parse_E_AS(const char *AS_id) { if (current_routing == NULL) { @@ -569,6 +603,14 @@ static void parse_E_AS_XML(void) parse_E_AS(A_surfxml_AS_id); } +/* + * \brief Finish the creation of a new routing component from lua + */ +static void parse_E_AS_lua(const char *id) +{ + parse_E_AS(id); +} + /* Aux Business methods */ /** @@ -1031,7 +1073,8 @@ static e_surf_network_element_type_t get_network_element_type(const char *name) { network_element_info_t rc = NULL; - rc = xbt_dict_get(global_routing->where_network_elements, name); + rc = xbt_dict_get_or_null(global_routing->where_network_elements, name); + if(!rc) return SURF_NETWORK_ELEMENT_NULL; return rc->rc_type; } @@ -1092,6 +1135,8 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ surfxml_add_callback(STag_surfxml_peer_cb_list, &routing_parse_Speer); + surfxml_add_callback(ETag_surfxml_platform_cb_list, + &clean_dict_random); #ifdef HAVE_TRACING instr_routing_define_callbacks(); @@ -1331,15 +1376,19 @@ static void model_full_set_route(routing_component_t rc, const char *src, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists. If you are trying to define a reverse route, you must set the symmetrical=no attribute to your routes tags.", src,dst); - xbt_dynar_free(&link_route_to_test); } else { if(!route->dst_gateway && !route->src_gateway) XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); - else + else{ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->src_gateway, dst, route->dst_gateway); + if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway); + if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The src_gateway '%s' does not exist!",route->src_gateway); + } TO_ROUTE_FULL(*src_id, *dst_id) = generic_new_extended_route(rc->hierarchy,route,1); xbt_dynar_shrink(TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, 0); } @@ -1371,7 +1420,6 @@ static void model_full_set_route(routing_component_t rc, const char *src, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists", src,dst); - xbt_dynar_free(&link_route_to_test); } else { @@ -1700,16 +1748,19 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists", src,dst); - xbt_free(link_route_to_test); } else { if(!route->dst_gateway && !route->src_gateway) XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); - else - XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + else{ + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->src_gateway, dst, route->dst_gateway); - + if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway); + if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The src_gateway '%s' does not exist!",route->src_gateway); + } TO_FLOYD_LINK(*src_id, *dst_id) = generic_new_extended_route(rc->hierarchy, route, 1); TO_FLOYD_PRED(*src_id, *dst_id) = *src_id; @@ -1742,7 +1793,6 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), "The route between \"%s\" and \"%s\" already exists", src,dst); - xbt_free(link_route_to_test); } else { @@ -2184,7 +2234,7 @@ static void *model_dijkstra_both_create(int cached) new_component->generic_routing.set_autonomous_system = generic_set_autonomous_system; new_component->generic_routing.set_route = model_dijkstra_both_set_route; - new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route; //TODO + new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route; new_component->generic_routing.set_bypassroute = generic_set_bypassroute; new_component->generic_routing.get_route = dijkstra_get_route; new_component->generic_routing.get_latency = generic_get_link_latency; @@ -2274,9 +2324,14 @@ static void model_dijkstra_both_set_route (routing_component_t rc, const char *s if(!route->dst_gateway && !route->src_gateway) XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); - else + else{ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->src_gateway, dst, route->dst_gateway); + if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway); + if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL) + xbt_die("The src_gateway '%s' does not exist!",route->src_gateway); + } route_extended_t e_route = generic_new_extended_route(current_routing->hierarchy, route, 1); @@ -2579,6 +2634,7 @@ static route_extended_t rulebased_get_route(routing_component_t rc, int ovector_dst[OVECCOUNT]; const char **list_src = NULL; const char **list_dst = NULL; + int res; xbt_dynar_foreach(rule_list, cpt, ruleroute) { rc_src = pcre_exec(ruleroute->re_src, NULL, src, src_length, 0, 0, @@ -2588,12 +2644,10 @@ static route_extended_t rulebased_get_route(routing_component_t rc, pcre_exec(ruleroute->re_dst, NULL, dst, dst_length, 0, 0, ovector_dst, OVECCOUNT); if (rc_dst >= 0) { - xbt_assert1(!pcre_get_substring_list - (src, ovector_src, rc_src, &list_src), - "error solving substring list for src \"%s\"", src); - xbt_assert1(!pcre_get_substring_list - (dst, ovector_dst, rc_dst, &list_dst), - "error solving substring list for src \"%s\"", dst); + res = pcre_get_substring_list(src, ovector_src, rc_src, &list_src); + xbt_assert1(!res, "error solving substring list for src \"%s\"", src); + res = pcre_get_substring_list(dst, ovector_dst, rc_dst, &list_dst); + xbt_assert1(!res, "error solving substring list for src \"%s\"", dst); char *link_name; xbt_dynar_foreach(ruleroute->re_str_link, cpt, link_name) { char *new_link_name = @@ -3262,7 +3316,8 @@ static void routing_parse_Econfig(void) xbt_cfg_set_parse(_surf_cfg_set, cfg); else XBT_INFO("The custom configuration '%s' is already define by user!",key); - } + free(cfg); + } XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); } @@ -3388,6 +3443,7 @@ static void routing_parse_Scluster(void) xbt_free(temp_cluster_bw); xbt_free(temp_cluster_lat); + xbt_free(temp_cluster_power); free(link_id); free(host_id); break; @@ -3677,10 +3733,18 @@ static char* replace_random_parameter(char * string) xbt_free(string); string = test_string; } //In other case take old value (without ${}) - + else + free(test_string); return string; } +static void clean_dict_random(void) +{ + XBT_DEBUG("Clean dict for random"); + xbt_dict_free(&random_value); + xbt_dict_free(&patterns); +} + static void routing_parse_Speer(void) { static int AX_ptr = 0; @@ -3835,6 +3899,8 @@ static void routing_parse_Srandom(void) double mean, std, min, max, seed; char *random_id = A_surfxml_random_id; char *random_radical = A_surfxml_random_radical; + char *rd_name = NULL; + char *rd_value; surf_parse_get_double(&mean,A_surfxml_random_mean); surf_parse_get_double(&std,A_surfxml_random_std_deviation); surf_parse_get_double(&min,A_surfxml_random_min); @@ -3891,7 +3957,8 @@ static void routing_parse_Srandom(void) if(!strcmp(random_radical,"")) { res = random_generate(random); - xbt_dict_set(random_value, random_id, bprintf("%f",res), free); + rd_value = bprintf("%f",res); + xbt_dict_set(random_value, random_id, rd_value, free); } else { @@ -3913,19 +3980,22 @@ static void routing_parse_Srandom(void) for (i = start; i <= end; i++) { xbt_assert1(!xbt_dict_get_or_null(random_value,random_id),"Custom Random '%s' already exists !",bprintf("%s%d",random_id,i)); res = random_generate(random); - tmpbuf = bprintf("%s%d",random_id,i); + tmpbuf = bprintf("%s%d",random_id,i); xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free); - xbt_free(tmpbuf); + xbt_free(tmpbuf); } break; default: XBT_INFO("Malformed radical"); } res = random_generate(random); - xbt_dict_set(random_value, bprintf("%s_router",random_id), bprintf("%f",res), free); + rd_name = bprintf("%s_router",random_id); + rd_value = bprintf("%f",res); + xbt_dict_set(random_value, rd_name, rd_value, free); xbt_dynar_free(&radical_ends); } + free(rd_name); xbt_dynar_free(&radical_elements); } } @@ -3941,3 +4011,57 @@ static void routing_parse_Erandom(void) } } + + +/* + * New methods to init the routing model component from the lua script + */ + +/* + * calling parse_S_AS_lua with lua values + */ +void routing_AS_init(const char *AS_id, const char *AS_routing) +{ + parse_S_AS_lua((char *) AS_id, (char *) AS_routing); +} + +/* + * calling parse_E_AS_lua to fisnish the creation of routing component + */ +void routing_AS_end(const char *AS_id) +{ + parse_E_AS_lua((char *) AS_id); +} + +/* + * add a host to the network element list + */ + +void routing_add_host(const char *host_id) +{ + parse_S_host_lua((char *) host_id, (char*)""); // FIXME propagate coordinate system to lua +} + +/* + * Set a new link on the actual list of link for a route or ASroute + */ +void routing_add_link(const char *link_id) +{ + parse_E_link_c_ctn_new_elem_lua((char *) link_id); +} + +/* + *Set the endpoints for a route + */ +void routing_set_route(const char *src_id, const char *dst_id) +{ + parse_S_route_new_and_endpoints_lua(src_id, dst_id); +} + +/* + * Store the route by calling parse_E_route_store_route + */ +void routing_store_route(void) +{ + parse_E_route_store_route(); +}