X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f3507930c130404d05f982cf9fe960fb95f7eb4b..f3ba71e33e73c61ca467a37dda2bc3b9d5f9ed1b:/src/simix/smx_environment.c diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c index 6ca21aec1a..321e84d8c4 100644 --- a/src/simix/smx_environment.c +++ b/src/simix/smx_environment.c @@ -39,6 +39,7 @@ void SIMIX_create_environment(const char *file) 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); @@ -97,22 +98,25 @@ 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); - double start = xbt_os_time(); + start = xbt_os_time(); parse_platform_file(file); - double end = xbt_os_time(); + end = xbt_os_time(); DEBUG1("PARSE TIME: %lg", (end-start)); parsed = 1; } - - surf_workstation_model_description[workstation_id]. model_init(file); - double s = xbt_os_time(); - if (!parsed) parse_platform_file(file); - double e = xbt_os_time(); - INFO1("PARSE TIME: %lg", (e-s)); + if (!parsed) { + double e ; + double s = xbt_os_time(); + parse_platform_file(file); + if (surf_workstation_model_description[workstation_id].create_ws != NULL) + surf_workstation_model_description[workstation_id].create_ws(); + e = xbt_os_time(); + DEBUG1("PARSE TIME: %lg", (e-s)); + } _simix_init_status = 2; /* inited; don't change settings now */