X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6ca0df6f5bb17b5708c11a19846c0e90e25b7889..6ed785970bbb0b94322103726f147dbea26ea48c:/src/simdag/sd_global.cpp

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 1a31386a8d..7a2b1a9348 100644
--- a/src/simdag/sd_global.cpp
+++ b/src/simdag/sd_global.cpp
@@ -5,9 +5,9 @@
 
 #include "simdag_private.hpp"
 #include "simgrid/kernel/resource/Action.hpp"
+#include "simgrid/kernel/resource/Model.hpp"
 #include "simgrid/s4u/Engine.hpp"
-#include "simgrid/sg_config.h"
-#include "src/include/instr/instr_interface.h"
+#include "simgrid/sg_config.hpp"
 #include "src/surf/surf_interface.hpp"
 
 XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
@@ -161,8 +161,8 @@ void SD_init_nocheck(int *argc, char **argv)
 
   surf_init(argc, argv);
 
-  xbt_cfg_setdefault_string("host/model", "ptask_L07");
-  if(xbt_cfg_get_boolean("clean-atexit"))
+  simgrid::config::set_default<std::string>("host/model", "ptask_L07");
+  if (simgrid::config::get_value<bool>("clean-atexit"))
     atexit(SD_exit);
   if (_sg_cfg_exit_asap) {
     exit(0);
@@ -178,7 +178,7 @@ void SD_init_nocheck(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(key, value);
+  simgrid::config::set_as_string(key, value);
 }
 
 /**
@@ -200,7 +200,7 @@ void SD_config(const char *key, const char *value){
  */
 void SD_create_environment(const char *platform_file)
 {
-  simgrid::s4u::Engine::getInstance()->loadPlatform(platform_file);
+  simgrid::s4u::Engine::get_instance()->load_platform(platform_file);
 
   XBT_DEBUG("Host number: %zu, link number: %d", sg_host_count(), sg_link_count());
 #if SIMGRID_HAVE_JEDULE
@@ -248,7 +248,6 @@ double SD_get_clock() {
  */
 void SD_exit()
 {
-  TRACE_end();
 #if SIMGRID_HAVE_JEDULE
   jedule_sd_exit();
 #endif