From 0ba30326412c8edaeedbcc09e41c3e5434ff1969 Mon Sep 17 00:00:00 2001 From: Navarrop Date: Thu, 27 Oct 2011 14:08:41 +0200 Subject: [PATCH] Fix cluster without backbone. --- src/surf/surf_routing.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c index 3cd7a0287c..7253143759 100644 --- a/src/surf/surf_routing.c +++ b/src/surf/surf_routing.c @@ -1694,7 +1694,7 @@ void routing_parse_Scluster(void) SURFXML_START_TAG(router); SURFXML_END_TAG(router); - if(struct_cluster->S_cluster_bb_bw && struct_cluster->S_cluster_bb_lat){ + if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){ char *link_backbone = bprintf("%s_backbone", struct_cluster->V_cluster_id); XBT_DEBUG("", link_backbone,struct_cluster->S_cluster_bb_bw, struct_cluster->S_cluster_bb_lat); A_surfxml_link_state = A_surfxml_link_state_ON; @@ -1740,7 +1740,7 @@ void routing_parse_Scluster(void) A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; SURFXML_START_TAG(route); - if(struct_cluster->S_cluster_bb_bw && struct_cluster->S_cluster_bb_lat){ + if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){ XBT_DEBUG("", pcre_link_backbone); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; @@ -1767,7 +1767,7 @@ void routing_parse_Scluster(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - if(struct_cluster->S_cluster_bb_bw && struct_cluster->S_cluster_bb_lat){ + if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){ XBT_DEBUG("", pcre_link_backbone); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; @@ -1786,7 +1786,7 @@ void routing_parse_Scluster(void) A_surfxml_route_symmetrical = A_surfxml_route_symmetrical_NO; SURFXML_START_TAG(route); - if(struct_cluster->S_cluster_bb_bw && struct_cluster->S_cluster_bb_lat){ + if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){ XBT_DEBUG("", pcre_link_backbone); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; @@ -1821,7 +1821,7 @@ void routing_parse_Scluster(void) SURFXML_START_TAG(link_ctn); SURFXML_END_TAG(link_ctn); - if(struct_cluster->S_cluster_bb_bw && struct_cluster->S_cluster_bb_lat){ + if( strcmp(struct_cluster->S_cluster_bb_bw,"") && strcmp(struct_cluster->S_cluster_bb_lat,"") ){ XBT_DEBUG("", pcre_link_backbone); SURFXML_BUFFER_SET(link_ctn_id, pcre_link_backbone); A_surfxml_link_ctn_direction = A_surfxml_link_ctn_direction_NONE; -- 2.20.1