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

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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index dd51dd0..4b64816 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)");
@@ -32,22 +33,20 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
  */
 void SIMIX_create_environment(const char *file)
 {
-  xbt_dict_cursor_t cursor = NULL;
+  xbt_lib_cursor_t cursor = NULL;
   char *name = NULL;
-  void *workstation = NULL;
+  void **workstation = NULL;
 
   double start, end;
 
-  surf_config_models_setup(file);
-  parse_platform_file(file);
-  surf_config_models_create_elms();
   start = xbt_os_time();
-
+  parse_platform_file(file);
   end = xbt_os_time();
-  DEBUG1("PARSE TIME: %lg", (end - start));
+  XBT_DEBUG("PARSE TIME: %lg", (end - start));
 
-  xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
-                   name, workstation) {
-    __SIMIX_host_create(name, workstation, NULL);
+  xbt_lib_foreach(host_lib, cursor, name, workstation) {
+         if(workstation[SURF_WKS_LEVEL])
+                 SIMIX_host_create(name, workstation[SURF_WKS_LEVEL], NULL);
   }
+  surf_presolve();
 }