Further parser cleanups

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

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index ccbfb41..ffa11fc 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -49,11 +49,9 @@ int surf_parse_get_int(const char *string) {
 
 /* make sure these symbols are defined as strong ones in this file so that the linker can resolve them */
 //xbt_dynar_t STag_surfxml_host_cb_list = NULL;
-xbt_dynar_t surf_parse_host_cb_list = NULL; // of functions of type: surf_parsing_host_arg_t -> void
 xbt_dynar_t STag_surfxml_platform_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_platform_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_host_cb_list = NULL;
-xbt_dynar_t STag_surfxml_router_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_router_cb_list = NULL;
 xbt_dynar_t STag_surfxml_link_cb_list = NULL;
 xbt_dynar_t ETag_surfxml_link_cb_list = NULL;
@@ -162,10 +160,8 @@ void surf_parse_init_callbacks(void)
          ETag_surfxml_platform_cb_list =
              xbt_dynar_new(sizeof(void_f_void_t), NULL);
 
-         surf_parse_host_cb_list = xbt_dynar_new(sizeof(surf_parse_host_fct_t), NULL);
-
+         sg_platf_init();
          ETag_surfxml_host_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
-         STag_surfxml_router_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
          ETag_surfxml_router_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
          STag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
          ETag_surfxml_link_cb_list = xbt_dynar_new(sizeof(void_f_void_t), NULL);
@@ -225,12 +221,11 @@ void surf_parse_reset_callbacks(void)
 
 void surf_parse_free_callbacks(void)
 {
-  xbt_dynar_free(&surf_parse_host_cb_list);
+  sg_platf_exit();
 
   xbt_dynar_free(&STag_surfxml_platform_cb_list);
   xbt_dynar_free(&ETag_surfxml_platform_cb_list);
   xbt_dynar_free(&ETag_surfxml_host_cb_list);
-  xbt_dynar_free(&STag_surfxml_router_cb_list);
   xbt_dynar_free(&ETag_surfxml_router_cb_list);
   xbt_dynar_free(&STag_surfxml_link_cb_list);
   xbt_dynar_free(&ETag_surfxml_link_cb_list);
@@ -268,7 +263,7 @@ void surf_parse_free_callbacks(void)
 
 void STag_surfxml_platform(void)
 {
-  double version = surf_parse_get_double(A_surfxml_platform_version);
+  _XBT_GNUC_UNUSED double version = surf_parse_get_double(A_surfxml_platform_version);
 
   xbt_assert((version >= 1.0), "******* BIG FAT WARNING *********\n "
       "You're using an ancient XML file.\n"
@@ -291,15 +286,13 @@ void STag_surfxml_platform(void)
       "available in the tools/ directory of the source archive.");
 
   surfxml_call_cb_functions(STag_surfxml_platform_cb_list);
-
 }
 
 void STag_surfxml_host(void){
-//     XBT_INFO("STag_surfxml_host [%s]",A_surfxml_host_id);
-  s_surf_parsing_host_arg_t host;
+  s_sg_platf_host_cbarg_t host;
   memset(&host,0,sizeof(host));
 
-       host.V_host_id = xbt_strdup(A_surfxml_host_id);
+       host.V_host_id = A_surfxml_host_id;
        host.V_host_power_peak = get_cpu_power(A_surfxml_host_power);
        host.V_host_power_scale = surf_parse_get_double( A_surfxml_host_availability);
        host.V_host_core = surf_parse_get_int(A_surfxml_host_core);
@@ -311,19 +304,9 @@ void STag_surfxml_host(void){
                host.V_host_state_initial = SURF_RESOURCE_ON;
        if (A_surfxml_host_state == A_surfxml_host_state_OFF)
                host.V_host_state_initial = SURF_RESOURCE_OFF;
-       host.V_host_coord = xbt_strdup(A_surfxml_host_coordinates);
+       host.V_host_coord = A_surfxml_host_coordinates;
 
-       surf_parse_host(&host);
-}
-void surf_parse_host(surf_parsing_host_arg_t h){
-  unsigned int iterator;
-  surf_parse_host_fct_t fun;
-  xbt_dynar_foreach(surf_parse_host_cb_list, iterator, fun) {
-    if (fun) (*fun) (h);
-  }
-}
-void surf_parse_host_add_cb(surf_parse_host_fct_t fct) {
-  xbt_dynar_push(surf_parse_host_cb_list, &fct);
+       sg_platf_new_host(&host);
 }
 void ETag_surfxml_host(void){
        surfxml_call_cb_functions(ETag_surfxml_host_cb_list);
@@ -331,16 +314,15 @@ void ETag_surfxml_host(void){
 
 
 void STag_surfxml_router(void){
-       struct_router = xbt_new0(s_surf_parsing_router_arg_t, 1);
-       struct_router->V_router_id = xbt_strdup(A_surfxml_router_id);
-       struct_router->V_router_coord = xbt_strdup(A_surfxml_router_coordinates);
-       surfxml_call_cb_functions(STag_surfxml_router_cb_list);
+  s_sg_platf_router_cbarg_t router;
+  memset(&router, 0, sizeof(router));
+
+       router.V_router_id = xbt_strdup(A_surfxml_router_id);
+       router.V_router_coord = xbt_strdup(A_surfxml_router_coordinates);
+       sg_platf_new_router(&router);
 }
 void ETag_surfxml_router(void){
        surfxml_call_cb_functions(ETag_surfxml_router_cb_list);
-       xbt_free(struct_router->V_router_id);
-       xbt_free(struct_router->V_router_coord);
-       xbt_free(struct_router);
 }
 
 void STag_surfxml_cluster(void){