X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/afa112ad45dec1a7c2becaa0d6e13b1c039d4696..bed0bd887ad1b2584aab20cf8b447df2e3a217aa:/src/simix/smx_environment.c

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 982188a9c6..6c461220ba 100644
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -9,6 +9,7 @@
 #include "xbt/log.h"
 #include "xbt/xbt_os_time.h"
 #include "xbt/config.h"
+#include "surf/surfxml_parse.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
                                 "Logging specific to SIMIX (environment)");
@@ -38,20 +39,24 @@ void SIMIX_create_environment(const char *file)
 
   double start, end;
 
-  surf_config_models_setup(file);
+  platform_filename = bprintf("%s",file);
+
+  // 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();
 
+  start = xbt_os_time();
+  /* FIXME: what time are we measuring ??? */
   end = xbt_os_time();
   DEBUG1("PARSE TIME: %lg", (end - start));
 
-#ifdef HAVE_TRACING
-  TRACE_surf_save_onelink ();
-#endif
-
   xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
                    name, workstation) {
-    __SIMIX_host_create(name, workstation, NULL);
+    SIMIX_host_create(name, workstation, NULL);
   }
+  surf_presolve();
 }