attempt to fully trace ptasks

[simgrid.git] / src / surf / surf_c_bindings.cpp

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 83b24b3..62bf2e2 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -4,8 +4,10 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/s4u/Engine.hpp"
+#include "src/include/surf/surf.hpp"
 #include "src/instr/instr_private.hpp"
 #include "src/plugins/vm/VirtualMachineImpl.hpp"
+
 #include <algorithm>
 
 XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(surf_kernel);
@@ -35,7 +37,7 @@ void surf_presolve()
   }
 
   XBT_DEBUG ("Set every models in the right state by updating them to 0.");
-  for (auto const& model : *all_existing_models)
+  for (auto const& model : all_existing_models)
     model->update_actions_state(NOW, 0.0);
 }
 
@@ -66,7 +68,7 @@ double surf_solve(double max_date)
       time_delta = next_event_virt;
   }
 
-  for (auto const& model : *all_existing_models) {
+  for (auto const& model : all_existing_models) {
     if (model != surf_host_model && model != surf_vm_model && model != surf_network_model &&
         model != surf_storage_model) {
       double next_event_model = model->next_occuring_event(NOW);
@@ -137,7 +139,7 @@ double surf_solve(double max_date)
   NOW = NOW + time_delta;
 
   // Inform the models of the date change
-  for (auto const& model : *all_existing_models)
+  for (auto const& model : all_existing_models)
     model->update_actions_state(NOW, time_delta);
 
   simgrid::s4u::on_time_advance(time_delta);
@@ -146,35 +148,3 @@ double surf_solve(double max_date)
 
   return time_delta;
 }
-
-/*********
- * MODEL *
- *********/
-static simgrid::kernel::resource::Action* ActionListExtract(simgrid::kernel::resource::Action::StateSet* list)
-{
-  if (list->empty())
-    return nullptr;
-  simgrid::kernel::resource::Action* res = &list->front();
-  list->pop_front();
-  return res;
-}
-
-simgrid::kernel::resource::Action* surf_model_extract_done_action_set(simgrid::kernel::resource::Model* model)
-{
-  return ActionListExtract(model->get_finished_action_set());
-}
-
-simgrid::kernel::resource::Action* surf_model_extract_failed_action_set(simgrid::kernel::resource::Model* model)
-{
-  return ActionListExtract(model->get_failed_action_set());
-}
-
-int surf_model_running_action_set_size(simgrid::kernel::resource::Model* model)
-{
-  return model->get_started_action_set()->size();
-}
-
-void surf_cpu_action_set_bound(simgrid::kernel::resource::Action* action, double bound)
-{
-  static_cast<simgrid::surf::CpuAction*>(action)->set_bound(bound);
-}