X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f38d568f0b8155a643e15a3171177060ee15c3c..88fad0aaff9eb463f048bfdfe4ad6218aba44ddb:/src/kernel/activity/SynchroIo.cpp diff --git a/src/kernel/activity/SynchroIo.cpp b/src/kernel/activity/SynchroIo.cpp index 9001cf9c57..e0158cf8e9 100644 --- a/src/kernel/activity/SynchroIo.cpp +++ b/src/kernel/activity/SynchroIo.cpp @@ -1,9 +1,10 @@ -/* 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 "simgrid/kernel/resource/Action.hpp" #include "src/simix/smx_private.hpp" #include "src/surf/surf_interface.hpp" @@ -24,21 +25,21 @@ void simgrid::kernel::activity::IoImpl::post() for (smx_simcall_t const& simcall : simcalls) { switch (simcall->call) { case SIMCALL_STORAGE_WRITE: - simcall_storage_write__set__result(simcall, surf_io->getCost()); + simcall_storage_write__set__result(simcall, surf_io->get_cost()); break; case SIMCALL_STORAGE_READ: - simcall_storage_read__set__result(simcall, surf_io->getCost()); + 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: