X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/89047acf6125582321f8e86f9765b0f57e350e2c..6daf179640c4438bb442671e641d304acefe263e:/src/kernel/activity/MutexImpl.cpp diff --git a/src/kernel/activity/MutexImpl.cpp b/src/kernel/activity/MutexImpl.cpp index 2a68661fd7..cc82ce65f2 100644 --- a/src/kernel/activity/MutexImpl.cpp +++ b/src/kernel/activity/MutexImpl.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2007-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2007-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -34,7 +34,7 @@ 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 = SIMIX_synchro_wait(issuer->host_, -1); synchro->simcalls_.push_back(&issuer->simcall); issuer->waiting_synchro = synchro; this->sleeping.push_back(*issuer); @@ -49,8 +49,8 @@ void MutexImpl::lock(smx_actor_t issuer) /** Tries to lock the mutex for a process * - * \param issuer the process that tries to acquire the mutex - * \return whether we managed to lock the mutex + * @param issuer the process that tries to acquire the mutex + * @return whether we managed to lock the mutex */ bool MutexImpl::try_lock(smx_actor_t issuer) { @@ -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 */