X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e0db756d6838ce418258f8e8f44cc37ce44123e5..f25af1e2829458e33a3a0b74c75865c89dff5f9e:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 50eba99251..db11b969ce 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -247,7 +247,7 @@ static void parse_E_host(void) char *elem; xbt_dict_foreach(current_property_set, cursor, key, elem) { - DEBUG2("property : %s = %s",key,elem); + XBT_DEBUG("property : %s = %s",key,elem); } } @@ -549,7 +549,7 @@ 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_DEBUG("%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); @@ -735,7 +735,7 @@ static route_extended_t _get_route(const char *src, const char *dst) void *link; unsigned int cpt = 0; - DEBUG2("Solve route \"%s\" to \"%s\"", src, dst); + XBT_DEBUG("Solve route \"%s\" to \"%s\"", src, dst); xbt_assert0(src && dst, "bad parameters for \"_get_route\" method"); @@ -832,7 +832,7 @@ 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_DEBUG("Solve route \"%s\" to \"%s\"", src, dst); xbt_assert0(src && dst, "bad parameters for \"_get_route\" method"); route_extended_t e_route_cnt; @@ -1378,9 +1378,9 @@ static void model_full_set_route(routing_component_t rc, const char *src, else { if(!route->dst_gateway && !route->src_gateway) - DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst); + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); else - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->src_gateway, dst, route->dst_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); @@ -1418,9 +1418,9 @@ static void model_full_set_route(routing_component_t rc, const char *src, else { if(!route->dst_gateway && !route->src_gateway) - DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src); + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src); else - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, route->src_gateway, src, route->dst_gateway); TO_ROUTE_FULL(*dst_id, *src_id) = generic_new_extended_route(rc->hierarchy,route,0); xbt_dynar_shrink(TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list, 0); @@ -1724,9 +1724,9 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, if(TO_FLOYD_LINK(*src_id, *dst_id)) { if(!route->dst_gateway && !route->src_gateway) - DEBUG2("See Route from \"%s\" to \"%s\"", src, dst); + XBT_DEBUG("See Route from \"%s\" to \"%s\"", src, dst); else - DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->src_gateway, dst, route->dst_gateway); char * link_name; unsigned int cpt; @@ -1747,9 +1747,9 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, else { if(!route->dst_gateway && !route->src_gateway) - DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst); + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); else - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->src_gateway, dst, route->dst_gateway); TO_FLOYD_LINK(*src_id, *dst_id) = @@ -1765,9 +1765,9 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, if(TO_FLOYD_LINK(*dst_id, *src_id)) { if(!route->dst_gateway && !route->src_gateway) - DEBUG2("See Route from \"%s\" to \"%s\"", dst, src); + XBT_DEBUG("See Route from \"%s\" to \"%s\"", dst, src); else - DEBUG4("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, + XBT_DEBUG("See ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, route->src_gateway, src, route->dst_gateway); char * link_name; unsigned int i; @@ -1797,9 +1797,9 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, } if(!route->dst_gateway && !route->src_gateway) - DEBUG2("Load Route from \"%s\" to \"%s\"", dst, src); + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", dst, src); else - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", dst, route->src_gateway, src, route->dst_gateway); TO_FLOYD_LINK(*dst_id, *src_id) = @@ -1909,7 +1909,7 @@ 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_DEBUG("Load Route from \"%d\" to \"%d\"", src_id, dst_id); xbt_node_t src = NULL; xbt_node_t dst = NULL; @@ -2315,9 +2315,9 @@ static void model_dijkstra_both_set_route (routing_component_t rc, const char *s xbt_die("Route symmetrical not supported on model dijkstra"); if(!route->dst_gateway && !route->src_gateway) - DEBUG2("Load Route from \"%s\" to \"%s\"", src, dst); + XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst); else - DEBUG4("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, + XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src, route->src_gateway, dst, route->dst_gateway); route_extended_t e_route = @@ -2504,9 +2504,8 @@ static char *remplace(char *value, const char **src_list, int src_size, param_list = dst_list; param_size = dst_size; } else { - xbt_assert2(0, - "bad string parameter, support only \"src\" and \"dst\", at offset: %d (\"%s\")", - i, value); + xbt_die("bad string parameter, support only \"src\" and \"dst\", " + "at offset: %d (\"%s\")", i, value); } i = i + 3; @@ -2593,7 +2592,7 @@ static route_extended_t rulebased_get_route(routing_component_t rc, routing_component_rulebased_t routing = (routing_component_rulebased_t) rc; - int are_processing_units; + int are_processing_units=0; xbt_dynar_t rule_list; if (xbt_dict_get_or_null(routing->dict_processing_units, src) && xbt_dict_get_or_null(routing->dict_processing_units, dst)) { @@ -2605,9 +2604,8 @@ static route_extended_t rulebased_get_route(routing_component_t rc, are_processing_units = 0; rule_list = routing->list_ASroute; } else - xbt_assert2(NULL, - "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table", - src, dst); + xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found in " + "the local table", src, dst); int rc_src = -1; int rc_dst = -1; @@ -2876,7 +2874,7 @@ static void model_none_end(void) static void generic_set_processing_unit(routing_component_t rc, const char *name) { - DEBUG1("Load process unit \"%s\"", name); + XBT_DEBUG("Load process unit \"%s\"", name); int *id = xbt_new0(int, 1); xbt_dict_t _to_index; _to_index = current_routing->to_index; @@ -2887,7 +2885,7 @@ static void generic_set_processing_unit(routing_component_t rc, static void generic_set_autonomous_system(routing_component_t rc, const char *name) { - DEBUG1("Load Autonomous system \"%s\"", name); + XBT_DEBUG("Load Autonomous system \"%s\"", name); int *id = xbt_new0(int, 1); xbt_dict_t _to_index; _to_index = current_routing->to_index; @@ -2909,7 +2907,7 @@ static void generic_set_bypassroute(routing_component_t rc, const char *src, const char *dst, route_extended_t e_route) { - DEBUG2("Load bypassRoute from \"%s\" to \"%s\"", src, dst); + XBT_DEBUG("Load bypassRoute from \"%s\" to \"%s\"", src, dst); xbt_dict_t dict_bypassRoutes = rc->bypassRoutes; char *route_name; @@ -3267,7 +3265,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, @@ -3286,11 +3284,12 @@ 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) { - DEBUG1("START configuration name = %s",A_surfxml_config_id); + XBT_DEBUG("START configuration name = %s",A_surfxml_config_id); } static void routing_parse_Econfig(void) @@ -3304,9 +3303,9 @@ static void routing_parse_Econfig(void) 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); + XBT_INFO("The custom configuration '%s' is already define by user!",key); } - DEBUG1("End configuration name = %s",A_surfxml_config_id); + XBT_DEBUG("End configuration name = %s",A_surfxml_config_id); } static void routing_parse_Scluster(void) @@ -3366,10 +3365,10 @@ static void routing_parse_Scluster(void) SURFXML_BUFFER_SET(AS_id, cluster_id); #ifdef HAVE_PCRE_LIB SURFXML_BUFFER_SET(AS_routing, "RuleBased"); - DEBUG1("", cluster_id); + XBT_DEBUG("", cluster_id); #else SURFXML_BUFFER_SET(AS_routing, "Full"); - DEBUG1("", cluster_id); + XBT_DEBUG("", cluster_id); #endif SURFXML_START_TAG(AS); @@ -3389,7 +3388,7 @@ static void routing_parse_Scluster(void) 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); + XBT_DEBUG("", 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, temp_cluster_power); @@ -3397,11 +3396,11 @@ static void routing_parse_Scluster(void) 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)); + XBT_DEBUG("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns)); + XBT_DEBUG("\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(""); + XBT_DEBUG(""); SURFXML_START_TAG(host); SURFXML_END_TAG(host); @@ -3410,7 +3409,7 @@ static void routing_parse_Scluster(void) 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); + XBT_DEBUG("", 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) @@ -3445,7 +3444,7 @@ static void routing_parse_Scluster(void) 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); + XBT_DEBUG("", 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, temp_cluster_power); @@ -3453,11 +3452,11 @@ static void routing_parse_Scluster(void) 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)); + XBT_DEBUG("\tavailability_file=\"%s\"",xbt_str_varsubst(availability_file,patterns)); + XBT_DEBUG("\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(""); + XBT_DEBUG(""); SURFXML_START_TAG(host); SURFXML_END_TAG(host); @@ -3465,7 +3464,7 @@ static void routing_parse_Scluster(void) 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); + XBT_DEBUG("", 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) @@ -3487,21 +3486,21 @@ static void routing_parse_Scluster(void) break; default: - DEBUG0("Malformed radical"); + XBT_DEBUG("Malformed radical"); } xbt_dynar_free(&radical_ends); } xbt_dynar_free(&radical_elements); - DEBUG0(" "); + XBT_DEBUG(" "); router_id = bprintf("%s%s_router%s", cluster_prefix, cluster_id, cluster_suffix); link_router = bprintf("%s_link_%s_router", cluster_id, cluster_id); link_backbone = bprintf("%s_backbone", cluster_id); - DEBUG1("", router_id); + XBT_DEBUG("", router_id); SURFXML_BUFFER_SET(router_id, router_id); SURFXML_START_TAG(router); SURFXML_END_TAG(router); @@ -3512,7 +3511,7 @@ static void routing_parse_Scluster(void) 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); + XBT_DEBUG("", 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) @@ -3528,7 +3527,7 @@ static void routing_parse_Scluster(void) SURFXML_START_TAG(link); SURFXML_END_TAG(link); - DEBUG3("", link_backbone,cluster_bb_bw, cluster_bb_lat); + XBT_DEBUG("", 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) @@ -3542,7 +3541,7 @@ static void routing_parse_Scluster(void) SURFXML_START_TAG(link); SURFXML_END_TAG(link); - DEBUG0(" "); + XBT_DEBUG(" "); #ifdef HAVE_PCRE_LIB char *new_suffix = xbt_strdup(""); @@ -3563,14 +3562,14 @@ static void routing_parse_Scluster(void) char *pcre_link_backbone = bprintf("%s_backbone", cluster_id); char *pcre_link_dst = bprintf("%s_link_$1dst", cluster_id); - DEBUG2(""); + XBT_DEBUG(""); SURFXML_BUFFER_SET(route_src, route_src_dst); SURFXML_BUFFER_SET(route_dst, route_src_dst); A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; SURFXML_START_TAG(route); - DEBUG1("", pcre_link_src); + XBT_DEBUG("", pcre_link_src); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_src); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3578,13 +3577,13 @@ static void routing_parse_Scluster(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG1("", pcre_link_backbone); + XBT_DEBUG("", pcre_link_backbone); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG1("", pcre_link_dst); + XBT_DEBUG("", pcre_link_dst); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_dst); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3592,7 +3591,7 @@ static void routing_parse_Scluster(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG0(""); + XBT_DEBUG(""); SURFXML_END_TAG(route); free(pcre_link_dst); @@ -3620,8 +3619,8 @@ static void routing_parse_Scluster(void) cluster_suffix); } - DEBUG2(""); + XBT_DEBUG(""); SURFXML_BUFFER_SET(route_src, route_src); SURFXML_BUFFER_SET(route_dst, route_dst); A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; @@ -3643,7 +3642,7 @@ static void routing_parse_Scluster(void) xbt_dynar_get_as(tab_elements_num, j, int)); } - DEBUG1("", route_src); + XBT_DEBUG("", route_src); SURFXML_BUFFER_SET(link_ctn_id, route_src); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3651,13 +3650,13 @@ static void routing_parse_Scluster(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG1("", cluster_id); + XBT_DEBUG("", cluster_id); SURFXML_BUFFER_SET(link_ctn_id, bprintf("%s_backbone", cluster_id)); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG1("", route_dst); + XBT_DEBUG("", route_dst); SURFXML_BUFFER_SET(link_ctn_id, route_dst); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(cluster_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3665,7 +3664,7 @@ static void routing_parse_Scluster(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG0(""); + XBT_DEBUG(""); SURFXML_END_TAG(route); } } @@ -3680,9 +3679,9 @@ static void routing_parse_Scluster(void) free(availability_file); free(state_file); - DEBUG0(""); + XBT_DEBUG(""); SURFXML_END_TAG(AS); - DEBUG0(" "); + XBT_DEBUG(" "); surfxml_bufferstack_pop(1); } @@ -3699,9 +3698,9 @@ static char* replace_random_parameter(char * string) return string; temp_string = bprintf("%s",string); - xbt_str_varsubst(temp_string,patterns); // for patterns of cluster + temp_string = xbt_str_varsubst(temp_string,patterns); // for patterns of cluster test_string = bprintf("${%s}",temp_string); - xbt_str_varsubst(test_string,random_value); //Add ${xxxxx} for random Generator + 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); @@ -3750,14 +3749,14 @@ static void routing_parse_Speer(void) SURFXML_BUFFER_SET(AS_coordinates, peer_coord); #ifdef HAVE_PCRE_LIB SURFXML_BUFFER_SET(AS_routing, "RuleBased"); - DEBUG1("", peer_id); + XBT_DEBUG("", peer_id); #else SURFXML_BUFFER_SET(AS_routing, "Full"); - DEBUG1("", peer_id); + XBT_DEBUG("", peer_id); #endif SURFXML_START_TAG(AS); - DEBUG0(" "); + XBT_DEBUG(" "); host_id = bprintf("peer_%s", peer_id); router_id = bprintf("router_%s", peer_id); link_id_up = bprintf("link_%s_up", peer_id); @@ -3766,7 +3765,7 @@ static void routing_parse_Speer(void) link_router = bprintf("%s_link_router", peer_id); link_backbone = bprintf("%s_backbone", peer_id); - DEBUG2("", host_id, peer_power); + XBT_DEBUG("", host_id, peer_power); A_surfxml_host_state = A_surfxml_host_state_ON; SURFXML_BUFFER_SET(host_id, host_id); SURFXML_BUFFER_SET(host_power, peer_power); @@ -3776,13 +3775,13 @@ static void routing_parse_Speer(void) SURFXML_START_TAG(host); SURFXML_END_TAG(host); - DEBUG2("", router_id, peer_coord); + XBT_DEBUG("", router_id, peer_coord); SURFXML_BUFFER_SET(router_id, router_id); SURFXML_BUFFER_SET(router_coordinates, peer_coord); SURFXML_START_TAG(router); SURFXML_END_TAG(router); - DEBUG3("", link_id_up, peer_bw_in, peer_lat); + XBT_DEBUG("", link_id_up, peer_bw_in, peer_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX) @@ -3796,7 +3795,7 @@ static void routing_parse_Speer(void) SURFXML_START_TAG(link); SURFXML_END_TAG(link); - DEBUG3("", link_id_down, peer_bw_out, peer_lat); + XBT_DEBUG("", link_id_down, peer_bw_out, peer_lat); A_surfxml_link_state = A_surfxml_link_state_ON; A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED; if(peer_sharing_policy == A_surfxml_cluster_sharing_policy_FULLDUPLEX) @@ -3810,17 +3809,17 @@ static void routing_parse_Speer(void) SURFXML_START_TAG(link); SURFXML_END_TAG(link); - DEBUG0(" "); + XBT_DEBUG(" "); // begin here - DEBUG2(""); + XBT_DEBUG(""); SURFXML_BUFFER_SET(route_src, peer_id); SURFXML_BUFFER_SET(route_dst, router_id); A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; SURFXML_START_TAG(route); - DEBUG1("", link_id_up); + XBT_DEBUG("", link_id_up); SURFXML_BUFFER_SET(link_ctn_id, link_id_up); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX) @@ -3828,18 +3827,18 @@ static void routing_parse_Speer(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG0(""); + XBT_DEBUG(""); SURFXML_END_TAG(route); //Opposite Route - DEBUG2(""); + XBT_DEBUG(""); SURFXML_BUFFER_SET(route_src, router_id); SURFXML_BUFFER_SET(route_dst, peer_id); A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; SURFXML_START_TAG(route); - DEBUG1("", link_id_down); + XBT_DEBUG("", link_id_down); SURFXML_BUFFER_SET(link_ctn_id, link_id_down); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; if(peer_sharing_policy == A_surfxml_peer_sharing_policy_FULLDUPLEX) @@ -3847,12 +3846,12 @@ static void routing_parse_Speer(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - DEBUG0(""); + XBT_DEBUG(""); SURFXML_END_TAG(route); - DEBUG0(""); + XBT_DEBUG(""); SURFXML_END_TAG(AS); - DEBUG0(" "); + XBT_DEBUG(" "); //xbt_dynar_free(&tab_elements_num); @@ -3861,16 +3860,19 @@ static void routing_parse_Speer(void) static void routing_parse_Srandom(void) { + double mean, std, min, max, seed; char *random_id = A_surfxml_random_id; - double mean = atol(A_surfxml_random_mean); - double std = atol(A_surfxml_random_std_deviation); - double min = atol(A_surfxml_random_min); - double max = atol(A_surfxml_random_max); - double seed = atol(A_surfxml_random_seed); 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); + char *tmpbuf; xbt_dynar_t radical_elements; unsigned int iter; @@ -3901,7 +3903,7 @@ static void routing_parse_Srandom(void) 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'", + XBT_DEBUG("id = '%s' min = '%f' max = '%f' mean = '%f' std_deviatinon = '%f' generator = '%d' seed = '%ld' radical = '%s'", random_id, random->min, random->max, @@ -3928,7 +3930,9 @@ static void routing_parse_Srandom(void) 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); + tmpbuf = bprintf("%s%d",random_id,atoi(xbt_dynar_getfirst_as(radical_ends,char *))); + xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free); + xbt_free(tmpbuf); break; case 2: surf_parse_get_int(&start, @@ -3937,11 +3941,13 @@ 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); - xbt_dict_set(random_value, bprintf("%s%d",random_id,i), bprintf("%f",res), free); + tmpbuf = bprintf("%s%d",random_id,i); + xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free); + xbt_free(tmpbuf); } break; default: - INFO0("Malformed radical"); + XBT_INFO("Malformed radical"); } res = random_generate(random); xbt_dict_set(random_value, bprintf("%s_router",random_id), bprintf("%f",res), free); @@ -3959,7 +3965,7 @@ static void routing_parse_Erandom(void) char *elem; xbt_dict_foreach(random_value, cursor, key, elem) { - DEBUG2("%s = %s",key,elem); + XBT_DEBUG("%s = %s",key,elem); } }