X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/368be7990cfe509e3c7715d9ad28f5ca1b3d62ef..3d27a1e82ea26521deee4ab0bab6543ab4339da9:/src/simix/smx_environment.c

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 4b1bde0fa4..20ce044908 100644
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -1,7 +1,5 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
-   All rights reserved.                                          */
+/* Copyright (c) 2007, 2008, 2009, 2010. 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. */
@@ -34,24 +32,27 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
  */
 void SIMIX_create_environment(const char *file)
 {
-	xbt_dict_cursor_t cursor = NULL;
+  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();
-
+  /* FIXME: what time are we measuring ??? */
   end = xbt_os_time();
   DEBUG1("PARSE TIME: %lg", (end - start));
 
-  xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor, name, workstation) {
-	  __SIMIX_host_create(name, workstation, NULL);
-  }
+#ifdef HAVE_TRACING
+  TRACE_surf_save_onelink();
+#endif
 
-  return;
+  xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
+                   name, workstation) {
+    SIMIX_host_create(name, workstation, NULL);
+  }
+  surf_presolve();
 }