Make msg_comm_t be a real structure again, not an alias of smx_comm_t.

[simgrid.git] / src / simix / smx_environment.c

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 20ce044..6c46122 100644 (file)
--- 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,18 +39,21 @@ 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();
   /* 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);