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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 600d6da7b8..a591570401 100644
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -1,10 +1,10 @@
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* 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,34 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
  */
 void SIMIX_create_environment(const char *file)
 {
-  xbt_lib_cursor_t cursor = NULL;
-  char *name = NULL;
-  void **workstation = NULL;
-
-  double start, end;
+  double start = 0, end = 0;
+  if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
+    start = xbt_os_time();
+  parse_platform_file(file);
+  if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
+    end = xbt_os_time();
+  XBT_DEBUG("PARSE TIME: %g", (end - start));
 
-  platform_filename = bprintf("%s",file);
+}
 
-  // Reset callbacks
-  surf_parse_reset_callbacks();
-  // Add config callbacks
-  surf_parse_add_callback_config();
+void SIMIX_post_create_environment(void) {
 
-  parse_platform_file(file);
-  surf_config_models_create_elms();
+  void **host = NULL;
+  void **storage = NULL;
+  xbt_lib_cursor_t cursor = NULL;
+  char *name = NULL;
 
-  start = xbt_os_time();
-  /* FIXME: what time are we measuring ??? */
-  end = xbt_os_time();
-  XBT_DEBUG("PARSE TIME: %lg", (end - start));
+  /* Create host at SIMIX level */
+  xbt_lib_foreach(host_lib, cursor, name, host) {
+    if(host[SURF_HOST_LEVEL])
+      SIMIX_host_create(name);
+  }
 
-  xbt_lib_foreach(host_lib, cursor, name, workstation) {
-	  if(workstation[SURF_WKS_LEVEL])
-		  SIMIX_host_create(name, workstation[SURF_WKS_LEVEL], NULL);
+  /* Create storage at SIMIX level */
+  xbt_lib_foreach(storage_lib, cursor, name, storage) {
+    if(storage[SURF_STORAGE_LEVEL])
+      SIMIX_storage_create(name, storage[SURF_STORAGE_LEVEL], NULL);
   }
+
   surf_presolve();
 }