X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/fff8d47225bf9c230eca9b004f2af8379a89b5a4..867835de895b23ed2733a03c5413fe2974a05590:/src/surf/surf_routing.c diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index a9f5a370cf..b9b87c4bfd 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -197,7 +197,7 @@ static double vivaldi_get_link_latency (routing_component_t rc,const char *src, euclidean_dist = sqrt (eculidean_dist_comp(0,src_ctn,dst_ctn)+eculidean_dist_comp(1,src_ctn,dst_ctn)) +fabs(atof(xbt_dynar_get_as(src_ctn, 2, char *)))+fabs(atof(xbt_dynar_get_as(dst_ctn, 2, char *))); - xbt_assert2(euclidean_dist>=0, "Euclidean Dist is less than 0\"%s\" and \"%.2f\"", src, euclidean_dist); + xbt_assert(euclidean_dist>=0, "Euclidean Dist is less than 0\"%s\" and \"%.2f\"", src, euclidean_dist); return euclidean_dist; @@ -223,10 +223,10 @@ 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) current_routing->hierarchy = SURF_ROUTING_BASE; - xbt_assert1(!xbt_lib_get_or_null(host_lib, host_id,ROUTING_HOST_LEVEL), + xbt_assert(!xbt_lib_get_or_null(host_lib, host_id,ROUTING_HOST_LEVEL), "Reading a host, processing unit \"%s\" already exists", host_id); - xbt_assert1(current_routing->set_processing_unit, + xbt_assert(current_routing->set_processing_unit, "no defined method \"set_processing_unit\" in \"%s\"", current_routing->name); (*(current_routing->set_processing_unit)) (current_routing, host_id); @@ -235,6 +235,7 @@ static void parse_S_host(const char *host_id, const char* coord) info->rc_type = SURF_NETWORK_ELEMENT_HOST; xbt_lib_set(host_lib,host_id,ROUTING_HOST_LEVEL,(void *) info); if (strcmp(coord,"")) { + if(!COORD_HOST_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'"); xbt_dynar_t ctn = xbt_str_split_str(coord, " "); xbt_dynar_shrink(ctn, 0); xbt_lib_set(host_lib,host_id,COORD_HOST_LEVEL,(void *) ctn); @@ -282,10 +283,10 @@ static void parse_S_router(const char *router_id) if (current_routing->hierarchy == SURF_ROUTING_NULL) current_routing->hierarchy = SURF_ROUTING_BASE; - xbt_assert1(!xbt_lib_get_or_null(as_router_lib,A_surfxml_router_id, ROUTING_ASR_LEVEL), + xbt_assert(!xbt_lib_get_or_null(as_router_lib,A_surfxml_router_id, ROUTING_ASR_LEVEL), "Reading a router, processing unit \"%s\" already exists", router_id); - xbt_assert1(current_routing->set_processing_unit, + xbt_assert(current_routing->set_processing_unit, "no defined method \"set_processing_unit\" in \"%s\"", current_routing->name); (*(current_routing->set_processing_unit)) (current_routing, @@ -296,9 +297,10 @@ static void parse_S_router(const char *router_id) xbt_lib_set(as_router_lib,router_id,ROUTING_ASR_LEVEL,(void *) info); if (strcmp(A_surfxml_router_coordinates,"")) { - xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " "); - xbt_dynar_shrink(ctn, 0); - xbt_lib_set(as_router_lib,router_id,COORD_ASR_LEVEL,(void *) ctn); + if(!COORD_ASR_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'"); + xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " "); + xbt_dynar_shrink(ctn, 0); + xbt_lib_set(as_router_lib,router_id,COORD_ASR_LEVEL,(void *) ctn); } } @@ -324,11 +326,11 @@ static void parse_S_router_lua(const char* router_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", + THROWF(arg_error, 0, "Route between %s to %s can not be defined", src_id, dst_id); src = src_id; dst = dst_id; - xbt_assert2(strlen(src) > 0 || strlen(dst) > 0, + xbt_assert(strlen(src) > 0 || strlen(dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); link_list = xbt_dynar_new(sizeof(char *), &xbt_free_ref); @@ -357,13 +359,13 @@ static void parse_S_route_new_and_endpoints_lua(const char *id_src, const char * static void parse_S_ASroute_new_and_endpoints(void) { if (src != NULL && dst != NULL && link_list != NULL) - THROW2(arg_error, 0, "Route between %s to %s can not be defined", + THROWF(arg_error, 0, "Route between %s to %s can not be defined", A_surfxml_ASroute_src, A_surfxml_ASroute_dst); src = A_surfxml_ASroute_src; dst = A_surfxml_ASroute_dst; gw_src = A_surfxml_ASroute_gw_src; gw_dst = A_surfxml_ASroute_gw_dst; - xbt_assert2(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 + xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); @@ -376,14 +378,14 @@ static void parse_S_ASroute_new_and_endpoints(void) static void parse_S_bypassRoute_new_and_endpoints(void) { if (src != NULL && dst != NULL && link_list != NULL) - THROW2(arg_error, 0, + THROWF(arg_error, 0, "Bypass Route between %s to %s can not be defined", A_surfxml_bypassRoute_src, A_surfxml_bypassRoute_dst); src = A_surfxml_bypassRoute_src; dst = A_surfxml_bypassRoute_dst; gw_src = A_surfxml_bypassRoute_gw_src; gw_dst = A_surfxml_bypassRoute_gw_dst; - xbt_assert2(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 + xbt_assert(strlen(src) > 0 || strlen(dst) > 0 || strlen(gw_src) > 0 || strlen(gw_dst) > 0, "Some limits are null in the route between \"%s\" and \"%s\"", src, dst); @@ -435,7 +437,7 @@ 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; - xbt_assert1(current_routing->set_route, + xbt_assert(current_routing->set_route, "no defined method \"set_route\" in \"%s\"", current_routing->name); (*(current_routing->set_route)) (current_routing, src, dst, route); @@ -453,7 +455,7 @@ static void parse_E_ASroute_store_route(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_assert1(current_routing->set_ASroute, + xbt_assert(current_routing->set_ASroute, "no defined method \"set_ASroute\" in \"%s\"", current_routing->name); (*(current_routing->set_ASroute)) (current_routing, src, dst, e_route); @@ -473,7 +475,7 @@ static void parse_E_bypassRoute_store_route(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_assert1(current_routing->set_bypassroute, + xbt_assert(current_routing->set_bypassroute, "no defined method \"set_bypassroute\" in \"%s\"", current_routing->name); (*(current_routing->set_bypassroute)) (current_routing, src, dst, @@ -531,7 +533,7 @@ static void parse_S_AS(char *AS_id, char *AS_routing) } else if (current_routing != NULL && global_routing->root != NULL) { - xbt_assert1(!xbt_dict_get_or_null + xbt_assert(!xbt_dict_get_or_null (current_routing->routing_sons, AS_id), "The AS \"%s\" already exists", AS_id); /* it is a part of the tree */ @@ -548,7 +550,7 @@ static void parse_S_AS(char *AS_id, char *AS_routing) (*(current_routing->routing->unload)) (); } else { - THROW0(arg_error, 0, "All defined components must be belong to a AS"); + THROWF(arg_error, 0, "All defined components must be belong to a AS"); } /* set the new parse rules */ (*(new_routing->routing->load)) (); @@ -564,7 +566,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,"")) { - XBT_DEBUG("%s coordinates : %s", A_surfxml_AS_id, A_surfxml_AS_coordinates); + if(!COORD_ASR_LEVEL) xbt_die("To use coordinates, you must set configuration 'coordinates' to 'yes'"); xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_AS_coordinates, " "); xbt_dynar_shrink(ctn, 0); xbt_lib_set(as_router_lib,A_surfxml_AS_id,COORD_ASR_LEVEL,(void *) ctn); @@ -590,10 +592,10 @@ static void parse_E_AS(const char *AS_id) { if (current_routing == NULL) { - THROW1(arg_error, 0, "Close AS(%s), that never open", AS_id); + THROWF(arg_error, 0, "Close AS(%s), that never open", AS_id); } else { network_element_info_t info = NULL; - xbt_assert1(!xbt_lib_get_or_null(as_router_lib,current_routing->name, ROUTING_ASR_LEVEL), + xbt_assert(!xbt_lib_get_or_null(as_router_lib,current_routing->name, ROUTING_ASR_LEVEL), "The AS \"%s\" already exists",current_routing->name); info = xbt_new0(s_network_element_info_t, 1); info->rc_component = current_routing->routing_father; @@ -655,7 +657,7 @@ static char* elements_As_name(const char *name) static xbt_dynar_t elements_father(const char *src, const char *dst) { - xbt_assert0(src && dst, "bad parameters for \"elements_father\" method"); + xbt_assert(src && dst, "bad parameters for \"elements_father\" method"); xbt_dynar_t result = xbt_dynar_new(sizeof(char *), NULL); @@ -676,7 +678,7 @@ static xbt_dynar_t elements_father(const char *src, const char *dst) src_as = ((network_element_info_t)src_data)->rc_component; dst_as = ((network_element_info_t)dst_data)->rc_component; - xbt_assert2(src_as + xbt_assert(src_as && dst_as, "Ask for route \"from\"(%s) or \"to\"(%s) no found", src, dst); @@ -750,7 +752,7 @@ static route_extended_t _get_route(const char *src, const char *dst) XBT_DEBUG("Solve route \"%s\" to \"%s\"", src, dst); - xbt_assert0(src && dst, "bad parameters for \"_get_route\" method"); + xbt_assert(src && dst, "bad parameters for \"_get_route\" method"); route_extended_t e_route, e_route_cnt, e_route_src = NULL, e_route_dst = NULL; @@ -775,7 +777,7 @@ static route_extended_t _get_route(const char *src, const char *dst) if (strcmp(src, dst)) { e_route_cnt = (*(common_father->get_route)) (common_father, src, dst); - xbt_assert2(e_route_cnt, "no route between \"%s\" and \"%s\"", src, + xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", src, dst); xbt_dynar_foreach(e_route_cnt->generic_route.link_list, cpt, link) { xbt_dynar_push(e_route->generic_route.link_list, &link); @@ -798,17 +800,17 @@ static route_extended_t _get_route(const char *src, const char *dst) (*(common_father->get_route)) (common_father, src_father->name, dst_father->name); - xbt_assert2(e_route_cnt, "no route between \"%s\" and \"%s\"", + xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", src_father->name, dst_father->name); - xbt_assert2((e_route_cnt->src_gateway == NULL) == + xbt_assert((e_route_cnt->src_gateway == NULL) == (e_route_cnt->dst_gateway == NULL), "bad gateway for route between \"%s\" and \"%s\"", src, dst); 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, + xbt_assert(e_route_src, "no route between \"%s\" and \"%s\"", src, e_route_cnt->src_gateway); xbt_dynar_foreach(e_route_src->generic_route.link_list, cpt, link) { xbt_dynar_push(e_route->generic_route.link_list, &link); @@ -821,7 +823,7 @@ static route_extended_t _get_route(const char *src, const char *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\"", + xbt_assert(e_route_dst, "no route between \"%s\" and \"%s\"", e_route_cnt->dst_gateway, dst); xbt_dynar_foreach(e_route_dst->generic_route.link_list, cpt, link) { xbt_dynar_push(e_route->generic_route.link_list, &link); @@ -846,7 +848,7 @@ static double _get_latency(const char *src, const char *dst) double latency, latency_src, latency_dst = 0.0; XBT_DEBUG("Solve route \"%s\" to \"%s\"", src, dst); - xbt_assert0(src && dst, "bad parameters for \"_get_route\" method"); + xbt_assert(src && dst, "bad parameters for \"_get_route\" method"); route_extended_t e_route_cnt; @@ -864,7 +866,7 @@ static double _get_latency(const char *src, const char *dst) if (strcmp(src, dst)) { latency = (*(common_father->get_latency)) (common_father, src, dst); - xbt_assert2(latency>=0, "no route between \"%s\" and \"%s\"", src, + xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"", src, dst); } else latency = 0; } else { /* SURF_ROUTING_RECURSIVE */ @@ -873,16 +875,16 @@ static double _get_latency(const char *src, const char *dst) e_route_bypass = (*(common_father->get_bypass_route)) (common_father, src, dst); - xbt_assert0(!e_route_bypass,"Bypass cannot work yet with get_latency"); + xbt_assert(!e_route_bypass,"Bypass cannot work yet with get_latency"); e_route_cnt = (*(common_father->get_route)) (common_father, src_father->name, dst_father->name); - xbt_assert2(e_route_cnt, "no route between \"%s\" and \"%s\"", + xbt_assert(e_route_cnt, "no route between \"%s\" and \"%s\"", src_father->name, dst_father->name); - xbt_assert2((e_route_cnt->src_gateway == NULL) == + xbt_assert((e_route_cnt->src_gateway == NULL) == (e_route_cnt->dst_gateway == NULL), "bad gateway for route between \"%s\" and \"%s\"", src, dst); @@ -890,14 +892,14 @@ static double _get_latency(const char *src, const char *dst) (*(common_father->get_latency)) (common_father, elements_As_name(src), elements_As_name(dst)); - xbt_assert2(latency>=0, "no route between \"%s\" and \"%s\"", + xbt_assert(latency>=0, "no route between \"%s\" and \"%s\"", src_father->name, dst_father->name); if (src != e_route_cnt->src_gateway) { latency_src = _get_latency(src, e_route_cnt->src_gateway); - xbt_assert2(latency_src>=0, "no route between \"%s\" and \"%s\"", src, + xbt_assert(latency_src>=0, "no route between \"%s\" and \"%s\"", src, e_route_cnt->src_gateway); latency += latency_src; } @@ -905,7 +907,7 @@ static double _get_latency(const char *src, const char *dst) if (e_route_cnt->dst_gateway != dst) { latency_dst = _get_latency(e_route_cnt->dst_gateway, dst); - xbt_assert2(latency_dst>=0, "no route between \"%s\" and \"%s\"", + xbt_assert(latency_dst>=0, "no route between \"%s\" and \"%s\"", e_route_cnt->dst_gateway, dst); latency += latency_dst; } @@ -945,7 +947,7 @@ static xbt_dynar_t get_route(const char *src, const char *dst) xbt_dynar_free(&elem_father_list); } - xbt_assert2(e_route, "no route between \"%s\" and \"%s\"", src, dst); + xbt_assert(e_route, "no route between \"%s\" and \"%s\"", src, dst); if (global_routing->last_route) xbt_dynar_free(&(global_routing->last_route)); @@ -997,7 +999,7 @@ static double get_latency(const char *src, const char *dst) else latency = (*(common_father->get_latency)) (common_father, src, dst); - xbt_assert2(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst); + xbt_assert(latency>=0.0, "no route between \"%s\" and \"%s\"", src, dst); xbt_dynar_free(&elem_father_list); return latency; @@ -1024,7 +1026,7 @@ static void _finalize(routing_component_t rc) char *tmp_name = rc->name; xbt_dict_free(&tmp_sons); xbt_free(tmp_name); - xbt_assert1(rc->finalize, "no defined method \"finalize\" in \"%s\"", + xbt_assert(rc->finalize, "no defined method \"finalize\" in \"%s\"", current_routing->name); (*(rc->finalize)) (rc); } @@ -1159,7 +1161,7 @@ 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_prop_cb_list, &parse_properties_XML); surfxml_add_callback(STag_surfxml_AS_cb_list, &surf_parse_models_setup); surfxml_add_callback(STag_surfxml_random_cb_list, &routing_parse_Srandom); } @@ -1197,7 +1199,7 @@ static xbt_dynar_t full_get_onelink_routes(routing_component_t rc) xbt_dict_foreach(routing->generic_routing.to_index, c2, k2, d2) { int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, k1); int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, k2); - xbt_assert2(src_id + xbt_assert(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table", src, dst); @@ -1228,7 +1230,7 @@ static xbt_dynar_t full_get_onelink_routes(routing_component_t rc) static route_extended_t full_get_route(routing_component_t rc, const char *src, const char *dst) { - xbt_assert1(rc && src + xbt_assert(rc && src && dst, "Invalid params for \"get_route\" function at AS \"%s\"", rc->name); @@ -1240,7 +1242,7 @@ static route_extended_t full_get_route(routing_component_t rc, generic_src_dst_check(rc, src, dst); int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src); int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst); - xbt_assert2(src_id + xbt_assert(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table", src, dst); @@ -1362,10 +1364,10 @@ static void model_full_set_route(routing_component_t rc, const char *src, routing_component_full_t routing = ((routing_component_full_t) rc); size_t table_size = xbt_dict_length(routing->generic_routing.to_index); - xbt_assert2(src_id + xbt_assert(src_id && dst_id, "Network elements %s or %s not found", src, dst); - xbt_assert2(xbt_dynar_length(route->generic_route.link_list) > 0, + xbt_assert(xbt_dynar_length(route->generic_route.link_list) > 0, "Invalid count of links, must be greater than zero (%s,%s)", src, dst); @@ -1380,10 +1382,10 @@ static void model_full_set_route(routing_component_t rc, const char *src, xbt_dynar_foreach(route->generic_route.link_list,i,link_name) { void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); - xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); + xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } - xbt_assert2(!xbt_dynar_compare( + xbt_assert(!xbt_dynar_compare( (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), @@ -1410,10 +1412,10 @@ static void model_full_set_route(routing_component_t rc, const char *src, { if(route->dst_gateway && route->src_gateway) { - char *gw_src = xbt_strdup(route->src_gateway); - char *gw_dst = xbt_strdup(route->dst_gateway); - route->src_gateway = gw_dst; - route->dst_gateway = gw_src; + char *gw_tmp ; + gw_tmp = route->src_gateway; + route->src_gateway = route->dst_gateway; + route->dst_gateway = gw_tmp; } if(TO_ROUTE_FULL(*dst_id, *src_id)) { @@ -1424,10 +1426,10 @@ static void model_full_set_route(routing_component_t rc, const char *src, { link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *); void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); - xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); + xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } - xbt_assert2(!xbt_dynar_compare( + xbt_assert(!xbt_dynar_compare( (void*)TO_ROUTE_FULL(*dst_id, *src_id)->generic_route.link_list, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), @@ -1443,8 +1445,10 @@ static void model_full_set_route(routing_component_t rc, const char *src, 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); } - } + + if (rc->hierarchy == SURF_ROUTING_BASE) generic_free_route((route_t)route) ; + else generic_free_extended_route((route_extended_t)route); } /* ************************************************************************** */ @@ -1505,7 +1509,7 @@ static xbt_dynar_t floyd_get_onelink_routes(routing_component_t rc) static route_extended_t floyd_get_route(routing_component_t rc, const char *src, const char *dst) { - xbt_assert1(rc && src + xbt_assert(rc && src && dst, "Invalid params for \"get_route\" function at AS \"%s\"", rc->name); @@ -1517,7 +1521,7 @@ static route_extended_t floyd_get_route(routing_component_t rc, generic_src_dst_check(rc, src, dst); int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src); int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst); - xbt_assert2(src_id + xbt_assert(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table", src, dst); @@ -1543,7 +1547,7 @@ static route_extended_t floyd_get_route(routing_component_t rc, pred = TO_FLOYD_PRED(*src_id, pred); if (pred == -1) /* if no pred in route -> no route to host */ break; - xbt_assert2(TO_FLOYD_LINK(pred, prev_pred), + xbt_assert(TO_FLOYD_LINK(pred, prev_pred), "Invalid link for the route between \"%s\" or \"%s\"", src, dst); @@ -1561,7 +1565,7 @@ static route_extended_t floyd_get_route(routing_component_t rc, && strcmp(gw_dst, prev_gw_src)) { xbt_dynar_t e_route_as_to_as = (*(global_routing->get_route)) (gw_dst, prev_gw_src); - xbt_assert2(e_route_as_to_as, "no route between \"%s\" and \"%s\"", + xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"", gw_dst, prev_gw_src); links = e_route_as_to_as; int pos = 0; @@ -1579,7 +1583,7 @@ static route_extended_t floyd_get_route(routing_component_t rc, first = 0; } while (pred != *src_id); - xbt_assert4(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")", + xbt_assert(pred != -1, "no route from host %d to %d (\"%s\" to \"%s\")", *src_id, *dst_id, src, dst); if (rc->hierarchy == SURF_ROUTING_RECURSIVE) { @@ -1752,10 +1756,10 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, xbt_dynar_foreach(route->generic_route.link_list,cpt,link_name) { void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); - xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); + xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } - xbt_assert2(!xbt_dynar_compare( + xbt_assert(!xbt_dynar_compare( (void*)TO_FLOYD_LINK(*src_id, *dst_id)->generic_route.link_list, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), @@ -1797,10 +1801,10 @@ static void model_floyd_set_route(routing_component_t rc, const char *src, { link_name = xbt_dynar_get_as(route->generic_route.link_list,i-1,void *); void *link = xbt_lib_get_or_null(link_lib, link_name, SURF_LINK_LEVEL); - xbt_assert1(link,"Link : '%s' doesn't exists.",link_name); + xbt_assert(link,"Link : '%s' doesn't exists.",link_name); xbt_dynar_push(link_route_to_test,&link); } - xbt_assert2(!xbt_dynar_compare( + xbt_assert(!xbt_dynar_compare( (void*)TO_FLOYD_LINK(*dst_id, *src_id)->generic_route.link_list, (void*)link_route_to_test, (int_f_cpvoid_cpvoid_t) surf_pointer_resource_cmp), @@ -2011,7 +2015,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, const char *src, const char *dst) { - xbt_assert1(rc && src + xbt_assert(rc && src && dst, "Invalid params for \"get_route\" function at AS \"%s\"", rc->name); @@ -2022,7 +2026,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, generic_src_dst_check(rc, src, dst); int *src_id = xbt_dict_get_or_null(routing->generic_routing.to_index, src); int *dst_id = xbt_dict_get_or_null(routing->generic_routing.to_index, dst); - xbt_assert2(src_id + xbt_assert(src_id && dst_id, "Ask for route \"from\"(%s) or \"to\"(%s) no found in the local table", src, dst); @@ -2052,7 +2056,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, graph_node_map_search(routing, *src_id); graph_node_map_element_t dst_elm = graph_node_map_search(routing, *dst_id); - xbt_assert2(src_elm != NULL + xbt_assert(src_elm != NULL && dst_elm != NULL, "src %d or dst %d does not exist", *src_id, *dst_id); src_node_id = ((graph_node_data_t) @@ -2068,7 +2072,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_s_v, node_e_v); - xbt_assert2(edge != NULL, "no route between host %d and %d", *src_id, + xbt_assert(edge != NULL, "no route between host %d and %d", *src_id, *dst_id); e_route = (route_extended_t) xbt_graph_edge_get_data(edge); @@ -2161,7 +2165,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, xbt_edge_t edge = xbt_graph_get_edge(routing->route_graph, node_pred_v, node_v); - xbt_assert2(edge != NULL, "no route between host %d and %d", *src_id, + xbt_assert(edge != NULL, "no route between host %d and %d", *src_id, *dst_id); prev_gw_src = gw_src; @@ -2178,7 +2182,7 @@ static route_extended_t dijkstra_get_route(routing_component_t rc, && strcmp(gw_dst, prev_gw_src)) { xbt_dynar_t e_route_as_to_as = (*(global_routing->get_route)) (gw_dst, prev_gw_src); - xbt_assert2(e_route_as_to_as, "no route between \"%s\" and \"%s\"", + xbt_assert(e_route_as_to_as, "no route between \"%s\" and \"%s\"", gw_dst, prev_gw_src); links = e_route_as_to_as; int pos = 0; @@ -2434,11 +2438,11 @@ static void model_rulebased_set_route(routing_component_t rc, const char *error; int erroffset; ruleroute->re_src = pcre_compile(src, 0, &error, &erroffset, NULL); - xbt_assert3(ruleroute->re_src, + xbt_assert(ruleroute->re_src, "PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, src, error); ruleroute->re_dst = pcre_compile(dst, 0, &error, &erroffset, NULL); - xbt_assert3(ruleroute->re_src, + xbt_assert(ruleroute->re_src, "PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, dst, error); ruleroute->re_str_link = route->generic_route.link_list; @@ -2457,12 +2461,12 @@ static void model_rulebased_set_ASroute(routing_component_t rc, int erroffset; ruleroute_e->generic_rule_route.re_src = pcre_compile(src, 0, &error, &erroffset, NULL); - xbt_assert3(ruleroute_e->generic_rule_route.re_src, + xbt_assert(ruleroute_e->generic_rule_route.re_src, "PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, src, error); ruleroute_e->generic_rule_route.re_dst = pcre_compile(dst, 0, &error, &erroffset, NULL); - xbt_assert3(ruleroute_e->generic_rule_route.re_src, + xbt_assert(ruleroute_e->generic_rule_route.re_src, "PCRE compilation failed at offset %d (\"%s\"): %s\n", erroffset, dst, error); ruleroute_e->generic_rule_route.re_str_link = @@ -2507,14 +2511,14 @@ static char *remplace(char *value, const char **src_list, int src_size, && value[i + number_length] <= '9') { number_length++; } - xbt_assert2(number_length != 0, + xbt_assert(number_length != 0, "bad string parameter, no number indication, at offset: %d (\"%s\")", i, value); // solve number number = atoi(value + i); i = i + number_length; - xbt_assert2(i + 2 < value_length, + xbt_assert(i + 2 < value_length, "bad string parameter, too few chars, at offset: %d (\"%s\")", i, value); @@ -2534,7 +2538,7 @@ static char *remplace(char *value, const char **src_list, int src_size, } i = i + 3; - xbt_assert4(param_size >= number, + xbt_assert(param_size >= number, "bad string parameter, not enough length param_size, at offset: %d (\"%s\") %d %d", i, value, param_size, number); @@ -2555,7 +2559,7 @@ static char *remplace(char *value, const char **src_list, int src_size, } while (i < value_length && i_result_buffer < BUFFER_SIZE); - xbt_assert2(i_result_buffer < BUFFER_SIZE, + xbt_assert(i_result_buffer < BUFFER_SIZE, "solving string \"%s\", small buffer size (%d)", value, BUFFER_SIZE); result_result[i_result_buffer] = 0; @@ -2608,7 +2612,7 @@ static route_extended_t rulebased_get_route(routing_component_t rc, const char *src, const char *dst) { - xbt_assert1(rc && src + xbt_assert(rc && src && dst, "Invalid params for \"get_route\" function at AS \"%s\"", rc->name); @@ -2657,9 +2661,9 @@ static route_extended_t rulebased_get_route(routing_component_t rc, ovector_dst, OVECCOUNT); if (rc_dst >= 0) { res = pcre_get_substring_list(src, ovector_src, rc_src, &list_src); - xbt_assert1(!res, "error solving substring list for src \"%s\"", src); + xbt_assert(!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); + xbt_assert(!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 = @@ -2669,7 +2673,7 @@ static route_extended_t rulebased_get_route(routing_component_t rc, if (link) xbt_dynar_push(links_list, &link); else - THROW1(mismatch_error, 0, "Link %s not found", new_link_name); + THROWF(mismatch_error, 0, "Link %s not found", new_link_name); xbt_free(new_link_name); } } @@ -2935,10 +2939,10 @@ static void generic_set_bypassroute(routing_component_t rc, char *route_name; route_name = bprintf("%s#%s", src, dst); - xbt_assert2(xbt_dynar_length(e_route->generic_route.link_list) > 0, + xbt_assert(xbt_dynar_length(e_route->generic_route.link_list) > 0, "Invalid count of links, must be greater than zero (%s,%s)", src, dst); - xbt_assert4(!xbt_dict_get_or_null(dict_bypassRoutes, route_name), + xbt_assert(!xbt_dict_get_or_null(dict_bypassRoutes, route_name), "The bypass route between \"%s\"(\"%s\") and \"%s\"(\"%s\") already exists", src, e_route->src_gateway, dst, e_route->dst_gateway); @@ -2989,14 +2993,17 @@ static route_extended_t generic_get_bypassroute(routing_component_t rc, routing_component_t *current_dst = NULL; /* (1) find the as where the src and dst are located */ - src_as = ((network_element_info_t) - xbt_lib_get_or_null(host_lib, src, ROUTING_HOST_LEVEL))->rc_component; - dst_as = ((network_element_info_t) - xbt_lib_get_or_null(host_lib, dst, ROUTING_HOST_LEVEL))->rc_component; - xbt_assert2(src_as - && dst_as, - "Ask for route \"from\"(%s) or \"to\"(%s) no found", src, - dst); + void * src_data = xbt_lib_get_or_null(host_lib,src, ROUTING_HOST_LEVEL); + void * dst_data = xbt_lib_get_or_null(host_lib,dst, ROUTING_HOST_LEVEL); + if(!src_data) src_data = xbt_lib_get_or_null(as_router_lib,src, ROUTING_ASR_LEVEL); + if(!dst_data) dst_data = xbt_lib_get_or_null(as_router_lib,dst, ROUTING_ASR_LEVEL); + + if(src_data == NULL || dst_data == NULL) + xbt_die("Ask for route \"from\"(%s) or \"to\"(%s) no found at AS \"%s\"", + src, dst, rc->name); + + src_as = ((network_element_info_t)src_data)->rc_component; + dst_as = ((network_element_info_t)dst_data)->rc_component; /* (2) find the path to the root routing component */ path_src = xbt_dynar_new(sizeof(routing_component_t), NULL); @@ -3123,7 +3130,7 @@ generic_new_route(e_surf_routing_hierarchy_t hierarchy, new_route->link_list = xbt_dynar_new(global_routing->size_of_link, NULL); - xbt_assert0(hierarchy == SURF_ROUTING_BASE, + xbt_assert(hierarchy == SURF_ROUTING_BASE, "the hierarchy type is not SURF_ROUTING_BASE"); links = ((route_t) data)->link_list; @@ -3141,7 +3148,7 @@ generic_new_route(e_surf_routing_hierarchy_t hierarchy, else xbt_dynar_unshift(links_id, &link); } else - THROW1(mismatch_error, 0, "Link %s not found", link_name); + THROWF(mismatch_error, 0, "Link %s not found", link_name); } return new_route; @@ -3164,7 +3171,7 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, new_e_route->src_gateway = NULL; new_e_route->dst_gateway = NULL; - xbt_assert0(hierarchy == SURF_ROUTING_BASE + xbt_assert(hierarchy == SURF_ROUTING_BASE || hierarchy == SURF_ROUTING_RECURSIVE, "the hierarchy type is not defined"); @@ -3176,13 +3183,13 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, } else if (hierarchy == SURF_ROUTING_RECURSIVE) { e_route = (route_extended_t) data; - xbt_assert0(e_route->src_gateway + xbt_assert(e_route->src_gateway && e_route->dst_gateway, "bad gateway, is null"); links = e_route->generic_route.link_list; /* remeber not erase the gateway names */ - new_e_route->src_gateway = e_route->src_gateway; - new_e_route->dst_gateway = e_route->dst_gateway; + new_e_route->src_gateway = strdup(e_route->src_gateway); + new_e_route->dst_gateway = strdup(e_route->dst_gateway); } links_id = new_e_route->generic_route.link_list; @@ -3197,7 +3204,7 @@ generic_new_extended_route(e_surf_routing_hierarchy_t hierarchy, else xbt_dynar_unshift(links_id, &link); } else - THROW1(mismatch_error, 0, "Link %s not found", link_name); + THROWF(mismatch_error, 0, "Link %s not found", link_name); } return new_e_route; @@ -3300,8 +3307,8 @@ static void generic_src_dst_check(routing_component_t rc, const char *src, xbt_die("The src(%s in %s) and dst(%s in %s) are in differents AS", src, src_as->name, dst, dst_as->name); if(rc != dst_as) - xbt_die("The routing component of src and dst is not the same as the network elements belong (%s==%s)", - rc->name, dst_as->name); + xbt_die("The routing component of src'%s' and dst'%s' is not the same as the network elements belong (%s?=%s?=%s)", + src,dst,src_as->name, dst_as->name,rc->name); } static void routing_parse_Sconfig(void) @@ -3347,8 +3354,8 @@ static void routing_parse_Scluster(void) 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); + char *availability_file = xbt_strdup(cluster_availability_file); + char *state_file = xbt_strdup(cluster_state_file); if(xbt_dict_size(patterns)==0) patterns = xbt_dict_new(); @@ -3406,7 +3413,7 @@ static void routing_parse_Scluster(void) link_id = bprintf("%s_link_%d", cluster_id, start); xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free); - temp_cluster_power = bprintf("%s",cluster_power); + temp_cluster_power = xbt_strdup(cluster_power); temp_cluster_power = replace_random_parameter(temp_cluster_power); XBT_DEBUG("", host_id, temp_cluster_power); A_surfxml_host_state = A_surfxml_host_state_ON; @@ -3416,9 +3423,9 @@ static void routing_parse_Scluster(void) SURFXML_BUFFER_SET(host_availability, "1.0"); SURFXML_BUFFER_SET(host_coordinates, ""); xbt_free(availability_file); - availability_file = bprintf("%s",cluster_availability_file); + availability_file = xbt_strdup(cluster_availability_file); xbt_free(state_file); - state_file = bprintf("%s",cluster_state_file); + state_file = xbt_strdup(cluster_state_file); 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)); @@ -3428,9 +3435,9 @@ static void routing_parse_Scluster(void) SURFXML_END_TAG(host); - temp_cluster_bw = bprintf("%s",cluster_bw); + temp_cluster_bw = xbt_strdup(cluster_bw); temp_cluster_bw = replace_random_parameter(temp_cluster_bw); - temp_cluster_lat = bprintf("%s",cluster_lat); + temp_cluster_lat = xbt_strdup(cluster_lat); temp_cluster_lat = replace_random_parameter(temp_cluster_lat); XBT_DEBUG("", link_id,temp_cluster_bw, cluster_lat); A_surfxml_link_state = A_surfxml_link_state_ON; @@ -3468,7 +3475,7 @@ static void routing_parse_Scluster(void) link_id = bprintf("%s_link_%d", cluster_id, i); xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free); - temp_cluster_power = bprintf("%s",cluster_power); + temp_cluster_power = xbt_strdup(cluster_power); temp_cluster_power = replace_random_parameter(temp_cluster_power); XBT_DEBUG("", host_id, temp_cluster_power); A_surfxml_host_state = A_surfxml_host_state_ON; @@ -3478,9 +3485,9 @@ static void routing_parse_Scluster(void) SURFXML_BUFFER_SET(host_availability, "1.0"); SURFXML_BUFFER_SET(host_coordinates, ""); xbt_free(availability_file); - availability_file = bprintf("%s",cluster_availability_file); + availability_file = xbt_strdup(cluster_availability_file); xbt_free(state_file); - state_file = bprintf("%s",cluster_state_file); + state_file = xbt_strdup(cluster_state_file); 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)); @@ -3491,9 +3498,9 @@ static void routing_parse_Scluster(void) xbt_free(temp_cluster_power); - temp_cluster_bw = bprintf("%s",cluster_bw); + temp_cluster_bw = xbt_strdup(cluster_bw); temp_cluster_bw = replace_random_parameter(temp_cluster_bw); - temp_cluster_lat = bprintf("%s",cluster_lat); + temp_cluster_lat = xbt_strdup(cluster_lat); temp_cluster_lat = replace_random_parameter(temp_cluster_lat); XBT_DEBUG("", link_id,temp_cluster_bw, cluster_lat); A_surfxml_link_state = A_surfxml_link_state_ON; @@ -3540,10 +3547,10 @@ static void routing_parse_Scluster(void) SURFXML_END_TAG(router); //TODO - xbt_dict_set(patterns, "radical", bprintf("_router"), xbt_free); - temp_cluster_bw = bprintf("%s",cluster_bw); + xbt_dict_set(patterns, "radical", xbt_strdup("_router"), xbt_free); + temp_cluster_bw = xbt_strdup(cluster_bw); temp_cluster_bw = replace_random_parameter(temp_cluster_bw); - temp_cluster_lat = bprintf("%s",cluster_lat); + temp_cluster_lat = xbt_strdup(cluster_lat); temp_cluster_lat = replace_random_parameter(temp_cluster_lat); XBT_DEBUG("", link_router,temp_cluster_bw, temp_cluster_lat); A_surfxml_link_state = A_surfxml_link_state_ON; @@ -3748,7 +3755,6 @@ static char* replace_random_parameter(char * string) static void clean_dict_random(void) { - XBT_DEBUG("Clean dict for random"); xbt_dict_free(&random_value); xbt_dict_free(&patterns); } @@ -3769,18 +3775,6 @@ static void routing_parse_Speer(void) char *host_id = NULL; char *router_id, *link_router, *link_backbone, *link_id_up, *link_id_down; -#ifdef HAVE_PCRE_LIB - -#endif - - int peer_sharing_policy = AX_surfxml_peer_sharing_policy; - -#ifndef HAVE_PCRE_LIB - //xbt_dynar_t tab_elements_num = xbt_dynar_new(sizeof(int), NULL); - //char *route_src, *route_dst; - //int j; -#endif - static unsigned int surfxml_buffer_stack_stack_ptr = 1; static unsigned int surfxml_buffer_stack_stack[1024]; @@ -3790,13 +3784,10 @@ static void routing_parse_Speer(void) SURFXML_BUFFER_SET(AS_id, peer_id); SURFXML_BUFFER_SET(AS_coordinates, peer_coord); -#ifdef HAVE_PCRE_LIB - SURFXML_BUFFER_SET(AS_routing, "RuleBased"); - XBT_DEBUG("", peer_id); -#else + SURFXML_BUFFER_SET(AS_routing, "Full"); XBT_DEBUG("", peer_id); -#endif + SURFXML_START_TAG(AS); XBT_DEBUG(" "); @@ -3828,8 +3819,6 @@ static void routing_parse_Speer(void) 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) -{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} SURFXML_BUFFER_SET(link_id, link_id_up); SURFXML_BUFFER_SET(link_bandwidth, peer_bw_in); SURFXML_BUFFER_SET(link_latency, peer_lat); @@ -3842,8 +3831,6 @@ static void routing_parse_Speer(void) 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) -{A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_FULLDUPLEX;} SURFXML_BUFFER_SET(link_id, link_id_down); SURFXML_BUFFER_SET(link_bandwidth, peer_bw_out); SURFXML_BUFFER_SET(link_latency, peer_lat); @@ -3856,9 +3843,9 @@ static void routing_parse_Speer(void) XBT_DEBUG(" "); // begin here - XBT_DEBUG(""); - SURFXML_BUFFER_SET(route_src, peer_id); + SURFXML_BUFFER_SET(route_src, host_id); SURFXML_BUFFER_SET(route_dst, router_id); A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; SURFXML_START_TAG(route); @@ -3866,8 +3853,6 @@ static void routing_parse_Speer(void) 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) - {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_UP;} SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); @@ -3875,18 +3860,16 @@ static void routing_parse_Speer(void) SURFXML_END_TAG(route); //Opposite Route - XBT_DEBUG(""); SURFXML_BUFFER_SET(route_src, router_id); - SURFXML_BUFFER_SET(route_dst, peer_id); + SURFXML_BUFFER_SET(route_dst, host_id); A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; SURFXML_START_TAG(route); 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) - {A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_DOWN;} SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); @@ -3898,7 +3881,12 @@ static void routing_parse_Speer(void) XBT_DEBUG(" "); //xbt_dynar_free(&tab_elements_num); - + free(host_id); + free(router_id); + free(link_router); + free(link_backbone); + free(link_id_up); + free(link_id_down); surfxml_bufferstack_pop(1); } @@ -3933,12 +3921,12 @@ static void routing_parse_Srandom(void) /* Check user stupidities */ if (max < min) - THROW2(arg_error, 0, "random->max < random->min (%f < %f)", max, min); + THROWF(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, + THROWF(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, + THROWF(arg_error, 0, "random->mean > random->max (%f > %f)", mean, max); /* normalize the mean and standard deviation before storing */ @@ -3946,7 +3934,7 @@ static void routing_parse_Srandom(void) 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)", + THROWF(arg_error, 0, "Invalid mean and standard deviation (%f and %f)", random->mean, random->std); XBT_DEBUG("id = '%s' min = '%f' max = '%f' mean = '%f' std_deviatinon = '%f' generator = '%d' seed = '%ld' radical = '%s'", @@ -3975,7 +3963,7 @@ static void routing_parse_Srandom(void) 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); + xbt_assert(!xbt_dict_get_or_null(random_value,random_id),"Custom Random '%s' already exists !",random_id); res = random_generate(random); tmpbuf = bprintf("%s%d",random_id,atoi(xbt_dynar_getfirst_as(radical_ends,char *))); xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free); @@ -3986,7 +3974,7 @@ static void routing_parse_Srandom(void) 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)); + xbt_assert(!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); xbt_dict_set(random_value, tmpbuf, bprintf("%f",res), free);