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
Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid
[simgrid.git]
/
src
/
simdag
/
sd_global.cpp
diff --git
a/src/simdag/sd_global.cpp
b/src/simdag/sd_global.cpp
index
2ec7169
..
2b7e904
100644
(file)
--- a/
src/simdag/sd_global.cpp
+++ b/
src/simdag/sd_global.cpp
@@
-9,6
+9,7
@@
#include "simgrid/host.h"
#include "src/simdag/simdag_private.h"
#include "src/surf/surf_interface.hpp"
#include "simgrid/host.h"
#include "src/simdag/simdag_private.h"
#include "src/surf/surf_interface.hpp"
+#include "simgrid/s4u/engine.hpp"
#ifdef HAVE_JEDULE
#include "simgrid/jedule/jedule_sd_binding.h"
#ifdef HAVE_JEDULE
#include "simgrid/jedule/jedule_sd_binding.h"
@@
-90,7
+91,7
@@
void SD_config(const char *key, const char *value){
*/
void SD_create_environment(const char *platform_file)
{
*/
void SD_create_environment(const char *platform_file)
{
-
parse_platform_file
(platform_file);
+
simgrid::s4u::Engine::instance()->loadPlatform
(platform_file);
XBT_DEBUG("Workstation number: %zu, link number: %d", sg_host_count(), sg_link_count());
#ifdef HAVE_JEDULE
XBT_DEBUG("Workstation number: %zu, link number: %d", sg_host_count(), sg_link_count());
#ifdef HAVE_JEDULE