Merge branch 'master' of 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..fe5e779 100644 (file)
--- 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...");
@@ -118,7 +119,6 @@ void SD_create_environment(const char *platform_file)
 xbt_dynar_t SD_simulate(double how_long) {
   /* we stop the simulation when total_time >= how_long */
   double total_time = 0.0;
-  double elapsed_time = 0.0;
   SD_task_t task, dst;
   SD_dependency_t dependency;
   surf_action_t action;
@@ -138,7 +138,7 @@ xbt_dynar_t SD_simulate(double how_long) {
   }
 
   /* main loop */
-  elapsed_time = 0.0;
+  double elapsed_time = 0.0;
   while (elapsed_time >= 0.0 && (how_long < 0.0 || 0.00001 < (how_long -total_time)) &&
          !sd_global->watch_point_reached) {
     surf_model_t model = NULL;
@@ -264,7 +264,7 @@ void SD_exit(void)
 {
   TRACE_surf_resource_utilization_release();
 
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
   jedule_sd_cleanup();
   jedule_sd_exit();
 #endif