further code simplification. This one were nasty

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index e0f87de..9f7d2ae 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -1565,22 +1565,25 @@ void routing_parse_Scluster(void)
                link.latency = struct_cluster->S_cluster_lat;
                link.state = SURF_RESOURCE_ON;
 
                link.latency = struct_cluster->S_cluster_lat;
                link.state = SURF_RESOURCE_ON;
 

-               /* FIXME: use a switch here */
-               if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_SHARED)
-                       link.policy = SURF_LINK_SHARED;
-               else
-               {
-                if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FATPIPE)
-                        link.policy = SURF_LINK_FATPIPE;
-                else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
-                        link.policy = SURF_LINK_FULLDUPLEX;
+               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);
                }
                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);
                        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);

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index e57c5bb..80148b2 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -382,13 +382,17 @@ void STag_surfxml_link(void){
        link.bandwidth_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
        link.latency = surf_parse_get_double(A_surfxml_link_latency);
        link.latency_trace = tmgr_trace_new(A_surfxml_link_latency_file);
        link.bandwidth_trace = tmgr_trace_new(A_surfxml_link_bandwidth_file);
        link.latency = surf_parse_get_double(A_surfxml_link_latency);
        link.latency_trace = tmgr_trace_new(A_surfxml_link_latency_file);

-       /* FIXME: use a switch here */
-       xbt_assert((A_surfxml_link_state == A_surfxml_link_state_ON) ||
-                         (A_surfxml_link_state == A_surfxml_link_state_OFF), "Invalid state");
-       if (A_surfxml_link_state == A_surfxml_link_state_ON)
+
+       switch (A_surfxml_link_state) {
+       case A_surfxml_link_state_ON:

                link.state = SURF_RESOURCE_ON;
                link.state = SURF_RESOURCE_ON;

-       if (A_surfxml_link_state == A_surfxml_link_state_OFF)
+               break;
+       case A_surfxml_link_state_OFF:

                link.state = SURF_RESOURCE_OFF;
                link.state = SURF_RESOURCE_OFF;

+               break;
+       default:
+         surf_parse_error(bprintf("invalid state for link %s",link.id));
+       }

        link.state_trace = tmgr_trace_new(A_surfxml_link_state_file);
 
        switch (A_surfxml_link_sharing_policy) {
        link.state_trace = tmgr_trace_new(A_surfxml_link_state_file);
 
        switch (A_surfxml_link_sharing_policy) {