A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Implement a dynamic parallel execution mode.
[simgrid.git]
/
src
/
simix
/
smx_environment.c
diff --git
a/src/simix/smx_environment.c
b/src/simix/smx_environment.c
index
dd51dd0
..
6c46122
100644
(file)
--- a/
src/simix/smx_environment.c
+++ b/
src/simix/smx_environment.c
@@
-9,6
+9,7
@@
#include "xbt/log.h"
#include "xbt/xbt_os_time.h"
#include "xbt/config.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)");
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(simix_environment, simix,
"Logging specific to SIMIX (environment)");
@@
-38,16
+39,24
@@
void SIMIX_create_environment(const char *file)
double start, end;
double start, end;
- surf_config_models_setup(file);
+ platform_filename = bprintf("%s",file);
+
+ // Reset callbacks
+ surf_parse_reset_callbacks();
+ // Add config callbacks
+ surf_parse_add_callback_config();
+
parse_platform_file(file);
surf_config_models_create_elms();
parse_platform_file(file);
surf_config_models_create_elms();
- start = xbt_os_time();
+ start = xbt_os_time();
+ /* FIXME: what time are we measuring ??? */
end = xbt_os_time();
DEBUG1("PARSE TIME: %lg", (end - start));
xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
name, workstation) {
end = xbt_os_time();
DEBUG1("PARSE TIME: %lg", (end - start));
xbt_dict_foreach(surf_model_resource_set(surf_workstation_model), cursor,
name, workstation) {
-
__
SIMIX_host_create(name, workstation, NULL);
+ SIMIX_host_create(name, workstation, NULL);
}
}
+ surf_presolve();
}
}