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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 6c461220ba..dd4709a949 100644
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -4,7 +4,7 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "private.h"
+#include "smx_private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
 #include "xbt/xbt_os_time.h"
@@ -33,30 +33,24 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
  */
 void SIMIX_create_environment(const char *file)
 {
-  xbt_dict_cursor_t cursor = NULL;
-  char *name = NULL;
-  void *workstation = NULL;
-
   double start, end;
 
-  platform_filename = bprintf("%s",file);
+  start = xbt_os_time();
+  parse_platform_file(file);
+  end = xbt_os_time();
+  XBT_DEBUG("PARSE TIME: %lg", (end - start));
 
-  // Reset callbacks
-  surf_parse_reset_callbacks();
-  // Add config callbacks
-  surf_parse_add_callback_config();
+}
 
-  parse_platform_file(file);
-  surf_config_models_create_elms();
+void SIMIX_post_create_environment(void) {
 
-  start = xbt_os_time();
-  /* FIXME: what time are we measuring ??? */
-  end = xbt_os_time();
-  DEBUG1("PARSE TIME: %lg", (end - start));
+  void **workstation = NULL;
+  xbt_lib_cursor_t cursor = NULL;
+  char *name = NULL;
 
-  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();
 }