char *cluster_availability_file = A_surfxml_cluster_availability_file;
char *cluster_state_file = A_surfxml_cluster_state_file;
char *host_id, *groups, *link_id = NULL;
- char *router_id, *link_backbone;
+ char *router_id = xbt_strdup(A_surfxml_cluster_router_id);
char *availability_file = xbt_strdup(cluster_availability_file);
char *state_file = xbt_strdup(cluster_state_file);
xbt_dynar_free(&radical_elements);
XBT_DEBUG(" ");
- router_id =
- bprintf("%s%s_router%s", cluster_prefix, cluster_id,
- cluster_suffix);
+ if(!strcmp(router_id,""))
+ router_id = bprintf("%s%s_router%s", cluster_prefix, cluster_id, cluster_suffix);
XBT_DEBUG("<router id=\"%s\"/>", router_id);
SURFXML_BUFFER_SET(router_id, router_id);
SURFXML_END_TAG(router);
if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,"")){
- link_backbone = bprintf("%s_backbone", cluster_id);
+ char *link_backbone = bprintf("%s_backbone", cluster_id);
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;
SURFXML_BUFFER_SET(link_state_file, "");
SURFXML_START_TAG(link);
SURFXML_END_TAG(link);
+ free(link_backbone);
}
XBT_DEBUG(" ");
#endif
free(router_id);
- if(strcmp(cluster_bb_bw,"") && strcmp(cluster_bb_lat,""))
- free(link_backbone);
xbt_dict_free(&patterns);
free(availability_file);
free(state_file);