Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

[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 9eab503..07e3030 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -1,11 +1,13 @@
-/* Copyright (c) 2013-2017. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2013-2018. The SimGrid Team. All rights reserved.          */
 
 /* This program is free software; you can redistribute it and/or modify it
  * 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);
@@ -140,7 +142,7 @@ double surf_solve(double max_date)
   for (auto const& model : *all_existing_models)
     model->update_actions_state(NOW, time_delta);
 
-  simgrid::s4u::onTimeAdvance(time_delta);
+  simgrid::s4u::on_time_advance(time_delta);
 
   TRACE_paje_dump_buffer(false);
 
@@ -161,7 +163,7 @@ static simgrid::kernel::resource::Action* ActionListExtract(simgrid::kernel::res
 
 simgrid::kernel::resource::Action* surf_model_extract_done_action_set(simgrid::kernel::resource::Model* model)
 {
-  return ActionListExtract(model->get_done_action_set());
+  return ActionListExtract(model->get_finished_action_set());
 }
 
 simgrid::kernel::resource::Action* surf_model_extract_failed_action_set(simgrid::kernel::resource::Model* model)
@@ -171,7 +173,7 @@ simgrid::kernel::resource::Action* surf_model_extract_failed_action_set(simgrid:
 
 int surf_model_running_action_set_size(simgrid::kernel::resource::Model* model)
 {
-  return model->get_running_action_set()->size();
+  return model->get_started_action_set()->size();
 }
 
 void surf_cpu_action_set_bound(simgrid::kernel::resource::Action* action, double bound)