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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index b80f238c7c..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. */
@@ -9,91 +7,47 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+#include "xbt/xbt_os_time.h"
+#include "xbt/config.h"
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
-				"Logging specific to SIMIX (environment)");
+                                "Logging specific to SIMIX (environment)");
 
 /********************************* SIMIX **************************************/
 
-/** 
+/**
  * \brief A platform constructor.
  *
  * Creates a new platform, including hosts, links and the
- * routing_table. 
- * \param file a filename of a xml description of a platform. This file 
+ * routing_table.
+ * \param file a filename of a xml description of a platform. This file
  * follows this DTD :
  *
  *     \include surfxml.dtd
  *
- * Here is a small example of such a platform 
+ * Here is a small example of such a platform
  *
  *     \include small_platform.xml
  *
  */
-void SIMIX_create_environment(const char *file) 
+void SIMIX_create_environment(const char *file)
 {
   xbt_dict_cursor_t cursor = NULL;
   char *name = NULL;
   void *workstation = NULL;
-  char *workstation_model_name;
-
-  simix_config_init(); /* make sure that our configuration set is created */
-  surf_timer_resource_init(file);
 
-  /* which model do you want today? */
-  workstation_model_name = xbt_cfg_get_string (_simix_cfg_set, "workstation_model");
+  double start, end;
 
-  DEBUG1("Model : %s", workstation_model_name);
-  if (!strcmp(workstation_model_name,"KCCFLN05")) {
-    surf_workstation_resource_init_KCCFLN05(file);
-#ifdef HAVE_SDP
-  } else if (!strcmp(workstation_model_name,"SDP")) {
-    surf_workstation_resource_init_KCCFLN05_proportional(file);
-#endif
-  } else if (!strcmp(workstation_model_name,"Vegas")) {
-    surf_workstation_resource_init_KCCFLN05_Vegas(file);
-  } else if (!strcmp(workstation_model_name,"Reno")) {
-    surf_workstation_resource_init_KCCFLN05_Reno(file);
-  } else if (!strcmp(workstation_model_name,"CLM03")) {
-    surf_workstation_resource_init_CLM03(file);
-#ifdef HAVE_GTNETS
-  } else if (!strcmp(workstation_model_name,"GTNets")) {
-    surf_workstation_resource_init_GTNETS(file);
-#endif
-  } else if (!strcmp(workstation_model_name,"compound")) {
-    char *network_model_name = xbt_cfg_get_string (_simix_cfg_set, "network_model");
-    char *cpu_model_name = xbt_cfg_get_string (_simix_cfg_set, "cpu_model");
-    
-    if(!strcmp(cpu_model_name,"Cas01")) {
-      surf_cpu_resource_init_Cas01(file);
-    } else DIE_IMPOSSIBLE;
+  surf_config_models_setup(file);
+  parse_platform_file(file);
+  surf_config_models_create_elms();
+  start = xbt_os_time();
 
-    if(!strcmp(network_model_name,"CM02")) {
-      surf_network_resource_init_CM02(file);
-#ifdef HAVE_GTNETS
-    } else if(!strcmp(network_model_name,"GTNets")) {
-      surf_network_resource_init_GTNETS(file);
-#endif
-    } else if(!strcmp(network_model_name,"Reno")) {
-      surf_network_resource_init_Reno(file);
-    } else if(!strcmp(network_model_name,"Vegas")) {
-      surf_network_resource_init_Vegas(file);
-#ifdef HAVE_SDP
-    } else if(!strcmp(network_model_name,"SDP")) {
-      surf_network_resource_init_SDP(file);
-#endif
-    } else
-      DIE_IMPOSSIBLE;
-    
-    surf_workstation_resource_init_compound(file);
-  } else {
-    DIE_IMPOSSIBLE;
-  }
-  _simix_init_status = 2; /* inited; don't change settings now */
+  end = xbt_os_time();
+  DEBUG1("PARSE TIME: %lg", (end - start));
 
-  xbt_dict_foreach(workstation_set, cursor, name, workstation) {
+  xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
+                   name, workstation) {
     __SIMIX_host_create(name, workstation, NULL);
   }
-
-  return;
 }
-