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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 979958d392..dd51dd0914 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,13 +32,12 @@ 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();
@@ -49,9 +46,8 @@ void SIMIX_create_environment(const char *file)
   end = xbt_os_time();
   DEBUG1("PARSE TIME: %lg", (end - start));
 
-  xbt_dict_foreach(workstation_set, cursor, name, workstation) {
-	  __SIMIX_host_create(name, workstation, NULL);
+  xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
+                   name, workstation) {
+    __SIMIX_host_create(name, workstation, NULL);
   }
-
-  return;
 }