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);
*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;
}
{
if(!route->dst_gateway && !route->src_gateway)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
- else
+ else{
XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
route->src_gateway, dst, route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The src_gateway '%s' does not exist!",route->src_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);
}
{
if(!route->dst_gateway && !route->src_gateway)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
- else
- XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
+ else{
+ XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
route->src_gateway, dst, route->dst_gateway);
-
+ if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
+ }
TO_FLOYD_LINK(*src_id, *dst_id) =
generic_new_extended_route(rc->hierarchy, route, 1);
TO_FLOYD_PRED(*src_id, *dst_id) = *src_id;
new_component->generic_routing.set_autonomous_system =
generic_set_autonomous_system;
new_component->generic_routing.set_route = model_dijkstra_both_set_route;
- new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route; //TODO
+ new_component->generic_routing.set_ASroute = model_dijkstra_both_set_route;
new_component->generic_routing.set_bypassroute = generic_set_bypassroute;
new_component->generic_routing.get_route = dijkstra_get_route;
new_component->generic_routing.get_latency = generic_get_link_latency;
if(!route->dst_gateway && !route->src_gateway)
XBT_DEBUG("Load Route from \"%s\" to \"%s\"", src, dst);
- else
+ else{
XBT_DEBUG("Load ASroute from \"%s(%s)\" to \"%s(%s)\"", src,
route->src_gateway, dst, route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->dst_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The dst_gateway '%s' does not exist!",route->dst_gateway);
+ if(global_routing->get_network_element_type((const char*)route->src_gateway) == SURF_NETWORK_ELEMENT_NULL)
+ xbt_die("The src_gateway '%s' does not exist!",route->src_gateway);
+ }
route_extended_t e_route =
generic_new_extended_route(current_routing->hierarchy, route, 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);