X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/9e1c4c41d5e7fbdecae863782f410a1d1b0afc00..1610a3a014ca193868cd6ed987728201c15b423c:/src/mc/mc_base.cpp diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp index 299dbdedcd..ff7dbe359e 100644 --- a/src/mc/mc_base.cpp +++ b/src/mc/mc_base.cpp @@ -97,8 +97,8 @@ bool actor_is_enabled(smx_actor_t actor) return true; } /* On the other hand if it hasn't a timeout, check if the comm is ready.*/ - else if (act->detached && act->src_actor_ == nullptr && - act->type == simgrid::kernel::activity::CommImpl::Type::READY) + else if (act->detached() && act->src_actor_ == nullptr && + act->type_ == simgrid::kernel::activity::CommImpl::Type::READY) return (act->dst_actor_ != nullptr); return (act->src_actor_ && act->dst_actor_); } @@ -117,9 +117,9 @@ bool actor_is_enabled(smx_actor_t actor) case SIMCALL_MUTEX_LOCK: { smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req); - if (mutex->owner == nullptr) + if (mutex->owner_ == nullptr) return true; - return mutex->owner->get_pid() == req->issuer->get_pid(); + return mutex->owner_->get_pid() == req->issuer->get_pid(); } case SIMCALL_SEM_ACQUIRE: {