/**
* \brief Add a "host" to the network element list
*/
-static void parse_S_host(const char *host_id, const char* coord)
+void parse_S_host(const char *host_id, const char* coord)
{
network_element_info_t info = NULL;
if (current_routing->hierarchy == SURF_ROUTING_NULL)
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);
}
}
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);
}
}
/**
* \brief Set the endponints for a route
*/
-static void parse_S_route_new_and_endpoints(const char *src_id, const char *dst_id)
+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",
/**
* \brief Set a new link on the actual list of link for a route or ASroute
*/
-static void parse_E_link_ctn_new_elem(const char *link_id)
+void parse_E_link_ctn_new_elem(const char *link_id)
{
char *val;
val = xbt_strdup(link_id);
/**
* \brief Store the route by calling the set_route function of the current routing component
*/
-static void parse_E_route_store_route(void)
+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;
* make the new structure and
* set the parsing functions to allows parsing the part of the routing tree
*/
-static void parse_S_AS(char *AS_id, char *AS_routing)
+void parse_S_AS(char *AS_id, char *AS_routing)
{
routing_component_t new_routing;
model_type_t model = NULL;
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);
- 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);
}
}
* When you finish to read the routing component, other structures must be created.
* the "end" method allow to do that for any routing model type
*/
-static void parse_E_AS(const char *AS_id)
+void parse_E_AS(const char *AS_id)
{
if (current_routing == NULL) {
param_list = dst_list;
param_size = dst_size;
} else {
- xbt_die(bprintf(
- "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;
are_processing_units = 0;
rule_list = routing->list_ASroute;
} else
- xbt_die(bprintf("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 =
#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));
+ 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);
- 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_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));
+ 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;
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));
+ 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);
- 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_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));
+ 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;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
+ xbt_free(temp_cluster_bw);
+ xbt_free(temp_cluster_lat);
free(link_id);
free(host_id);
}
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));
+ 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;
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
+ 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;
}
}
xbt_dynar_free(&tab_elements_num);
- free(router_id);
#endif
+ free(router_id);
free(link_backbone);
free(link_router);
xbt_dict_free(&patterns);
*/
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(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);
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;
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:
