further code simplification. This one were nasty

[simgrid.git] / src / surf / surf_routing.c

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 24f8467..9f7d2ae 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -1467,24 +1467,20 @@ void routing_parse_Scluster(void)
                XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
 
                memset(&link,0,sizeof(link));
-               link.V_link_id = link_id;
-               link.V_link_bandwidth = struct_cluster->S_cluster_bw;
-               link.V_link_latency = struct_cluster->S_cluster_lat;
-               link.V_link_bandwidth_file = NULL;
-               link.V_link_latency_file = NULL;
-               link.V_link_state_file = NULL;
-               link.V_link_state = SURF_RESOURCE_ON;
-               link.V_link_sharing_policy = A_surfxml_link_sharing_policy;
+               link.id = link_id;
+               link.bandwidth = struct_cluster->S_cluster_bw;
+               link.latency = struct_cluster->S_cluster_lat;
+               link.state = SURF_RESOURCE_ON;
 
                switch (A_surfxml_link_sharing_policy) {
                case A_surfxml_link_sharing_policy_SHARED:
-                       link.V_policy_initial_link = SURF_LINK_SHARED;
+                       link.policy = SURF_LINK_SHARED;
                        break;
                case A_surfxml_link_sharing_policy_FATPIPE:
-                 link.V_policy_initial_link = SURF_LINK_FATPIPE;
+                 link.policy = SURF_LINK_FATPIPE;
                  break;
                case A_surfxml_link_sharing_policy_FULLDUPLEX:
-                 link.V_policy_initial_link = SURF_LINK_FULLDUPLEX;
+                 link.policy = SURF_LINK_FULLDUPLEX;
                  break;
                case AU_surfxml_link_sharing_policy:
                  surf_parse_error(bprintf("Invalid sharing policy in cluster %s (please report this bug, this shouldn't happen)",struct_cluster->V_cluster_id));
@@ -1564,30 +1560,30 @@ void routing_parse_Scluster(void)
                XBT_DEBUG("<link\tid=\"%s\"\tbw=\"%f\"\tlat=\"%f\"/>", link_id,struct_cluster->S_cluster_bw, struct_cluster->S_cluster_lat);
 
                memset(&link,0,sizeof(link));
-               link.V_link_id = link_id;
-               link.V_link_bandwidth = struct_cluster->S_cluster_bw;
-               link.V_link_latency = struct_cluster->S_cluster_lat;
-               link.V_link_bandwidth_file = NULL;
-               link.V_link_latency_file = NULL;
-               link.V_link_state_file = NULL;
-               link.V_link_state = SURF_RESOURCE_ON;
-               link.V_link_sharing_policy = A_surfxml_link_sharing_policy;
-
-               if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
-                       link.V_policy_initial_link = SURF_LINK_SHARED;
-               else
-               {
-                if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
-                        link.V_policy_initial_link = SURF_LINK_FATPIPE;
-                else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
-                        link.V_policy_initial_link = SURF_LINK_FULLDUPLEX;
+               link.id = link_id;
+               link.bandwidth = struct_cluster->S_cluster_bw;
+               link.latency = struct_cluster->S_cluster_lat;
+               link.state = SURF_RESOURCE_ON;
+
+               switch (struct_cluster->V_cluster_sharing_policy) {
+               case A_surfxml_cluster_sharing_policy_SHARED:
+      link.policy = SURF_LINK_SHARED;
+      break;
+               case A_surfxml_cluster_sharing_policy_FULLDUPLEX:
+                 link.policy = SURF_LINK_FULLDUPLEX;
+                 break;
+               case A_surfxml_cluster_sharing_policy_FATPIPE:
+                 link.policy = SURF_LINK_FATPIPE;
+                 break;
+               default:
+                 surf_parse_error(bprintf("Invalid cluster sharing policy for cluster %s",struct_cluster->V_cluster_id));
                }
                sg_platf_new_link(&link);
 
                ETag_surfxml_link();
 
                surf_parsing_link_up_down_t info = xbt_new0(s_surf_parsing_link_up_down_t, 1);
-               if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX){
+               if (link.policy == SURF_LINK_FULLDUPLEX) {
                        char* tmp_link =  bprintf("%s_UP",link_id);
                        info->link_up   = xbt_lib_get_or_null(link_lib, tmp_link, SURF_LINK_LEVEL);
                        free(tmp_link);
@@ -1628,24 +1624,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.V_link_id = link_backbone;
-         link.V_link_bandwidth = struct_cluster->S_cluster_bb_bw;
-         link.V_link_latency = struct_cluster->S_cluster_bb_lat;
-         link.V_link_bandwidth_file = NULL;
-         link.V_link_latency_file = NULL;
-         link.V_link_state_file = NULL;
-         link.V_link_state = SURF_RESOURCE_ON;
-         link.V_link_sharing_policy = A_surfxml_link_sharing_policy;
-
-         if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
-                 link.V_policy_initial_link = SURF_LINK_SHARED;
-         else
-                 link.V_policy_initial_link = SURF_LINK_FATPIPE;
+         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;
+
+         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();