integrate initialization functions within the parsing main function to clean the...

diff --git a/examples/msg/masterslave/masterslave_cpu_ti.tesh b/examples/msg/masterslave/masterslave_cpu_ti.tesh
index 354343d..5979766 100644 (file)
--- a/examples/msg/masterslave/masterslave_cpu_ti.tesh
+++ b/examples/msg/masterslave/masterslave_cpu_ti.tesh
@@ -376,8 +376,8 @@ p Testing the bypassing of the flexml parser
 ! output sort
 $ $SG_TEST_EXENV ${bindir:=.}/masterslave_bypass --log=no_loc --cfg=cpu/model:CpuTI "--log=root.fmt:[%10.6r]%e(%i:%P@%h)%e%m%n"
 > [  0.000000] (0:@) Configuration change: Set 'cpu/model' to 'CpuTI'
-> [  0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.
 > [  0.000000] (0:@) Switching workstation model to compound since you changed the network and/or cpu model(s)
+> [  0.000000] (0:@) Bypassing the XML parser since surf_parse_open received a NULL pointer. If it is not what you want, go fix your code.
 > [  0.000000] (1:master@host A) Got 1 slave(s) :
 > [  0.000000] (1:master@host A)        host B
 > [  0.000000] (1:master@host A) Got 20 task to process :

diff --git a/src/simdag/sd_global.c b/src/simdag/sd_global.c
index 28398af..a9065e3 100644 (file)
--- a/src/simdag/sd_global.c
+++ b/src/simdag/sd_global.c
@@ -182,13 +182,7 @@ void SD_create_environment(const char *platform_file)
   void **surf_workstation = NULL;
   void **surf_link = NULL;
 
-  // Reset callbacks
-  surf_parse_reset_callbacks();
-  // Add config callbacks
-  surf_parse_add_callback_config();
-
   parse_platform_file(platform_file);
-  surf_config_models_create_elms();
 
   /* now let's create the SD wrappers for workstations and links */
   xbt_lib_foreach(host_lib, cursor, name, surf_workstation){

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 0c7d109..4b64816 100644 (file)
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -39,16 +39,8 @@ void SIMIX_create_environment(const char *file)
 
   double start, end;
 
-  // Reset callbacks
-  surf_parse_reset_callbacks();
-  // Add config callbacks
-  surf_parse_add_callback_config();
-
-  parse_platform_file(file);
-  surf_config_models_create_elms();
-
   start = xbt_os_time();
-  /* FIXME: what time are we measuring ??? */
+  parse_platform_file(file);
   end = xbt_os_time();
   XBT_DEBUG("PARSE TIME: %lg", (end - start));
 

diff --git a/teshsuite/simdag/platforms/basic_parsing_test.tesh b/teshsuite/simdag/platforms/basic_parsing_test.tesh
index b81c47e..3731fcb 100644 (file)
--- a/teshsuite/simdag/platforms/basic_parsing_test.tesh
+++ b/teshsuite/simdag/platforms/basic_parsing_test.tesh
@@ -85,7 +85,7 @@ $ ${bindir:=.}/basic_parsing_test ./properties.xml
 $ ${bindir:=.}/basic_parsing_test ./properties.xml --cfg=cpu/model:CpuTI
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'cpu/model' to 'CpuTI'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'maxmin/precision' to '0.000010'
-> [0.000000] [surf_route/INFO] The custom configuration 'cpu/model' is already define by user!
+> [0.000000] [surf_route/INFO] The custom configuration 'cpu/model' is already defined by user!
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'workstation/model' to 'compound'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'network/model' to 'Vegas'
 > [0.000000] [xbt_cfg/INFO] Configuration change: Set 'path' to '~/'