X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/92443d1106eefd29ba594c72002220076a472cb1..a0d47b6eaf07218a602ed6606da925fbd3629909:/src/s4u/s4u_Mutex.cpp diff --git a/src/s4u/s4u_Mutex.cpp b/src/s4u/s4u_Mutex.cpp index 6542263566..12fa915d5b 100644 --- a/src/s4u/s4u_Mutex.cpp +++ b/src/s4u/s4u_Mutex.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2022. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-2023. 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. */ @@ -11,8 +11,7 @@ #include "src/kernel/actor/SynchroObserver.hpp" #include "src/mc/mc_replay.hpp" -namespace simgrid { -namespace s4u { +namespace simgrid::s4u { /** @brief Blocks the calling actor until the mutex can be obtained */ void Mutex::lock() @@ -20,7 +19,7 @@ void Mutex::lock() kernel::actor::ActorImpl* issuer = kernel::actor::ActorImpl::self(); if (MC_is_active() || MC_record_replay_is_active()) { // Split in 2 simcalls for transition persistency - kernel::actor::MutexObserver lock_observer{issuer, mc::Transition::Type::MUTEX_LOCK, pimpl_}; + kernel::actor::MutexObserver lock_observer{issuer, mc::Transition::Type::MUTEX_ASYNC_LOCK, pimpl_}; auto acquisition = kernel::actor::simcall_answered([issuer, this] { return pimpl_->lock_async(issuer); }, &lock_observer); @@ -56,9 +55,9 @@ bool Mutex::try_lock() * * See @ref s4u_raii. */ -MutexPtr Mutex::create() +MutexPtr Mutex::create(bool recursive) { - auto* mutex = new kernel::activity::MutexImpl(); + auto* mutex = new kernel::activity::MutexImpl(recursive); return MutexPtr(&mutex->mutex(), false); } @@ -72,8 +71,7 @@ void intrusive_ptr_release(const Mutex* mutex) intrusive_ptr_release(mutex->pimpl_); } -} // namespace s4u -} // namespace simgrid +} // namespace simgrid::s4u /* **************************** Public C interface *************************** */ sg_mutex_t sg_mutex_init()