fix the last broken tests by sanitizing the way properties are handled during the...

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

diff --git a/src/surf/surfxml_parse.c b/src/surf/surfxml_parse.c
index 6ee50e7..69f87ca 100644 (file)
--- a/src/surf/surfxml_parse.c
+++ b/src/surf/surfxml_parse.c
@@ -52,7 +52,6 @@ int surf_parse_get_int(const char *string) {
 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;
@@ -163,7 +162,6 @@ void surf_parse_init_callbacks(void)
 
          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);
@@ -228,7 +226,6 @@ void surf_parse_free_callbacks(void)
   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);
@@ -292,9 +289,12 @@ void STag_surfxml_platform(void)
 }
 
 void STag_surfxml_host(void){
-  s_surf_parsing_host_arg_t host;
+  s_sg_platf_host_cbarg_t host;
   memset(&host,0,sizeof(host));
 
+  xbt_assert(current_property_set == NULL, "Someone forgot to reset the property set to NULL in its closing tag (or XML malformed)");
+  host.properties = current_property_set = xbt_dict_new();
+
        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);
@@ -312,21 +312,21 @@ void STag_surfxml_host(void){
        sg_platf_new_host(&host);
 }
 void ETag_surfxml_host(void){
+  current_property_set = NULL;
        surfxml_call_cb_functions(ETag_surfxml_host_cb_list);
 }
 
 
 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){