yet another psychotic cleanup

diff --git a/src/include/surf/surfxml_parse_values.h b/src/include/surf/surfxml_parse_values.h
index 0decdd5..715a94f 100644 (file)
--- a/src/include/surf/surfxml_parse_values.h
+++ b/src/include/surf/surfxml_parse_values.h
@@ -75,8 +75,8 @@ extern surf_parsing_cluster_arg_t struct_cluster;
 extern surf_parsing_peer_arg_t struct_peer;
 extern surf_parsing_link_arg_t struct_lnk;
 
 extern surf_parsing_peer_arg_t struct_peer;
 extern surf_parsing_link_arg_t struct_lnk;
 

-void STag_surfxml_host_cluster(void);
-void STag_surfxml_link_cluster(void);
+void surf_parse_host(void);
+void surf_parse_link(void);

 
 
 #endif /* SURFXML_PARSE_VALUES_H_ */
 
 
 #endif /* SURFXML_PARSE_VALUES_H_ */

diff --git a/src/surf/surf_routing.c b/src/surf/surf_routing.c
index 4544514..8435506 100644 (file)
--- a/src/surf/surf_routing.c
+++ b/src/surf/surf_routing.c
@@ -1582,7 +1582,7 @@ void routing_parse_Scluster(void)
                struct_host->V_host_core = struct_cluster->S_cluster_core;
                struct_host->V_host_state_initial = SURF_RESOURCE_ON;
                struct_host->V_host_coord = "";
                struct_host->V_host_core = struct_cluster->S_cluster_core;
                struct_host->V_host_state_initial = SURF_RESOURCE_ON;
                struct_host->V_host_coord = "";

-               STag_surfxml_host_cluster();
+               surf_parse_host();

                XBT_DEBUG("</host>");
 
                A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
                XBT_DEBUG("</host>");
 
                A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;


@@ -1612,7 +1612,7 @@ void routing_parse_Scluster(void)
                 else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
                         struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
                }
                 else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
                         struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
                }

-               STag_surfxml_link_cluster();
+               surf_parse_link();

 
                xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free);
 //             XBT_INFO("key '%s' Value '%s'",host_id,link_id);
 
                xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free);
 //             XBT_INFO("key '%s' Value '%s'",host_id,link_id);


@@ -1664,7 +1664,7 @@ void routing_parse_Scluster(void)
                struct_host->V_host_core = struct_cluster->S_cluster_core;
                struct_host->V_host_state_initial = SURF_RESOURCE_ON;
                struct_host->V_host_coord = "";
                struct_host->V_host_core = struct_cluster->S_cluster_core;
                struct_host->V_host_state_initial = SURF_RESOURCE_ON;
                struct_host->V_host_coord = "";

-               STag_surfxml_host_cluster();
+               surf_parse_host();

                XBT_DEBUG("</host>");
 
                A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;
                XBT_DEBUG("</host>");
 
                A_surfxml_link_sharing_policy = A_surfxml_link_sharing_policy_SHARED;


@@ -1694,7 +1694,7 @@ void routing_parse_Scluster(void)
                 else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
                         struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
                }
                 else if (A_surfxml_link_sharing_policy == A_surfxml_link_sharing_policy_FULLDUPLEX)
                         struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
                }

-               STag_surfxml_link_cluster();
+               surf_parse_link();

 
                xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free);
 //             XBT_INFO("key '%s' Value '%s'",host_id,link_id);
 
                xbt_dict_set(cluster_host_link,host_id,strdup(link_id),free);
 //             XBT_INFO("key '%s' Value '%s'",host_id,link_id);


@@ -1749,7 +1749,7 @@ void routing_parse_Scluster(void)
                   struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
          }
 
                   struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
          }
 

-         STag_surfxml_link_cluster();
+         surf_parse_link();

          ETag_surfxml_link();
   }
 
          ETag_surfxml_link();
   }
 

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 722d451..b6a745f 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -312,9 +312,9 @@ void STag_surfxml_host(void){
                struct_host->V_host_state_initial = SURF_RESOURCE_OFF;
        struct_host->V_host_coord = xbt_strdup(A_surfxml_host_coordinates);
 
                struct_host->V_host_state_initial = SURF_RESOURCE_OFF;
        struct_host->V_host_coord = xbt_strdup(A_surfxml_host_coordinates);
 

-       surfxml_call_cb_functions(STag_surfxml_host_cb_list);
+       surf_parse_host();

 }
 }

-void STag_surfxml_host_cluster(void){
+void surf_parse_host(void){

        surfxml_call_cb_functions(STag_surfxml_host_cb_list);
 }
 void ETag_surfxml_host(void){
        surfxml_call_cb_functions(STag_surfxml_host_cb_list);
 }
 void ETag_surfxml_host(void){


@@ -432,9 +432,9 @@ void STag_surfxml_link(void){
                 struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
        }
 
                 struct_lnk->V_policy_initial_link = SURF_LINK_FULLDUPLEX;
        }
 

-       surfxml_call_cb_functions(STag_surfxml_link_cb_list);
+       surf_parse_link();

 }
 }

-void STag_surfxml_link_cluster(void){
+void surf_parse_link(void){

        surfxml_call_cb_functions(STag_surfxml_link_cb_list);
 }
 void ETag_surfxml_link(void){
        surfxml_call_cb_functions(STag_surfxml_link_cb_list);
 }
 void ETag_surfxml_link(void){