#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);
+ double start, end;
- /* which model do you want today? */
- workstation_model_name = xbt_cfg_get_string (_simix_cfg_set, "surf_workstation_model");
+ surf_config_models_setup(file);
+ parse_platform_file(file);
+ surf_config_models_create_elms();
+ start = xbt_os_time();
- 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)");
- }
- _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;
}
-
