X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3f38d568f0b8155a643e15a3171177060ee15c3c..61ab0b23d55ea10365ba11d22b8c11b39cbf16e9:/src/simix/smx_io.cpp diff --git a/src/simix/smx_io.cpp b/src/simix/smx_io.cpp index 1f35bf2e57..e5a998c257 100644 --- a/src/simix/smx_io.cpp +++ b/src/simix/smx_io.cpp @@ -1,4 +1,4 @@ -/* 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. */ @@ -9,13 +9,12 @@ #include "simgrid/s4u/Host.hpp" #include "simgrid/s4u/Storage.hpp" -#include "src/surf/FileImpl.hpp" +#include "smx_private.hpp" +#include "src/simix/smx_io_private.hpp" #include "src/surf/HostImpl.hpp" #include "src/surf/StorageImpl.hpp" -#include "surf/surf.hpp" - -#include "smx_private.hpp" #include "src/surf/surf_interface.hpp" +#include "surf/surf.hpp" #include "src/kernel/activity/SynchroIo.hpp" @@ -33,7 +32,7 @@ smx_activity_t SIMIX_storage_read(surf_storage_t st, sg_size_t size) simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); synchro->surf_io = st->read(size); - synchro->surf_io->setData(synchro); + synchro->surf_io->set_data(synchro); XBT_DEBUG("Create io synchro %p", synchro); return synchro; @@ -50,7 +49,7 @@ smx_activity_t SIMIX_storage_write(surf_storage_t st, sg_size_t size) { simgrid::kernel::activity::IoImpl* synchro = new simgrid::kernel::activity::IoImpl(); synchro->surf_io = st->write(size); - synchro->surf_io->setData(synchro); + synchro->surf_io->set_data(synchro); XBT_DEBUG("Create io synchro %p", synchro); return synchro;