X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/611d822b02f836d7abe031cced6adc4281ef4356..2d2995483b57463581ffdc4365fe1999ddc306c2:/src/kernel/activity/MutexImpl.cpp diff --git a/src/kernel/activity/MutexImpl.cpp b/src/kernel/activity/MutexImpl.cpp index 8e431b61bc..9581637a40 100644 --- a/src/kernel/activity/MutexImpl.cpp +++ b/src/kernel/activity/MutexImpl.cpp @@ -13,7 +13,7 @@ namespace simgrid { namespace kernel { namespace activity { -MutexImpl::MutexImpl() : mutex_(this) +MutexImpl::MutexImpl() : piface_(this) { XBT_IN("(%p)", this); XBT_OUT(); @@ -34,8 +34,8 @@ void MutexImpl::lock(smx_actor_t issuer) if (this->locked) { /* FIXME: check if the host is active ? */ /* Somebody using the mutex, use a synchronization to get host failures */ - synchro = SIMIX_synchro_wait(issuer->host, -1); - synchro->simcalls.push_back(&issuer->simcall); + synchro = SIMIX_synchro_wait(issuer->host_, -1); + synchro->simcalls_.push_back(&issuer->simcall); issuer->waiting_synchro = synchro; this->sleeping.push_back(*issuer); } else { @@ -81,7 +81,7 @@ void MutexImpl::unlock(smx_actor_t issuer) /* If the mutex is not owned by the issuer, that's not good */ if (issuer != this->owner) THROWF(mismatch_error, 0, "Cannot release that mutex: it was locked by %s (pid:%ld), not by you.", - this->owner->get_cname(), this->owner->pid); + this->owner->get_cname(), this->owner->pid_); if (not this->sleeping.empty()) { /*process to wake up */