X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/aee6610d4ad2377964369760bce27e18a12dd708..4b04faa98dd6b4d52c3383a177e810f8e450fd48:/src/s4u/s4u_Mutex.cpp diff --git a/src/s4u/s4u_Mutex.cpp b/src/s4u/s4u_Mutex.cpp index 6c5d171902..b46c2986bf 100644 --- a/src/s4u/s4u_Mutex.cpp +++ b/src/s4u/s4u_Mutex.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2006-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2006-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. */ @@ -12,7 +12,7 @@ namespace s4u { /** @brief Blocks the calling actor until the mutex can be obtained */ void Mutex::lock() { - simcall_mutex_lock(mutex_); + simcall_mutex_lock(pimpl_); } /** @brief Release the ownership of the mutex, unleashing a blocked actor (if any) @@ -21,20 +21,20 @@ void Mutex::lock() */ void Mutex::unlock() { - simcall_mutex_unlock(mutex_); + simcall_mutex_unlock(pimpl_); } /** @brief Acquire the mutex if it's free, and return false (without blocking) if not */ bool Mutex::try_lock() { - return simcall_mutex_trylock(mutex_); + return simcall_mutex_trylock(pimpl_); } /** @brief Create a new mutex * * See @ref s4u_raii. */ -MutexPtr Mutex::createMutex() +MutexPtr Mutex::create() { smx_mutex_t mutex = simcall_mutex_init(); return MutexPtr(&mutex->mutex(), false); @@ -44,12 +44,12 @@ MutexPtr Mutex::createMutex() void intrusive_ptr_add_ref(Mutex* mutex) { xbt_assert(mutex); - SIMIX_mutex_ref(mutex->mutex_); + SIMIX_mutex_ref(mutex->pimpl_); } void intrusive_ptr_release(Mutex* mutex) { xbt_assert(mutex); - SIMIX_mutex_unref(mutex->mutex_); + SIMIX_mutex_unref(mutex->pimpl_); } } // namespace s4u } // namespace simgrid