X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/86a08ab9c895a99c7efb4ee38db24c3541deb6bd..0c43de62fbe4bfc243d6512296e09207e80bcd54:/src/simix/smx_environment.c

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 979958d392..b8655fa60c 100644
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -1,16 +1,15 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
-   All rights reserved.                                          */
+/* Copyright (c) 2007-2013. 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"
 #include "xbt/config.h"
+#include "surf/surfxml_parse.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
                                 "Logging specific to SIMIX (environment)");
@@ -34,24 +33,33 @@ 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;
 
-  surf_timer_model_init(file);
-  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: %g", (end - start));
+
+}
+
+void SIMIX_post_create_environment(void) {
+
+  void **workstation = NULL;
+  void **storage = NULL;
+  xbt_lib_cursor_t cursor = NULL;
+  char *name = NULL;
+
+  /* Create host at SIMIX level */
+  xbt_lib_foreach(host_lib, cursor, name, workstation) {
+    if(workstation[SURF_WKS_LEVEL])
+      SIMIX_host_create(name, workstation[SURF_WKS_LEVEL], NULL);
+  }
 
-  xbt_dict_foreach(workstation_set, cursor, name, workstation) {
-	  __SIMIX_host_create(name, workstation, 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);
   }
 
-  return;
+  surf_presolve();
 }