From 028bb9b66150a77c878a2db7f9fc35b149b1ae16 Mon Sep 17 00:00:00 2001 From: quasar Date: Fri, 9 Nov 2007 09:53:47 +0000 Subject: [PATCH] fixed bug for compound models git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5012 48e7efb5-ca39-0410-a469-dd3cf9ba447f --- src/simix/smx_environment.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/simix/smx_environment.c b/src/simix/smx_environment.c index eed850b36b..048988723e 100644 --- a/src/simix/smx_environment.c +++ b/src/simix/smx_environment.c @@ -32,6 +32,7 @@ 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; @@ -95,13 +96,16 @@ 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); + parse_platform_file(file); + parsed = 1; } + + surf_workstation_model_description[workstation_id]. model_init(file); - /* Parse the platform file */ - parse_platform_file(file); + if (!parsed) parse_platform_file(file); _simix_init_status = 2; /* inited; don't change settings now */ -- 2.20.1