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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index db9c81b381..eed850b36b 100644
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -9,6 +9,7 @@
 #include "private.h"
 #include "xbt/sysdep.h"
 #include "xbt/log.h"
+
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
 				"Logging specific to SIMIX (environment)");
 
@@ -29,7 +30,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
  *     \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;
@@ -37,59 +38,72 @@ void SIMIX_create_environment(const char *file)
   char *workstation_model_name;
   int workstation_id = -1;
 
-  simix_config_init(); /* make sure that our configuration set is created */
-  surf_timer_resource_init(file);
+  simix_config_init();		/* make sure that our configuration set is created */
+  surf_timer_model_init(file);
 
   /* which model do you want today? */
-  workstation_model_name = xbt_cfg_get_string (_simix_cfg_set, "workstation_model");
+  workstation_model_name =
+      xbt_cfg_get_string(_simix_cfg_set, "workstation_model");
 
   DEBUG1("Model : %s", workstation_model_name);
-  workstation_id = find_resource_description(surf_workstation_resource_description,
-					     surf_workstation_resource_description_size,
-					     workstation_model_name);
-  if(!strcmp(workstation_model_name,"compound")) {
+  workstation_id =
+      find_model_description(surf_workstation_model_description,
+				surf_workstation_model_description_size,
+				workstation_model_name);
+  if (!strcmp(workstation_model_name, "compound")) {
     xbt_ex_t e;
     char *network_model_name = NULL;
     char *cpu_model_name = NULL;
     int network_id = -1;
     int cpu_id = -1;
 
-    TRY {                         
-      cpu_model_name = xbt_cfg_get_string (_simix_cfg_set, "cpu_model");
-    } CATCH(e) {                  
+    TRY {
+      cpu_model_name = xbt_cfg_get_string(_simix_cfg_set, "cpu_model");
+    } CATCH(e) {
       if (e.category == bound_error) {
-	xbt_assert0(0,"Set a cpu model to use with the 'compound' workstation model");
-	xbt_ex_free(e);           
-      } else {                    
-	RETHROW;                  
+	xbt_assert0(0,
+		    "Set a cpu model to use with the 'compound' workstation model");
+	xbt_ex_free(e);
+      } else {
+	RETHROW;
       }
     }
 
-    TRY {                         
-      network_model_name=xbt_cfg_get_string (_simix_cfg_set, "network_model");
-    } CATCH(e) {                  
+    TRY {
+      network_model_name =
+	  xbt_cfg_get_string(_simix_cfg_set, "network_model");
+    }
+    CATCH(e) {
       if (e.category == bound_error) {
-	xbt_assert0(0,"Set a network model to use with the 'compound' workstation model");
-	xbt_ex_free(e);           
-      } else {                    
-	RETHROW;                  
+	xbt_assert0(0,
+		    "Set a network model to use with the 'compound' workstation model");
+	xbt_ex_free(e);
+      } else {
+	RETHROW;
       }
     }
 
-    network_id = find_resource_description(surf_network_resource_description,
-					   surf_network_resource_description_size,
-					   network_model_name);
-    cpu_id = find_resource_description(surf_cpu_resource_description,
-				       surf_cpu_resource_description_size,
-				       cpu_model_name);
+    network_id =
+	find_model_description(surf_network_model_description,
+				  surf_network_model_description_size,
+				  network_model_name);
+    cpu_id =
+	find_model_description(surf_cpu_model_description,
+				  surf_cpu_model_description_size,
+				  cpu_model_name);
+
+    surf_cpu_model_description[cpu_id].model_init(file);
+    surf_network_model_description[network_id].model_init(file);
 
-    surf_cpu_resource_description[cpu_id].resource_init(file);
-    surf_network_resource_description[network_id].resource_init(file);
   }
 
-  surf_workstation_resource_description[workstation_id].resource_init(file);
+  surf_workstation_model_description[workstation_id].
+      model_init(file);
 
-  _simix_init_status = 2; /* inited; don't change settings now */
+  /* Parse the platform file */
+  parse_platform_file(file);
+
+  _simix_init_status = 2;	/* inited; don't change settings now */
 
   xbt_dict_foreach(workstation_set, cursor, name, workstation) {
     __SIMIX_host_create(name, workstation, NULL);
@@ -97,4 +111,3 @@ void SIMIX_create_environment(const char *file)
 
   return;
 }
-