From: Martin Quinson <martin.quinson@loria.fr>
Date: Tue, 8 Nov 2011 11:22:00 +0000 (+0100)
Subject: simplify the code a bit
X-Git-Tag: exp_20120216~438
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/a527ab1525ea5788bf475824f6e4242138eccc6f

simplify the code a bit
---

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 6e62f79fea..e0f87de1c9 100644
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -1621,21 +1621,22 @@ void routing_parse_Scluster(void)
 	  char *link_backbone = bprintf("%s_backbone", struct_cluster->V_cluster_id);
 	  XBT_DEBUG("<link\tid=\"%s\" bw=\"%f\" lat=\"%f\"/>", link_backbone,struct_cluster->S_cluster_bb_bw, struct_cluster->S_cluster_bb_lat);
 
-	  A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
-	  if(AX_surfxml_cluster_bb_sharing_policy == A_surfxml_cluster_bb_sharing_policy_FATPIPE)
-	  {A_surfxml_link_sharing_policy =  A_surfxml_link_sharing_policy_FATPIPE;}
-
 	  memset(&link,0,sizeof(link));
 	  link.id = link_backbone;
 	  link.bandwidth = struct_cluster->S_cluster_bb_bw;
 	  link.latency = struct_cluster->S_cluster_bb_lat;
 	  link.state = SURF_RESOURCE_ON;
 
-	  /* FIXME: use a switch, and deal with FULLDUPLEX here */
-	  if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
-		  link.policy = SURF_LINK_SHARED;
-	  else
-		  link.policy = SURF_LINK_FATPIPE;
+	  switch (AX_surfxml_cluster_bb_sharing_policy) {
+	  case A_surfxml_cluster_bb_sharing_policy_FATPIPE:
+	    link.policy = SURF_LINK_FATPIPE;
+	    break;
+	  case A_surfxml_cluster_bb_sharing_policy_SHARED:
+	     link.policy = SURF_LINK_SHARED;
+	     break;
+	  default:
+	    surf_parse_error(bprintf("Invalid bb sharing policy in cluster %s",struct_cluster->V_cluster_id));
+	  }
 
 	  sg_platf_new_link(&link);
 	  ETag_surfxml_link();
diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index d9a920695e..e57c5bb965 100644
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -391,15 +391,18 @@ void STag_surfxml_link(void){
 		link.state = SURF_RESOURCE_OFF;
 	link.state_trace = tmgr_trace_new(A_surfxml_link_state_file);
 
-	/* FIXME: use a switch here */
-	if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
+	switch (A_surfxml_link_sharing_policy) {
+	case A_surfxml_link_sharing_policy_SHARED:
 		link.policy = SURF_LINK_SHARED;
-	else
-	{
-	 if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
+		break;
+	case A_surfxml_link_sharing_policy_FATPIPE:
 		 link.policy = SURF_LINK_FATPIPE;
-	 else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
+		 break;
+	case A_surfxml_link_sharing_policy_FULLDUPLEX:
 		 link.policy = SURF_LINK_FULLDUPLEX;
+		 break;
+	default:
+	  surf_parse_error(bprintf("Invalid sharing policy in link %s",link.id));
 	}
 
 	sg_platf_new_link(&link);