X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/be5b1909ae03fa305b6aff11ef16e19de82966b5..c55f7a29931df2567c0830e45aa889040e54927c:/src/simdag/sd_global.cpp diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp index 2ec71693af..8ff96f877b 100644 --- a/src/simdag/sd_global.cpp +++ b/src/simdag/sd_global.cpp @@ -9,8 +9,9 @@ #include "simgrid/host.h" #include "src/simdag/simdag_private.h" #include "src/surf/surf_interface.hpp" +#include "simgrid/s4u/engine.hpp" -#ifdef HAVE_JEDULE +#if HAVE_JEDULE #include "simgrid/jedule/jedule_sd_binding.h" #endif @@ -48,7 +49,7 @@ void SD_init(int *argc, char **argv) xbt_cfg_setdefault_string(_sg_cfg_set, "host/model", "ptask_L07"); -#ifdef HAVE_JEDULE +#if HAVE_JEDULE jedule_sd_init(); #endif @@ -90,10 +91,10 @@ void SD_config(const char *key, const char *value){ */ 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 +#if HAVE_JEDULE jedule_setup_platform(); #endif XBT_VERB("Starting simulation..."); @@ -264,7 +265,7 @@ void SD_exit(void) { TRACE_surf_resource_utilization_release(); -#ifdef HAVE_JEDULE +#if HAVE_JEDULE jedule_sd_cleanup(); jedule_sd_exit(); #endif