X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/45ae0195c6ad8232415288c5da07b4bdc23a31b4..1e83888c1aed0b9146b5ae78ad474f374d28a769:/src/simix/libsmx.cpp diff --git a/src/simix/libsmx.cpp b/src/simix/libsmx.cpp index ccf2f8c9c9..a3aad4a842 100644 --- a/src/simix/libsmx.cpp +++ b/src/simix/libsmx.cpp @@ -15,21 +15,18 @@ #include -#include - -#include -#include - #include "mc/mc.h" +#include "simgrid/s4u/VirtualMachine.hpp" +#include "simgrid/simix.hpp" +#include "simgrid/simix/blocking_simcall.hpp" #include "smx_private.h" -#include "src/kernel/activity/SynchroComm.hpp" +#include "src/kernel/activity/CommImpl.hpp" #include "src/mc/mc_forward.hpp" #include "src/mc/mc_replay.h" #include "src/plugins/vm/VirtualMachineImpl.hpp" #include "src/simix/smx_host_private.h" #include "xbt/ex.h" - -#include +#include "xbt/functional.hpp" XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix); @@ -461,8 +458,8 @@ smx_activity_t simcall_comm_iprobe(smx_mailbox_t mbox, int type, int src, int ta */ void simcall_comm_cancel(smx_activity_t synchro) { - simgrid::simix::kernelImmediate([synchro]{ - simgrid::kernel::activity::Comm *comm = static_cast(synchro); + simgrid::simix::kernelImmediate([synchro] { + simgrid::kernel::activity::CommImpl* comm = static_cast(synchro); comm->cancel(); }); }