X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/249cd4c8c08962fe950b8e943ef03b7d45fed6d2..5eecba1cd4850c7820f9cfa3c1af484f674b1e8b:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 024ea27669..5332cc62c5 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -18,6 +18,10 @@ #include "xbt/config.h" #include "xbt/graph.h" #include "xbt/set.h" +#include "surf/surfxml_parse.h" + +xbt_dict_t patterns = NULL; +xbt_dict_t random_value = NULL; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(surf_route, surf, "Routing part of surf"); @@ -63,10 +67,14 @@ static void model_none_end(void); /* none routing model */ static void routing_parse_Scluster(void); /*cluster bypass */ static void routing_parse_Speer(void); /*peer bypass */ +static void routing_parse_Srandom(void); /*random bypass */ +static void routing_parse_Erandom(void); /*random bypass */ static void routing_parse_Sconfig(void); /*config Tag */ static void routing_parse_Econfig(void); /*config Tag */ +static char* replace_random_parameter(char * chaine); + /* this lines are only for replace use like index in the model table */ typedef enum { SURF_MODEL_FULL = 0, @@ -175,8 +183,7 @@ static double eculidean_dist_comp(int index, xbt_dynar_t src, xbt_dynar_t dst) } -static double vivaldi_get_link_latency (routing_component_t rc, - const char *src, const char *dst) +static double vivaldi_get_link_latency (routing_component_t rc,const char *src, const char *dst) { double euclidean_dist; xbt_dynar_t src_ctn, dst_ctn; @@ -207,7 +214,7 @@ static double vivaldi_get_link_latency (routing_component_t rc, /** * \brief Add a "host" to the network element list */ -static void parse_S_host(char *host_id, 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) @@ -224,7 +231,7 @@ static void parse_S_host(char *host_id, char* coord) info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_HOST; xbt_dict_set(global_routing->where_network_elements, host_id, - (void *) info, NULL); + (void *) info, xbt_free); if (strcmp(coord,"")) { xbt_dynar_t ctn = xbt_str_split_str(coord, " "); @@ -233,6 +240,17 @@ static void parse_S_host(char *host_id, char* coord) } } +static void parse_E_host(void) +{ + xbt_dict_cursor_t cursor = NULL; + char *key; + char *elem; + + xbt_dict_foreach(current_property_set, cursor, key, elem) { + DEBUG2("property : %s = %s",key,elem); + } +} + /* * \brief Add a host to the network element list from XML */ @@ -240,11 +258,15 @@ static void parse_S_host_XML(void) { parse_S_host(A_surfxml_host_id, A_surfxml_host_coordinates); } +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(char *host_id, char *coord) +static void parse_S_host_lua(const char *host_id, const char *coord) { parse_S_host(host_id, coord); } @@ -273,10 +295,7 @@ static void parse_S_router(void) info->rc_component = current_routing; info->rc_type = SURF_NETWORK_ELEMENT_ROUTER; xbt_dict_set(global_routing->where_network_elements, A_surfxml_router_id, - (void *) info, NULL); -#ifdef HAVE_TRACING - TRACE_surf_host_declaration(A_surfxml_router_id, 0); -#endif + (void *) info, xbt_free); if (strcmp(A_surfxml_router_coordinates,"")) { xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " "); xbt_dynar_shrink(ctn,0); @@ -359,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 */ -static void parse_E_link_ctn_new_elem(char *link_id) +static void parse_E_link_ctn_new_elem(const char *link_id) { char *val; val = xbt_strdup(link_id); @@ -389,7 +408,7 @@ 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(char *link_id) +static void parse_E_link_c_ctn_new_elem_lua(const char *link_id) { parse_E_link_ctn_new_elem(link_id); } @@ -528,6 +547,13 @@ static void parse_S_AS(char *AS_id, char *AS_routing) static void parse_S_AS_XML(void) { parse_S_AS(A_surfxml_AS_id, A_surfxml_AS_routing); + + if (strcmp(A_surfxml_AS_coordinates,"")) { + DEBUG2("%s coordinates : %s",A_surfxml_AS_id,A_surfxml_AS_coordinates); + xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_AS_coordinates, " "); + xbt_dynar_shrink(ctn,0); + xbt_dict_set (coordinates,A_surfxml_AS_id,ctn,NULL); + } } /* @@ -545,7 +571,7 @@ static void parse_S_AS_lua(char *id, char *mode) * 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 */ -static void parse_E_AS(char *AS_id) +static void parse_E_AS(const char *AS_id) { if (current_routing == NULL) { @@ -560,7 +586,7 @@ static void parse_E_AS(char *AS_id) info->rc_component = current_routing->routing_father; info->rc_type = SURF_NETWORK_ELEMENT_AS; xbt_dict_set(global_routing->where_network_elements, - current_routing->name, info, NULL); + current_routing->name, info, xbt_free); (*(current_routing->routing->unload)) (); (*(current_routing->routing->end)) (); current_routing = current_routing->routing_father; @@ -580,13 +606,31 @@ static void parse_E_AS_XML(void) /* * \brief Finish the creation of a new routing component from lua */ -static void parse_E_AS_lua(char *id) +static void parse_E_AS_lua(const char *id) { parse_E_AS(id); } /* 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_dict_get_or_null(global_routing->where_network_elements, + name))->rc_component; + return as_comp->name; +} + + /** * \brief Get the AS father and the first elements of the chain * @@ -749,7 +793,7 @@ static route_extended_t _get_route(const char *src, const char *dst) "bad gateway for route between \"%s\" and \"%s\"", src, dst); - if (src != e_route_cnt->src_gateway) { + if (strcmp(src, e_route_cnt->src_gateway)) { e_route_src = _get_route(src, e_route_cnt->src_gateway); xbt_assert2(e_route_src, "no route between \"%s\" and \"%s\"", src, e_route_cnt->src_gateway); @@ -762,7 +806,7 @@ static route_extended_t _get_route(const char *src, const char *dst) xbt_dynar_push(e_route->generic_route.link_list, &link); } - if (e_route_cnt->dst_gateway != dst) { + if (strcmp(e_route_cnt->dst_gateway, dst)) { e_route_dst = _get_route(e_route_cnt->dst_gateway, dst); xbt_assert2(e_route_dst, "no route between \"%s\" and \"%s\"", e_route_cnt->dst_gateway, dst); @@ -789,10 +833,9 @@ static double _get_latency(const char *src, const char *dst) double latency, latency_src, latency_dst = 0.0; DEBUG2("Solve route \"%s\" to \"%s\"", src, dst); - xbt_assert0(src && dst, "bad parameters for \"_get_route\" method"); - route_extended_t e_route, e_route_cnt; + route_extended_t e_route_cnt; xbt_dynar_t elem_father_list = elements_father(src, dst); @@ -803,12 +846,6 @@ static double _get_latency(const char *src, const char *dst) routing_component_t dst_father = xbt_dynar_get_as(elem_father_list, 2, routing_component_t); - e_route = xbt_new0(s_route_extended_t, 1); - e_route->src_gateway = NULL; - e_route->dst_gateway = NULL; - e_route->generic_route.link_list = - xbt_dynar_new(global_routing->size_of_link, NULL); - if (src_father == dst_father) { /* SURF_ROUTING_BASE */ if (strcmp(src, dst)) { @@ -819,7 +856,6 @@ static double _get_latency(const char *src, const char *dst) } else latency = 0; } else { /* SURF_ROUTING_RECURSIVE */ 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); @@ -838,8 +874,9 @@ static double _get_latency(const char *src, const char *dst) "bad gateway for route between \"%s\" and \"%s\"", src, dst); latency = - (*(common_father->get_latency)) (common_father, e_route_cnt->src_gateway, - e_route_cnt->src_gateway); + (*(common_father->get_latency)) (common_father, elements_As_name(src), + elements_As_name(dst)); + xbt_assert2(latency>=0, "no route between \"%s\" and \"%s\"", src_father->name, dst_father->name); @@ -881,14 +918,19 @@ static xbt_dynar_t get_route(const char *src, const char *dst) { route_extended_t e_route; - xbt_dynar_t elem_father_list = elements_father(src, dst); - routing_component_t common_father = - xbt_dynar_get_as(elem_father_list, 0, routing_component_t); + xbt_dynar_t elem_father_list = NULL; + routing_component_t common_father = NULL; if (strcmp(src, dst)) e_route = _get_route(src, dst); - else + else { + elem_father_list = elements_father(src, dst); + common_father = + xbt_dynar_get_as(elem_father_list, 0, routing_component_t); + e_route = (*(common_father->get_route)) (common_father, src, dst); + xbt_dynar_free(&elem_father_list); + } xbt_assert2(e_route, "no route between \"%s\" and \"%s\"", src, dst); @@ -902,7 +944,6 @@ static xbt_dynar_t get_route(const char *src, const char *dst) xbt_free(e_route->dst_gateway); xbt_free(e_route); - xbt_dynar_free(&elem_father_list); /* if (xbt_dynar_length(global_routing->last_route) == 0) @@ -944,6 +985,7 @@ static double get_latency(const char *src, const char *dst) latency = (*(common_father->get_latency)) (common_father, src, dst); xbt_assert2(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst); + xbt_dynar_free(&elem_father_list); return latency; } @@ -1042,7 +1084,6 @@ static e_surf_network_element_type_t get_network_element_type(const char */ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_t get_link_latency_fun) { - /* config the uniq global routing */ global_routing = xbt_new0(s_routing_global_t, 1); global_routing->where_network_elements = xbt_dict_new(); @@ -1064,6 +1105,7 @@ void routing_model_create(size_t size_of_links, void *loopback, double_f_cpvoid_ /* parse generic elements */ surfxml_add_callback(STag_surfxml_host_cb_list, &parse_S_host_XML); + surfxml_add_callback(ETag_surfxml_host_cb_list, &parse_E_host_XML); surfxml_add_callback(STag_surfxml_router_cb_list, &parse_S_router); surfxml_add_callback(STag_surfxml_route_cb_list, @@ -1092,10 +1134,27 @@ 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(STag_surfxml_config_cb_list, - &routing_parse_Sconfig); - surfxml_add_callback(ETag_surfxml_config_cb_list, - &routing_parse_Econfig); + +#ifdef HAVE_TRACING + instr_routing_define_callbacks(); +#endif +} + +void surf_parse_add_callback_config(void) +{ + surfxml_add_callback(STag_surfxml_config_cb_list, &routing_parse_Sconfig); + surfxml_add_callback(ETag_surfxml_config_cb_list, &routing_parse_Econfig); + surfxml_add_callback(STag_surfxml_prop_cb_list, &parse_properties); + surfxml_add_callback(STag_surfxml_AS_cb_list, &surf_parse_models_setup); + surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom); +} + +void surf_parse_models_setup() +{ + routing_parse_Erandom(); + surfxml_del_callback(STag_surfxml_AS_cb_list, surf_parse_models_setup); + surf_config_models_setup(platform_filename); + free(platform_filename); } /* ************************************************************************** */ @@ -1233,6 +1292,7 @@ static void *model_full_create(void) new_component->generic_routing.finalize = full_finalize; new_component->generic_routing.to_index = xbt_dict_new(); new_component->generic_routing.bypassRoutes = xbt_dict_new(); + new_component->generic_routing.get_network_element_type = get_network_element_type; return new_component; } @@ -1312,8 +1372,8 @@ static void model_full_set_route(routing_component_t rc, const char *src, (void*)TO_ROUTE_FULL(*src_id, *dst_id)->generic_route.link_list, (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); + "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 { @@ -1353,7 +1413,7 @@ 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_free(link_route_to_test); + xbt_dynar_free(&link_route_to_test); } else { @@ -1555,6 +1615,7 @@ static void *model_floyd_create(void) new_component->generic_routing.finalize = floyd_finalize; new_component->generic_routing.to_index = xbt_dict_new(); new_component->generic_routing.bypassRoutes = xbt_dict_new(); + new_component->generic_routing.get_network_element_type = get_network_element_type; return new_component; } @@ -1848,9 +1909,10 @@ static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id, int dst_id, route_extended_t e_route) { routing_component_dijkstra_t routing = (routing_component_dijkstra_t) rc; - + DEBUG2("Load Route from \"%d\" to \"%d\"", src_id, dst_id); xbt_node_t src = NULL; xbt_node_t dst = NULL; + graph_node_map_element_t src_elm = (graph_node_map_element_t) xbt_dict_get_or_null_ext(routing->graph_node_map, (char *) (&src_id), @@ -1860,6 +1922,7 @@ static void route_new_dijkstra(routing_component_dijkstra_t rc, int src_id, (char *) (&dst_id), sizeof(int)); + if (src_elm) src = src_elm->node; @@ -2175,6 +2238,7 @@ static void *model_dijkstra_both_create(int cached) new_component->cached = cached; new_component->generic_routing.to_index = xbt_dict_new(); new_component->generic_routing.bypassRoutes = xbt_dict_new(); + new_component->generic_routing.get_network_element_type = get_network_element_type; return new_component; } @@ -2208,11 +2272,13 @@ static void model_dijkstra_both_end(void) xbt_dynar_t nodes = NULL; /* Create the topology graph */ + if(!routing->route_graph) routing->route_graph = xbt_graph_new_graph(1, NULL); + if(!routing->graph_node_map) routing->graph_node_map = xbt_dict_new(); if (routing->cached && !routing->route_cache) - routing->route_cache = xbt_dict_new(); + routing->route_cache = xbt_dict_new(); /* Add the loopback if needed */ if (current_routing->hierarchy == SURF_ROUTING_BASE) @@ -2235,6 +2301,12 @@ static void model_dijkstra_both_set_route (routing_component_t rc, const char *s src_id = xbt_dict_get_or_null(rc->to_index, src); dst_id = xbt_dict_get_or_null(rc->to_index, dst); + /* Create the topology graph */ + if(!routing->route_graph) + routing->route_graph = xbt_graph_new_graph(1, NULL); + if(!routing->graph_node_map) + routing->graph_node_map = xbt_dict_new(); + if (routing->cached && !routing->route_cache) routing->route_cache = xbt_dict_new(); @@ -2654,6 +2726,7 @@ static void *model_rulebased_create(void) new_component->generic_routing.get_latency = generic_get_link_latency; new_component->generic_routing.get_bypass_route = rulebased_get_bypass_route; new_component->generic_routing.finalize = rulebased_finalize; + new_component->generic_routing.get_network_element_type = get_network_element_type; /* initialization of internal structures */ new_component->dict_processing_units = xbt_dict_new(); new_component->dict_autonomous_systems = xbt_dict_new(); @@ -2872,6 +2945,7 @@ static double generic_get_link_latency(routing_component_t rc, xbt_dynar_foreach(route->generic_route.link_list,i,link) { latency += get_link_latency(link); } + generic_free_extended_route(route); return latency; } @@ -3193,7 +3267,7 @@ generic_processing_units_exist(routing_component_t rc, char *element) static void generic_src_dst_check(routing_component_t rc, const char *src, const char *dst) { - + #ifndef NDEBUG routing_component_t src_as = ((network_element_info_t) xbt_dict_get_or_null (global_routing->where_network_elements, @@ -3212,24 +3286,28 @@ static void generic_src_dst_check(routing_component_t rc, const char *src, xbt_assert2(rc == dst_as, "The routing component of src and dst is not the same as the network elements belong (%s==%s)", rc->name, dst_as->name); +#endif } static void routing_parse_Sconfig(void) { - //TODO - DEBUG0("WARNING tag config not yet implemented."); - DEBUG1("Configuration name = %s",A_surfxml_config_id); + DEBUG1("START configuration name = %s",A_surfxml_config_id); } static void routing_parse_Econfig(void) { - //TODO xbt_dict_cursor_t cursor = NULL; char *key; char *elem; + char *cfg; xbt_dict_foreach(current_property_set, cursor, key, elem) { - DEBUG2("property : %s = %s",key,elem); + cfg = bprintf("%s:%s",key,elem); + if(xbt_cfg_is_default_value(_surf_cfg_set, key)) + xbt_cfg_set_parse(_surf_cfg_set, cfg); + else + INFO1("The custom configuration '%s' is already define by user!",key); } + DEBUG1("End configuration name = %s",A_surfxml_config_id); } static void routing_parse_Scluster(void) @@ -3241,12 +3319,28 @@ static void routing_parse_Scluster(void) char *cluster_suffix = A_surfxml_cluster_suffix; char *cluster_radical = A_surfxml_cluster_radical; char *cluster_power = A_surfxml_cluster_power; + char *cluster_core = A_surfxml_cluster_core; char *cluster_bw = A_surfxml_cluster_bw; char *cluster_lat = A_surfxml_cluster_lat; + char *temp_cluster_bw = NULL; + char *temp_cluster_lat = NULL; + char *temp_cluster_power = NULL; char *cluster_bb_bw = A_surfxml_cluster_bb_bw; char *cluster_bb_lat = A_surfxml_cluster_bb_lat; + char *cluster_availability_file = A_surfxml_cluster_availability_file; + char *cluster_state_file = A_surfxml_cluster_state_file; char *host_id, *groups, *link_id = NULL; char *router_id, *link_router, *link_backbone; + char *availability_file = bprintf("%s",cluster_availability_file); + char *state_file = bprintf("%s",cluster_state_file); + + if(xbt_dict_size(patterns)==0) + patterns = xbt_dict_new(); + + xbt_dict_set(patterns,"id",cluster_id,NULL); + xbt_dict_set(patterns,"prefix",cluster_prefix,NULL); + xbt_dict_set(patterns,"suffix",cluster_suffix,NULL); + #ifdef HAVE_PCRE_LIB char *route_src_dst; #endif @@ -3293,17 +3387,31 @@ static void routing_parse_Scluster(void) #endif link_id = bprintf("%s_link_%d", cluster_id, start); - DEBUG2("", host_id, cluster_power); + xbt_dict_set(patterns,"radical",bprintf("%d",start),NULL); + temp_cluster_power = bprintf("%s",cluster_power); + temp_cluster_power = bprintf("%s",replace_random_parameter(temp_cluster_power)); + DEBUG2("", host_id, temp_cluster_power); A_surfxml_host_state = A_surfxml_host_state_ON; SURFXML_BUFFER_SET(host_id, host_id); - SURFXML_BUFFER_SET(host_power, cluster_power); + SURFXML_BUFFER_SET(host_power, temp_cluster_power); + SURFXML_BUFFER_SET(host_core, cluster_core); SURFXML_BUFFER_SET(host_availability, "1.0"); - SURFXML_BUFFER_SET(host_availability_file, ""); - SURFXML_BUFFER_SET(host_state_file, ""); + availability_file = bprintf("%s",cluster_availability_file); + state_file = bprintf("%s",cluster_state_file); + DEBUG1("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns)); + DEBUG1("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns)); + SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns)); + SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns)); + DEBUG0(""); SURFXML_START_TAG(host); SURFXML_END_TAG(host); - DEBUG3("", link_id,cluster_bw, cluster_lat); + + temp_cluster_bw = bprintf("%s",cluster_bw); + temp_cluster_bw = bprintf("%s",replace_random_parameter(temp_cluster_bw)); + temp_cluster_lat = bprintf("%s",cluster_lat); + temp_cluster_lat = bprintf("%s",replace_random_parameter(temp_cluster_lat)); + DEBUG3("", link_id,temp_cluster_bw, cluster_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3311,8 +3419,8 @@ static void routing_parse_Scluster(void) if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_id); - SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); - SURFXML_BUFFER_SET(link_latency, cluster_lat); + SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw); + SURFXML_BUFFER_SET(link_latency, temp_cluster_lat); SURFXML_BUFFER_SET(link_bandwidth_file, ""); SURFXML_BUFFER_SET(link_latency_file, ""); SURFXML_BUFFER_SET(link_state_file, ""); @@ -3328,7 +3436,6 @@ static void routing_parse_Scluster(void) surf_parse_get_int(&start, xbt_dynar_get_as(radical_ends, 0, char *)); surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *)); - DEBUG2("Create hosts and links from %d to %d", start, end); for (i = start; i <= end; i++) { host_id = bprintf("%s%d%s", cluster_prefix, i, cluster_suffix); #ifndef HAVE_PCRE_LIB @@ -3336,17 +3443,30 @@ static void routing_parse_Scluster(void) #endif link_id = bprintf("%s_link_%d", cluster_id, i); - DEBUG2("", host_id, cluster_power); + xbt_dict_set(patterns,"radical",bprintf("%d",i),NULL); + temp_cluster_power = bprintf("%s",cluster_power); + temp_cluster_power = bprintf("%s",replace_random_parameter(temp_cluster_power)); + DEBUG2("", host_id, temp_cluster_power); A_surfxml_host_state = A_surfxml_host_state_ON; SURFXML_BUFFER_SET(host_id, host_id); - SURFXML_BUFFER_SET(host_power, cluster_power); - SURFXML_BUFFER_SET(host_availability, "1.0"); - SURFXML_BUFFER_SET(host_availability_file, ""); - SURFXML_BUFFER_SET(host_state_file, ""); + SURFXML_BUFFER_SET(host_power, temp_cluster_power); + SURFXML_BUFFER_SET(host_core, cluster_core); + SURFXML_BUFFER_SET(host_availability, "1.0"); + availability_file = bprintf("%s",cluster_availability_file); + state_file = bprintf("%s",cluster_state_file); + DEBUG1("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns)); + DEBUG1("\tstate_file=\"%s\"",xbt_str_varsubst(state_file,patterns)); + SURFXML_BUFFER_SET(host_availability_file, xbt_str_varsubst(availability_file,patterns)); + SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns)); + DEBUG0(""); SURFXML_START_TAG(host); SURFXML_END_TAG(host); - DEBUG3("", link_id,cluster_bw, cluster_lat); + temp_cluster_bw = bprintf("%s",cluster_bw); + temp_cluster_bw = bprintf("%s",replace_random_parameter(temp_cluster_bw)); + temp_cluster_lat = bprintf("%s",cluster_lat); + temp_cluster_lat = bprintf("%s",replace_random_parameter(temp_cluster_lat)); + DEBUG3("", link_id,temp_cluster_bw, cluster_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3354,8 +3474,8 @@ static void routing_parse_Scluster(void) if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_id); - SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); - SURFXML_BUFFER_SET(link_latency, cluster_lat); + SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw); + SURFXML_BUFFER_SET(link_latency, temp_cluster_lat); SURFXML_BUFFER_SET(link_bandwidth_file, ""); SURFXML_BUFFER_SET(link_latency_file, ""); SURFXML_BUFFER_SET(link_state_file, ""); @@ -3383,11 +3503,17 @@ static void routing_parse_Scluster(void) link_backbone = bprintf("%s_backbone", cluster_id); DEBUG1("", router_id); - SURFXML_BUFFER_SET(router_id, router_id);; + SURFXML_BUFFER_SET(router_id, router_id); SURFXML_START_TAG(router); SURFXML_END_TAG(router); - DEBUG3("", link_router,cluster_bw, cluster_lat); + //TODO + xbt_dict_set(patterns,"radical",bprintf("_router"),NULL); + temp_cluster_bw = bprintf("%s",cluster_bw); + temp_cluster_bw = bprintf("%s",replace_random_parameter(temp_cluster_bw)); + temp_cluster_lat = bprintf("%s",cluster_lat); + temp_cluster_lat = bprintf("%s",replace_random_parameter(temp_cluster_lat)); + DEBUG3("", link_router,temp_cluster_bw, temp_cluster_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3395,15 +3521,15 @@ static void routing_parse_Scluster(void) if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FATPIPE) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_router); - SURFXML_BUFFER_SET(link_bandwidth, cluster_bw); - SURFXML_BUFFER_SET(link_latency, cluster_lat); + SURFXML_BUFFER_SET(link_bandwidth, temp_cluster_bw); + SURFXML_BUFFER_SET(link_latency, temp_cluster_lat); SURFXML_BUFFER_SET(link_bandwidth_file, ""); SURFXML_BUFFER_SET(link_latency_file, ""); SURFXML_BUFFER_SET(link_state_file, ""); SURFXML_START_TAG(link); SURFXML_END_TAG(link); - DEBUG3("", link_backbone,cluster_bw, cluster_lat); + DEBUG3("", link_backbone,cluster_bb_bw, cluster_bb_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE) @@ -3551,6 +3677,9 @@ static void routing_parse_Scluster(void) free(link_backbone); free(link_router); + xbt_dict_free(&patterns); + free(availability_file); + free(state_file); DEBUG0(""); SURFXML_END_TAG(AS); @@ -3558,6 +3687,30 @@ static void routing_parse_Scluster(void) surfxml_bufferstack_pop(1); } +/* + * This function take a string and replace parameters from patterns dict. + * It returns the new value. + */ +static char* replace_random_parameter(char * string) +{ + char *temp_string = NULL; + char *test_string = NULL; + + if(xbt_dict_size(random_value)==0) + return string; + + temp_string = bprintf("%s",string); + temp_string = xbt_str_varsubst(temp_string,patterns); // for patterns of cluster + test_string = bprintf("${%s}",temp_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. + string = bprintf("%s",test_string); + else //In other case take old value (without ${}) + string = bprintf("%s",temp_string); + + return string; +} static void routing_parse_Speer(void) { @@ -3569,6 +3722,8 @@ static void routing_parse_Speer(void) char *peer_bw_out = A_surfxml_peer_bw_out; char *peer_lat = A_surfxml_peer_lat; char *peer_coord = A_surfxml_peer_coordinates; + char *peer_state_file = A_surfxml_peer_state_file; + char *peer_availability_file = A_surfxml_peer_availability_file; char *host_id = NULL; char *router_id, *link_router, *link_backbone, *link_id_up, *link_id_down; @@ -3593,6 +3748,7 @@ static void routing_parse_Speer(void) surfxml_bufferstack_push(1); SURFXML_BUFFER_SET(AS_id, peer_id); + SURFXML_BUFFER_SET(AS_coordinates, peer_coord); #ifdef HAVE_PCRE_LIB SURFXML_BUFFER_SET(AS_routing, "RuleBased"); DEBUG1("", peer_id); @@ -3616,8 +3772,8 @@ static void routing_parse_Speer(void) SURFXML_BUFFER_SET(host_id, host_id); SURFXML_BUFFER_SET(host_power, peer_power); SURFXML_BUFFER_SET(host_availability, "1.0"); - SURFXML_BUFFER_SET(host_availability_file, ""); - SURFXML_BUFFER_SET(host_state_file, ""); + SURFXML_BUFFER_SET(host_availability_file, peer_availability_file); + SURFXML_BUFFER_SET(host_state_file, peer_state_file); SURFXML_START_TAG(host); SURFXML_END_TAG(host); @@ -3632,8 +3788,6 @@ static void routing_parse_Speer(void) A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} - if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FATPIPE) -{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_id_up); SURFXML_BUFFER_SET(link_bandwidth, peer_bw_in); SURFXML_BUFFER_SET(link_latency, peer_lat); @@ -3648,8 +3802,6 @@ static void routing_parse_Speer(void) A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(peer_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) {A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} - if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FATPIPE) -{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FATPIPE;} SURFXML_BUFFER_SET(link_id, link_id_down); SURFXML_BUFFER_SET(link_bandwidth, peer_bw_out); SURFXML_BUFFER_SET(link_latency, peer_lat); @@ -3708,6 +3860,113 @@ static void routing_parse_Speer(void) surfxml_bufferstack_pop(1); } +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; + 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); + surf_parse_get_double(&max,A_surfxml_random_max); + surf_parse_get_double(&seed,A_surfxml_random_seed); + + double res = 0; + int i = 0; + random_data_t random = xbt_new0(s_random_data_t, 1); + + xbt_dynar_t radical_elements; + unsigned int iter; + char *groups; + int start, end; + xbt_dynar_t radical_ends; + + random->generator = A_surfxml_random_generator; + random->seed = seed; + random->min = min; + random->max = max; + + /* Check user stupidities */ + if (max < min) + THROW2(arg_error, 0, "random->max < random->min (%f < %f)", max, min); + if (mean < min) + THROW2(arg_error, 0, "random->mean < random->min (%f < %f)", mean, + min); + if (mean > max) + THROW2(arg_error, 0, "random->mean > random->max (%f > %f)", mean, + max); + + /* normalize the mean and standard deviation before storing */ + random->mean = (mean - min) / (max - min); + random->std = std / (max - min); + + if (random->mean * (1 - random->mean) < random->std * random->std) + THROW2(arg_error, 0, "Invalid mean and standard deviation (%f and %f)", + random->mean, random->std); + + DEBUG8("id = '%s' min = '%f' max = '%f' mean = '%f' std_deviatinon = '%f' generator = '%d' seed = '%ld' radical = '%s'", + random_id, + random->min, + random->max, + random->mean, + random->std, + random->generator, + random->seed, + random_radical); + + if(xbt_dict_size(random_value)==0) + random_value = xbt_dict_new(); + + if(!strcmp(random_radical,"")) + { + res = random_generate(random); + xbt_dict_set(random_value, random_id, bprintf("%f",res), free); + } + else + { + radical_elements = xbt_str_split(random_radical, ","); + xbt_dynar_foreach(radical_elements, iter, groups) { + radical_ends = xbt_str_split(groups, "-"); + switch (xbt_dynar_length(radical_ends)) { + case 1: + xbt_assert1(!xbt_dict_get_or_null(random_value,random_id),"Custom Random '%s' already exists !",random_id); + res = random_generate(random); + xbt_dict_set(random_value, bprintf("%s%d",random_id,atoi(xbt_dynar_getfirst_as(radical_ends,char *))), bprintf("%f",res), free); + break; + + case 2: surf_parse_get_int(&start, + xbt_dynar_get_as(radical_ends, 0, char *)); + surf_parse_get_int(&end, xbt_dynar_get_as(radical_ends, 1, char *)); + 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); + xbt_dict_set(random_value, bprintf("%s%d",random_id,i), bprintf("%f",res), free); + } + break; + default: + INFO0("Malformed radical"); + } + res = random_generate(random); + xbt_dict_set(random_value, bprintf("%s_router",random_id), bprintf("%f",res), free); + + xbt_dynar_free(&radical_ends); + } + xbt_dynar_free(&radical_elements); + } +} + +static void routing_parse_Erandom(void) +{ + xbt_dict_cursor_t cursor = NULL; + char *key; + char *elem; + + xbt_dict_foreach(random_value, cursor, key, elem) { + DEBUG2("%s = %s",key,elem); + } + +} + /* * New methods to init the routing model component from the lua script