Logo AND Algorithmique Numérique Distribuée

Public GIT Repository
C++ify some forgotten part of surf
[simgrid.git] / src / simdag / sd_global.cpp
index 7a2b1a9..193b5f4 100644 (file)
@@ -57,7 +57,7 @@ std::set<SD_task_t>* simulate(double how_long){
 
     /* 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);
+      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();
       }
     }
   }