X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6e1bfe4b91bd83b1bf4f09b20d5781c3aa4f7562..89047acf6125582321f8e86f9765b0f57e350e2c:/src/kernel/activity/SynchroIo.cpp

diff --git a/src/kernel/activity/SynchroIo.cpp b/src/kernel/activity/SynchroIo.cpp
index e954fae5a6..130354d48e 100644
--- a/src/kernel/activity/SynchroIo.cpp
+++ b/src/kernel/activity/SynchroIo.cpp
@@ -1,13 +1,11 @@
-/* Copyright (c) 2007-2016. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2007-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 "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"
+#include "simgrid/kernel/resource/Action.hpp"
+#include "src/simix/smx_io_private.hpp"
 
 void simgrid::kernel::activity::IoImpl::suspend()
 {
@@ -23,31 +21,26 @@ void simgrid::kernel::activity::IoImpl::resume()
 
 void simgrid::kernel::activity::IoImpl::post()
 {
-  for (smx_simcall_t simcall : simcalls) {
+  for (smx_simcall_t const& simcall : simcalls_) {
     switch (simcall->call) {
-    case SIMCALL_FILE_WRITE:
-      simcall_file_write__set__result(simcall, surf_io->getCost());
-      break;
-
-    case SIMCALL_FILE_READ:
-      simcall_file_read__set__result(simcall, surf_io->getCost());
-      break;
-
-    default:
-      break;
+      case SIMCALL_STORAGE_WRITE:
+        simcall_storage_write__set__result(simcall, surf_io->get_cost());
+        break;
+      case SIMCALL_STORAGE_READ:
+        simcall_storage_read__set__result(simcall, surf_io->get_cost());
+        break;
+      default:
+        break;
     }
   }
 
-  switch (surf_io->getState()) {
-
-    case simgrid::surf::Action::State::failed:
-      state = SIMIX_FAILED;
+  switch (surf_io->get_state()) {
+    case simgrid::kernel::resource::Action::State::failed:
+      state_ = SIMIX_FAILED;
       break;
-
-    case simgrid::surf::Action::State::done:
-      state = SIMIX_DONE;
+    case simgrid::kernel::resource::Action::State::done:
+      state_ = SIMIX_DONE;
       break;
-
     default:
       THROW_IMPOSSIBLE;
       break;