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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 7119d22511..a591570401 100644
--- a/src/simix/smx_environment.c
+++ b/src/simix/smx_environment.c
@@ -1,67 +1,66 @@
-/* 	$Id$	 */
-
-/* Copyright (c) 2007 Arnaud Legrand, Bruno Donnassolo.
-   All rights reserved.                                          */
+/* Copyright (c) 2007-2014. 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)");
+                                "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;
+  double start = 0, end = 0;
+  if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
+    start = xbt_os_time();
+  parse_platform_file(file);
+  if(XBT_LOG_ISENABLED(simix_environment, xbt_log_priority_debug))
+    end = xbt_os_time();
+  XBT_DEBUG("PARSE TIME: %g", (end - start));
 
-  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, "surf_workstation_model");
+void SIMIX_post_create_environment(void) {
 
-  DEBUG1("Model : %s", workstation_model_name);
-  if (!strcmp(workstation_model_name,"KCCFLN05")) {
-    surf_workstation_resource_init_KCCFLN05(file);
-  } else if (!strcmp(workstation_model_name,"KCCFLN05_proportional")) {
-    surf_workstation_resource_init_KCCFLN05_proportional(file);
-  } else if (!strcmp(workstation_model_name,"KCCFLN05_Vegas")) {
-    surf_workstation_resource_init_KCCFLN05_Vegas(file);
-  } else if (!strcmp(workstation_model_name,"KCCFLN05_Reno")) {
-    surf_workstation_resource_init_KCCFLN05_Reno(file);
-  } else if (!strcmp(workstation_model_name,"CLM03")) {
-    surf_workstation_resource_init_CLM03(file);
-  } else {
-    xbt_assert0(0,"The impossible happened (once again)");
+  void **host = 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, host) {
+    if(host[SURF_HOST_LEVEL])
+      SIMIX_host_create(name);
   }
-  _simix_init_status = 2; /* inited; don't change settings now */
 
-  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();
 }
-