X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d20f024dba9ff1e9c8822237caaf963b9e913889..17c819afc4ceda4000eec137c8fee35168253b4d:/src/kernel/activity/SynchroIo.cpp diff --git a/src/kernel/activity/SynchroIo.cpp b/src/kernel/activity/SynchroIo.cpp index 65ac052ee2..3d861d5be1 100644 --- a/src/kernel/activity/SynchroIo.cpp +++ b/src/kernel/activity/SynchroIo.cpp @@ -1,11 +1,11 @@ -/* Copyright (c) 2007-2017. 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.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,22 +23,22 @@ void simgrid::kernel::activity::IoImpl::post() { 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: + switch (surf_io->get_state()) { + case simgrid::kernel::resource::Action::State::failed: state = SIMIX_FAILED; break; - case simgrid::surf::Action::State::done: + case simgrid::kernel::resource::Action::State::done: state = SIMIX_DONE; break; default: