#include "mc/mc.h"
#include "src/mc/mc_protocol.h"
-#include "src/simix/Synchro.h"
-#include "src/simix/SynchroIo.hpp"
-#include "src/simix/SynchroComm.hpp"
-#include "src/simix/SynchroRaw.hpp"
-#include "src/simix/SynchroSleep.hpp"
-#include "src/simix/SynchroExec.hpp"
+#include "src/kernel/activity/Synchro.h"
+#include "src/kernel/activity/SynchroIo.hpp"
+#include "src/kernel/activity/SynchroComm.hpp"
+#include "src/kernel/activity/SynchroRaw.hpp"
+#include "src/kernel/activity/SynchroSleep.hpp"
+#include "src/kernel/activity/SynchroExec.hpp"
#if HAVE_MC
#include "src/mc/mc_request.h"
case SIMCALL_COMM_WAIT:
{
/* FIXME: check also that src and dst processes are not suspended */
- simgrid::simix::Comm *act = static_cast<simgrid::simix::Comm*>(simcall_comm_wait__get__comm(req));
+ simgrid::kernel::activity::Comm *act =
+ static_cast<simgrid::kernel::activity::Comm*>(simcall_comm_wait__get__comm(req));
#if HAVE_MC
// Fetch from MCed memory:
// HACK, type puning
- simgrid::mc::Remote<simgrid::simix::Comm> temp_comm;
+ simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
if (mc_model_checker != nullptr) {
mc_model_checker->process().read(temp_comm, remote(act));
- act = static_cast<simgrid::simix::Comm*>(temp_comm.getBuffer());
+ act = static_cast<simgrid::kernel::activity::Comm*>(temp_comm.getBuffer());
}
#endif
case SIMCALL_COMM_WAITANY: {
xbt_dynar_t comms;
- simgrid::simix::Comm *act = static_cast<simgrid::simix::Comm*>(simcall_comm_wait__get__comm(req));
+ simgrid::kernel::activity::Comm *act =
+ static_cast<simgrid::kernel::activity::Comm*>(simcall_comm_wait__get__comm(req));
#if HAVE_MC
s_xbt_dynar_t comms_buffer;
#if HAVE_MC
// Fetch act from MCed memory:
// HACK, type puning
- simgrid::mc::Remote<simgrid::simix::Comm> temp_comm;
+ simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
if (mc_model_checker != nullptr) {
memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
mc_model_checker->process().read(temp_comm, remote(act));
- act = static_cast<simgrid::simix::Comm*>(temp_comm.getBuffer());
+ act = static_cast<simgrid::kernel::activity::Comm*>(temp_comm.getBuffer());
}
else
#endif
- act = xbt_dynar_get_as(comms, index, simgrid::simix::Comm*);
+ act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::Comm*);
if (act->src_proc && act->dst_proc)
return true;
}