X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4a6b0a991a67e6f2f67c03fed43529e078da7115..872d65264714799b25eb231609c3f05bae3d03dc:/src/simdag/sd_global.cpp

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 426db94799..20476dcd06 100644
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -9,12 +9,9 @@
 #include "simgrid/host.h"
 #include "src/simdag/simdag_private.h"
 #include "src/surf/surf_interface.hpp"
+#include "simgrid/s4u/engine.hpp"
 
-#include "xbt/dynar.h"
-#include "xbt/log.h"
-#include "xbt/sysdep.h"
-
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
 #include "simgrid/jedule/jedule_sd_binding.h"
 #endif
 
@@ -50,10 +47,9 @@ void SD_init(int *argc, char **argv)
 
   surf_init(argc, argv);
 
-  xbt_cfg_setdefault_string(_sg_cfg_set, "host/model",
-                            "ptask_L07");
+  xbt_cfg_setdefault_string("host/model", "ptask_L07");
 
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
   jedule_sd_init();
 #endif
 
@@ -73,7 +69,7 @@ void SD_init(int *argc, char **argv)
  */
 void SD_config(const char *key, const char *value){
   xbt_assert(sd_global,"ERROR: Please call SD_init() before using SD_config()");
-  xbt_cfg_set_as_string(_sg_cfg_set, key, value);
+  xbt_cfg_set_as_string(key, value);
 }
 
 /**
@@ -95,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...");
@@ -123,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;
@@ -143,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;
@@ -222,7 +217,7 @@ xbt_dynar_t SD_simulate(double how_long) {
       /* let's see which tasks have just failed */
       while ((action = surf_model_extract_failed_action_set(model))) {
         task = (SD_task_t) action->getData();
-        task->start_time = surf_action_get_start_time(task->surf_action);
+        task->start_time = task->surf_action->getStartTime();
         task->finish_time = surf_get_clock();
         XBT_VERB("Task '%s' failed", SD_task_get_name(task));
         SD_task_set_state(task, SD_FAILED);
@@ -268,9 +263,8 @@ double SD_get_clock(void) {
 void SD_exit(void)
 {
   TRACE_surf_resource_utilization_release();
-  TRACE_end();
 
-#ifdef HAVE_JEDULE
+#if HAVE_JEDULE
   jedule_sd_cleanup();
   jedule_sd_exit();
 #endif
@@ -282,6 +276,4 @@ void SD_exit(void)
   xbt_dynar_free_container(&(sd_global->return_set));
   xbt_free(sd_global);
   sd_global = NULL;
-
-  surf_exit();
 }