namespace simgrid {
namespace mc {
-void wait_for_requests(void)
+void wait_for_requests()
{
#if SIMGRID_HAVE_MC
xbt_assert(mc_model_checker == nullptr);
// Called from both MCer and MCed:
bool request_is_enabled(smx_simcall_t req)
{
- unsigned int index = 0;
// TODO, add support for the subtypes?
switch (req->call) {
case SIMCALL_COMM_WAIT:
{
/* FIXME: check also that src and dst processes are not suspended */
- simgrid::kernel::activity::Comm *act =
- static_cast<simgrid::kernel::activity::Comm*>(simcall_comm_wait__get__comm(req));
+ simgrid::kernel::activity::CommImpl* act =
+ static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
#if SIMGRID_HAVE_MC
// Fetch from MCed memory:
// HACK, type puning
if (mc_model_checker != nullptr) {
- simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
+ simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> temp_comm;
mc_model_checker->process().read(temp_comm, remote(act));
- act = static_cast<simgrid::kernel::activity::Comm*>(temp_comm.getBuffer());
+ act = static_cast<simgrid::kernel::activity::CommImpl*>(temp_comm.getBuffer());
}
#endif
- if (simcall_comm_wait__get__timeout(req) >= 0) {
- /* If it has a timeout it will be always be enabled, because even if the
- * communication is not ready, it can timeout and won't block. */
+ if (act->src_timeout || act->dst_timeout) {
+ /* If it has a timeout it will be always be enabled (regardless of who declared the timeout),
+ * because even if the communication is not ready, it can timeout and won't block. */
if (_sg_mc_timeout == 1)
return true;
}
case SIMCALL_COMM_WAITANY: {
xbt_dynar_t comms;
- simgrid::kernel::activity::Comm *act =
- static_cast<simgrid::kernel::activity::Comm*>(simcall_comm_wait__get__comm(req));
+ simgrid::kernel::activity::CommImpl* act =
+ static_cast<simgrid::kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
#if SIMGRID_HAVE_MC
s_xbt_dynar_t comms_buffer;
comms = simcall_comm_waitany__get__comms(req);
#endif
- for (index = 0; index < comms->used; ++index) {
+ for (unsigned int index = 0; index < comms->used; ++index) {
#if SIMGRID_HAVE_MC
// Fetch act from MCed memory:
// HACK, type puning
- simgrid::mc::Remote<simgrid::kernel::activity::Comm> temp_comm;
+ simgrid::mc::Remote<simgrid::kernel::activity::CommImpl> 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::kernel::activity::Comm*>(temp_comm.getBuffer());
+ act = static_cast<simgrid::kernel::activity::CommImpl*>(temp_comm.getBuffer());
}
else
#endif
- act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::Comm*);
+ act = xbt_dynar_get_as(comms, index, simgrid::kernel::activity::CommImpl*);
if (act->src_proc && act->dst_proc)
return true;
}
case SIMCALL_MUTEX_LOCK: {
smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
#if SIMGRID_HAVE_MC
- simgrid::mc::Remote<simgrid::simix::Mutex> temp_mutex;
+ simgrid::mc::Remote<simgrid::simix::MutexImpl> temp_mutex;
if (mc_model_checker != nullptr) {
mc_model_checker->process().read(temp_mutex.getBuffer(), remote(mutex));
mutex = temp_mutex.getBuffer();