info->rc_type = SURF_NETWORK_ELEMENT_HOST;
xbt_dict_set(global_routing->where_network_elements, host_id,
(void *) info, xbt_free);
-
if (strcmp(coord,"")) {
- xbt_dynar_t ctn = xbt_str_split_str(coord, " ");
- xbt_dynar_shrink(ctn,0);
- xbt_dict_set (coordinates,host_id,ctn,NULL);
+ xbt_dynar_t ctn = xbt_str_split_str(coord, " ");
+ xbt_dynar_shrink(ctn, 0);
+ xbt_dict_set(coordinates, host_id, ctn, xbt_dynar_free_voidp);
}
}
char *elem;
xbt_dict_foreach(current_property_set, cursor, key, elem) {
- DEBUG2("property : %s = %s",key,elem);
+ XBT_DEBUG("property : %s = %s",key,elem);
}
}
xbt_dict_set(global_routing->where_network_elements, A_surfxml_router_id,
(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);
- xbt_dict_set (coordinates,A_surfxml_router_id,ctn,NULL);
+ xbt_dynar_t ctn = xbt_str_split_str(A_surfxml_router_coordinates, " ");
+ xbt_dynar_shrink(ctn, 0);
+ xbt_dict_set(coordinates, A_surfxml_router_id, ctn, xbt_dynar_free_voidp);
}
}
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);
+ 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, xbt_dynar_free_voidp);
}
}
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");
{
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;
*name)
{
network_element_info_t rc = NULL;
- rc = xbt_dict_get(global_routing->where_network_elements, name);
+ rc = xbt_dict_get_or_null(global_routing->where_network_elements, name);
+ if(!rc) return SURF_NETWORK_ELEMENT_NULL;
return rc->rc_type;
}
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);
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);
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;
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) =
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;
}
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) =
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;
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 =
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;
(routing_component_rulebased_t) rc;
int are_processing_units=0;
- xbt_dynar_t rule_list = NULL;
+ 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)) {
are_processing_units = 1;
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;
int ovector_dst[OVECCOUNT];
const char **list_src = NULL;
const char **list_dst = NULL;
+ int res;
xbt_dynar_foreach(rule_list, cpt, ruleroute) {
rc_src =
pcre_exec(ruleroute->re_src, NULL, src, src_length, 0, 0,
pcre_exec(ruleroute->re_dst, NULL, dst, dst_length, 0, 0,
ovector_dst, OVECCOUNT);
if (rc_dst >= 0) {
- xbt_assert1(!pcre_get_substring_list
- (src, ovector_src, rc_src, &list_src),
- "error solving substring list for src \"%s\"", src);
- xbt_assert1(!pcre_get_substring_list
- (dst, ovector_dst, rc_dst, &list_dst),
- "error solving substring list for src \"%s\"", dst);
+ res = pcre_get_substring_list(src, ovector_src, rc_src, &list_src);
+ xbt_assert1(!res, "error solving substring list for src \"%s\"", src);
+ res = pcre_get_substring_list(dst, ovector_dst, rc_dst, &list_dst);
+ xbt_assert1(!res, "error solving substring list for src \"%s\"", dst);
char *link_name;
xbt_dynar_foreach(ruleroute->re_str_link, cpt, link_name) {
char *new_link_name =
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;
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;
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;
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)
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)
SURFXML_BUFFER_SET(AS_id, cluster_id);
#ifdef HAVE_PCRE_LIB
SURFXML_BUFFER_SET(AS_routing, "RuleBased");
-
DEBUG1("<AS id=\"%s\"\trouting=\"RuleBased\">", cluster_id);
+
XBT_DEBUG("<AS id=\"%s\"\trouting=\"RuleBased\">", cluster_id);
#else
SURFXML_BUFFER_SET(AS_routing, "Full");
-
DEBUG1("<AS id=\"%s\"\trouting=\"Full\">", cluster_id);
+
XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", cluster_id);
#endif
SURFXML_START_TAG(AS);
#endif
link_id = bprintf("%s_link_%d", cluster_id, start);
- xbt_dict_set(patterns,"radical",bprintf("%d",start),NULL);
+ xbt_dict_set(patterns, "radical", bprintf("%d", start), xbt_free);
temp_cluster_power = bprintf("%s",cluster_power);
- temp_cluster_power = bprintf("%s",replace_random_parameter(temp_cluster_power));
- DEBUG2("<host\tid=\"%s\"\tpower=\"%s\">", host_id, temp_cluster_power);
+ temp_cluster_power = replace_random_parameter(temp_cluster_power);
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", 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);
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("</host>");
+ SURFXML_BUFFER_SET(host_coordinates, "");
+ xbt_free(availability_file);
+ availability_file = bprintf("%s",cluster_availability_file);
+ xbt_free(state_file);
+ state_file = bprintf("%s",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));
+ SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns));
+ XBT_DEBUG("</host>");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
temp_cluster_bw = bprintf("%s",cluster_bw);
- temp_cluster_bw = bprintf("%s",replace_random_parameter(temp_cluster_bw));
+ temp_cluster_bw = 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\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,temp_cluster_bw, cluster_lat);
+ temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", 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)
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
+ xbt_free(temp_cluster_bw);
+ xbt_free(temp_cluster_lat);
free(link_id);
free(host_id);
break;
#endif
link_id = bprintf("%s_link_%d", cluster_id, i);
- xbt_dict_set(patterns,"radical",bprintf("%d",i),NULL);
+ xbt_dict_set(patterns, "radical", bprintf("%d", i), xbt_free);
temp_cluster_power = bprintf("%s",cluster_power);
- temp_cluster_power = bprintf("%s",replace_random_parameter(temp_cluster_power));
- DEBUG2("<host\tid=\"%s\"\tpower=\"%s\">", host_id, temp_cluster_power);
+ temp_cluster_power = replace_random_parameter(temp_cluster_power);
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\">", 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);
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("</host>");
+ SURFXML_BUFFER_SET(host_availability, "1.0");
+ SURFXML_BUFFER_SET(host_coordinates, "");
+ xbt_free(availability_file);
+ availability_file = bprintf("%s",cluster_availability_file);
+ xbt_free(state_file);
+ state_file = bprintf("%s",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));
+ SURFXML_BUFFER_SET(host_state_file, xbt_str_varsubst(state_file,patterns));
+ XBT_DEBUG("</host>");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
+ xbt_free(temp_cluster_power);
+
temp_cluster_bw = bprintf("%s",cluster_bw);
- temp_cluster_bw = bprintf("%s",replace_random_parameter(temp_cluster_bw));
+ temp_cluster_bw = 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\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id,temp_cluster_bw, cluster_lat);
+ temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", 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)
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
+ xbt_free(temp_cluster_bw);
+ xbt_free(temp_cluster_lat);
free(link_id);
free(host_id);
}
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=\"%s\"/>", router_id);
+ XBT_DEBUG("<router id=\"%s\"/>", router_id);
SURFXML_BUFFER_SET(router_id, router_id);
SURFXML_START_TAG(router);
SURFXML_END_TAG(router);
//TODO
- xbt_dict_set(patterns,"radical",bprintf("_router"),NULL);
+ xbt_dict_set(patterns, "radical", bprintf("_router"), xbt_free);
temp_cluster_bw = bprintf("%s",cluster_bw);
- temp_cluster_bw = bprintf("%s",replace_random_parameter(temp_cluster_bw));
+ temp_cluster_bw = 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\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_router,temp_cluster_bw, temp_cluster_lat);
+ temp_cluster_lat = replace_random_parameter(temp_cluster_lat);
+ XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", 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)
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG3("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", link_backbone,cluster_bb_bw, cluster_bb_lat);
+ xbt_free(temp_cluster_bw);
+ xbt_free(temp_cluster_lat);
+
+ XBT_DEBUG("<link\tid=\"%s\" bw=\"%s\" lat=\"%s\"/>", 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)
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG0(" ");
+ XBT_DEBUG(" ");
#ifdef HAVE_PCRE_LIB
char *new_suffix = xbt_strdup("");
char *pcre_link_backbone = bprintf("%s_backbone", cluster_id);
char *pcre_link_dst = bprintf("%s_link_$1dst", cluster_id);
- DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, route_src_dst);
- DEBUG0("symmetrical=\"NO\">");
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src_dst, route_src_dst);
+ XBT_DEBUG("symmetrical=\"NO\">");
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("<link_ctn\tid=\"%s\"/>", pcre_link_src);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG1("<link_ctn\tid=\"%s\"/>", pcre_link_backbone);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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("<link_ctn\tid=\"%s\"/>", pcre_link_dst);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG0("</route>");
+ XBT_DEBUG("</route>");
SURFXML_END_TAG(route);
free(pcre_link_dst);
cluster_suffix);
}
- DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src, route_dst);
- DEBUG0("symmetrical=\"NO\">");
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", route_src, route_dst);
+ XBT_DEBUG("symmetrical=\"NO\">");
SURFXML_BUFFER_SET(route_src, route_src);
SURFXML_BUFFER_SET(route_dst, route_dst);
A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO;
xbt_dynar_get_as(tab_elements_num, j, int));
}
- DEBUG1("<link_ctn\tid=\"%s\"/>", route_src);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG1("<link_ctn\tid=\"%s_backbone\"/>", cluster_id);
+ XBT_DEBUG("<link_ctn\tid=\"%s_backbone\"/>", 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("<link_ctn\tid=\"%s\"/>", route_dst);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG0("</route>");
+ XBT_DEBUG("</route>");
SURFXML_END_TAG(route);
}
}
xbt_dynar_free(&tab_elements_num);
- free(router_id);
#endif
+ free(router_id);
free(link_backbone);
free(link_router);
xbt_dict_free(&patterns);
free(availability_file);
free(state_file);
- DEBUG0("</AS>");
+ XBT_DEBUG("</AS>");
SURFXML_END_TAG(AS);
- DEBUG0(" ");
+ XBT_DEBUG(" ");
surfxml_bufferstack_pop(1);
}
*/
static char* replace_random_parameter(char * string)
{
- char *temp_string = NULL;
- char *test_string = NULL;
+ char *test_string = NULL;
- if(xbt_dict_size(random_value)==0)
- return string;
+ 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
+ string = xbt_str_varsubst(string, patterns); // for patterns of cluster
+ test_string = bprintf("${%s}", string);
+ test_string = xbt_str_varsubst(test_string,random_value); //Add ${xxxxx} for random Generator
- if(strcmp(test_string,"")) //if not empty, keep this value.
- string = bprintf("%s",test_string);
- else //In other case take old value (without ${})
- string = bprintf("%s",temp_string);
+ if (strcmp(test_string,"")) { //if not empty, keep this value.
+ xbt_free(string);
+ string = test_string;
+ } //In other case take old value (without ${})
- return string;
+ return string;
}
static void routing_parse_Speer(void)
SURFXML_BUFFER_SET(AS_coordinates, peer_coord);
#ifdef HAVE_PCRE_LIB
SURFXML_BUFFER_SET(AS_routing, "RuleBased");
-
DEBUG1("<AS id=\"%s\"\trouting=\"RuleBased\">", peer_id);
+
XBT_DEBUG("<AS id=\"%s\"\trouting=\"RuleBased\">", peer_id);
#else
SURFXML_BUFFER_SET(AS_routing, "Full");
-
DEBUG1("<AS id=\"%s\"\trouting=\"Full\">", peer_id);
+
XBT_DEBUG("<AS id=\"%s\"\trouting=\"Full\">", 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);
link_router = bprintf("%s_link_router", peer_id);
link_backbone = bprintf("%s_backbone", peer_id);
- DEBUG2("<host\tid=\"%s\"\tpower=\"%s\"/>", host_id, peer_power);
+ XBT_DEBUG("<host\tid=\"%s\"\tpower=\"%s\"/>", 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);
SURFXML_BUFFER_SET(host_availability, "1.0");
SURFXML_BUFFER_SET(host_availability_file, peer_availability_file);
SURFXML_BUFFER_SET(host_state_file, peer_state_file);
+ SURFXML_BUFFER_SET(host_coordinates, "");
SURFXML_START_TAG(host);
SURFXML_END_TAG(host);
- DEBUG2("<router id=\"%s\"\tcoordinates=\"%s\"/>", router_id, peer_coord);
+ XBT_DEBUG("<router id=\"%s\"\tcoordinates=\"%s\"/>", 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\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_up, peer_bw_in, peer_lat);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", 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)
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG3("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", link_id_down, peer_bw_out, peer_lat);
+ XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%s\"\tlat=\"%s\"/>", 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)
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
- DEBUG0(" ");
+ XBT_DEBUG(" ");
// begin here
- DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", peer_id, router_id);
- DEBUG0("symmetrical=\"NO\">");
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", peer_id, router_id);
+ XBT_DEBUG("symmetrical=\"NO\">");
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_ctn\tid=\"%s\"/>", link_id_up);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG0("</route>");
+ XBT_DEBUG("</route>");
SURFXML_END_TAG(route);
//Opposite Route
- DEBUG2("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, peer_id);
- DEBUG0("symmetrical=\"NO\">");
+ XBT_DEBUG("<route\tsrc=\"%s\"\tdst=\"%s\"", router_id, peer_id);
+ XBT_DEBUG("symmetrical=\"NO\">");
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_ctn\tid=\"%s\"/>", link_id_down);
+ XBT_DEBUG("<link_ctn\tid=\"%s\"/>", 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)
SURFXML_START_TAG(link_ctn);
SURFXML_END_TAG(link_ctn);
- DEBUG0("</route>");
+ XBT_DEBUG("</route>");
SURFXML_END_TAG(route);
- DEBUG0("</AS>");
+ XBT_DEBUG("</AS>");
SURFXML_END_TAG(AS);
- DEBUG0(" ");
+ XBT_DEBUG(" ");
//xbt_dynar_free(&tab_elements_num);
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;
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,
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,
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);
char *elem;
xbt_dict_foreach(random_value, cursor, key, elem) {
- DEBUG2("%s = %s",key,elem);
+ XBT_DEBUG("%s = %s",key,elem);
}
}
