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

diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c
index 507967e9db..6c461220ba 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. */
@@ -10,23 +8,25 @@
 #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)");
 
 /********************************* 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
  *
@@ -36,80 +36,27 @@ void SIMIX_create_environment(const char *file)
   xbt_dict_cursor_t cursor = NULL;
   char *name = NULL;
   void *workstation = NULL;
-  char *workstation_model_name;
-  int workstation_id = -1;
-  double start, end;
-
-  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");
-
-  DEBUG1("Model : %s", workstation_model_name);
-  workstation_id =
-    find_model_description(surf_workstation_model_description,
-                           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) {
-      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;
-      }
-    }
-
-    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;
-      }
-    }
 
-    network_id =
-      find_model_description(surf_network_model_description,
-                             network_model_name);
-    cpu_id =
-      find_model_description(surf_cpu_model_description, cpu_model_name);
-
-    surf_cpu_model_description[cpu_id].model_init(file);
-    surf_network_model_description[network_id].model_init(file);
+  double start, end;
 
+  platform_filename = bprintf("%s",file);
 
-  }
-  surf_workstation_model_description[workstation_id].model_init(file);
+  // Reset callbacks
+  surf_parse_reset_callbacks();
+  // Add config callbacks
+  surf_parse_add_callback_config();
 
-  start = xbt_os_time();
   parse_platform_file(file);
+  surf_config_models_create_elms();
 
-  if (surf_workstation_model_description[workstation_id].create_ws != NULL)
-    surf_workstation_model_description[workstation_id].create_ws();
+  start = xbt_os_time();
+  /* FIXME: what time are we measuring ??? */
   end = xbt_os_time();
   DEBUG1("PARSE TIME: %lg", (end - start));
 
-  _simix_init_status = 2;       /* inited; don't change settings now */
-
-  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;
+  surf_presolve();
 }