more cleanups

diff --git a/src/include/surf/surf.h b/src/include/surf/surf.h
index fa9a396..f2447eb 100644 (file)
--- a/src/include/surf/surf.h
+++ b/src/include/surf/surf.h
@@ -155,14 +155,6 @@ XBT_PUBLIC(void) surf_cpu_action_set_bound(surf_action_t action, double bound);
  */
 XBT_PUBLIC(double) surf_network_action_get_latency_limited(surf_action_t action);
 
-/**
- * @brief Get the file associated to a storage action
- *
- * @param action The surf storage action
- * @return The file associated to a storage action
- */
-XBT_PUBLIC(surf_file_t) surf_storage_action_get_file(surf_action_t action);
-
 /** @} */
 
 /**************************************/

diff --git a/src/kernel/activity/SynchroIo.cpp b/src/kernel/activity/SynchroIo.cpp
index 30e5cdd..cccfbce 100644 (file)
--- a/src/kernel/activity/SynchroIo.cpp
+++ b/src/kernel/activity/SynchroIo.cpp
@@ -6,6 +6,7 @@
 #include "src/kernel/activity/SynchroIo.hpp"
 #include "src/simix/smx_private.h"
 #include "src/surf/FileImpl.hpp"
+#include "src/surf/StorageImpl.hpp"
 #include "src/surf/surf_interface.hpp"
 
 void simgrid::kernel::activity::IoImpl::suspend()
@@ -25,7 +26,7 @@ void simgrid::kernel::activity::IoImpl::post()
   for (smx_simcall_t simcall : simcalls) {
     switch (simcall->call) {
     case SIMCALL_FILE_OPEN: {
-      surf_file_t tmp = surf_storage_action_get_file(surf_io);
+      surf_file_t tmp = static_cast<simgrid::surf::StorageAction*>(surf_io)->file_;
       simcall_file_open__set__result(simcall, tmp);
       break;
     }

diff --git a/src/surf/surf_c_bindings.cpp b/src/surf/surf_c_bindings.cpp
index 9ca5f1d..97e7964 100644 (file)
--- a/src/surf/surf_c_bindings.cpp
+++ b/src/surf/surf_c_bindings.cpp
@@ -168,7 +168,3 @@ int surf_model_running_action_set_size(surf_model_t model){
 void surf_cpu_action_set_bound(surf_action_t action, double bound) {
   static_cast<simgrid::surf::CpuAction*>(action)->setBound(bound);
 }
-
-surf_file_t surf_storage_action_get_file(surf_action_t action){
-  return static_cast<simgrid::surf::StorageAction*>(action)->file_;
-}