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
Correctly set callbacks for tags.
[simgrid.git]
/
src
/
simdag
/
sd_global.c
diff --git
a/src/simdag/sd_global.c
b/src/simdag/sd_global.c
index
1406696
..
344ec2a
100644
(file)
--- a/
src/simdag/sd_global.c
+++ b/
src/simdag/sd_global.c
@@
-13,6
+13,7
@@
#include "xbt/str.h"
#include "xbt/config.h"
#include "instr/instr_private.h"
#include "xbt/str.h"
#include "xbt/config.h"
#include "instr/instr_private.h"
+#include "surf/surfxml_parse.h"
#ifdef HAVE_LUA
#include <lua.h>
#include <lauxlib.h>
#ifdef HAVE_LUA
#include <lua.h>
#include <lauxlib.h>
@@
-170,13
+171,13
@@
void SD_create_environment(const char *platform_file)
void *surf_workstation = NULL;
void *surf_link = NULL;
void *surf_workstation = NULL;
void *surf_link = NULL;
- //First pass of platform file
- surf_config_add_callback();
- parse_platform_file(platform_file);
+ platform_filename = bprintf("%s",platform_file);
+ // Reset callbacks
+ surf_parse_reset_callbacks();
+ // Add config callbacks
+ surf_parse_add_callback_config();
SD_CHECK_INIT_DONE();
SD_CHECK_INIT_DONE();
- DEBUG0("SD_create_environment");
- surf_config_models_setup(platform_file);
parse_platform_file(platform_file);
surf_config_models_create_elms();
parse_platform_file(platform_file);
surf_config_models_create_elms();