X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bea6786798593b78e0d62a2308eacad3284d4537..cf56a22da60094d8e7f14b1457526dc194d40226:/src/simix/smx_environment.c diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c index eed850b36b..eb7782f505 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" +#include "xbt/xbt_os_time.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix, "Logging specific to SIMIX (environment)"); @@ -32,11 +33,13 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix, */ void SIMIX_create_environment(const char *file) { + int parsed = 0; 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); @@ -95,13 +98,23 @@ void SIMIX_create_environment(const char *file) surf_cpu_model_description[cpu_id].model_init(file); surf_network_model_description[network_id].model_init(file); + start = xbt_os_time(); + parse_platform_file(file); + end = xbt_os_time(); + DEBUG1("PARSE TIME: %lg", (end-start)); + parsed = 1; } surf_workstation_model_description[workstation_id]. model_init(file); - /* Parse the platform file */ - parse_platform_file(file); + if (!parsed) { + double e ; + double s = xbt_os_time(); + parse_platform_file(file); + e = xbt_os_time(); + DEBUG1("PARSE TIME: %lg", (e-s)); + } _simix_init_status = 2; /* inited; don't change settings now */