prefer automatic mem handling (std::vector<>* becomes std::vector<>)

[simgrid.git] / src / simdag / sd_global.cpp

diff --git a/src/simdag/sd_global.cpp b/src/simdag/sd_global.cpp
index 3784c9b..09236e0 100644 (file)
--- 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.hpp"
-#include "src/include/instr/instr_interface.hpp"
 #include "src/surf/surf_interface.hpp"
 
 XBT_LOG_NEW_CATEGORY(sd, "Logging specific to SimDag");
@@ -56,8 +56,8 @@ std::set<SD_task_t>* simulate(double how_long){
       total_time += elapsed_time;
 
     /* let's see which tasks are done */
-    for (auto const& model : *all_existing_models) {
-      simgrid::kernel::resource::Action* action = surf_model_extract_done_action_set(model);
+    for (auto const& model : all_existing_models) {
+      simgrid::kernel::resource::Action* action = model->extract_done_action();
       while (action != nullptr && action->get_data() != nullptr) {
         SD_task_t task = static_cast<SD_task_t>(action->get_data());
         XBT_VERB("Task '%s' done", SD_task_get_name(task));
@@ -103,17 +103,17 @@ std::set<SD_task_t>* simulate(double how_long){
             SD_task_run(output);
         }
         task->outputs->clear();
-        action = surf_model_extract_done_action_set(model);
+        action = model->extract_done_action();
       }
 
       /* let's see which tasks have just failed */
-      action = surf_model_extract_failed_action_set(model);
+      action = model->extract_failed_action();
       while (action != nullptr) {
         SD_task_t task = static_cast<SD_task_t>(action->get_data());
         XBT_VERB("Task '%s' failed", SD_task_get_name(task));
         SD_task_set_state(task, SD_FAILED);
         sd_global->return_set->insert(task);
-        action = surf_model_extract_failed_action_set(model);
+        action = model->extract_failed_action();
       }
     }
   }
@@ -161,7 +161,7 @@ void SD_init_nocheck(int *argc, char **argv)
 
   surf_init(argc, argv);
 
-  xbt_cfg_setdefault_string("host/model", "ptask_L07");
+  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) {
@@ -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