From aa19b8ec2814d04500c24d5df65a4e620e8e8969 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Thu, 10 May 2018 10:07:30 +0200
Subject: [PATCH] cosmetic in mutex

---
 include/simgrid/s4u/Mutex.hpp     |  4 ++--
 src/kernel/activity/MutexImpl.cpp |  2 +-
 src/kernel/activity/MutexImpl.hpp |  4 ++--
 src/s4u/s4u_ConditionVariable.cpp |  6 +++---
 src/s4u/s4u_Mutex.cpp             | 10 +++++-----
 5 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/include/simgrid/s4u/Mutex.hpp b/include/simgrid/s4u/Mutex.hpp
index d52df2d19c..4230a984ed 100644
--- a/include/simgrid/s4u/Mutex.hpp
+++ b/include/simgrid/s4u/Mutex.hpp
@@ -31,8 +31,8 @@ class ConditionVariable;
 class XBT_PUBLIC Mutex {
   friend ConditionVariable;
   friend simgrid::kernel::activity::MutexImpl;
-  simgrid::kernel::activity::MutexImpl* mutex_;
-  explicit Mutex(simgrid::kernel::activity::MutexImpl * mutex) : mutex_(mutex) {}
+  simgrid::kernel::activity::MutexImpl* pimpl_;
+  explicit Mutex(simgrid::kernel::activity::MutexImpl* mutex) : pimpl_(mutex) {}
 
   /* refcounting */
   friend XBT_PUBLIC void intrusive_ptr_add_ref(Mutex* mutex);
diff --git a/src/kernel/activity/MutexImpl.cpp b/src/kernel/activity/MutexImpl.cpp
index 8e431b61bc..62fadd7ba0 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();
diff --git a/src/kernel/activity/MutexImpl.hpp b/src/kernel/activity/MutexImpl.hpp
index 53543b6e80..88b00a6a23 100644
--- a/src/kernel/activity/MutexImpl.hpp
+++ b/src/kernel/activity/MutexImpl.hpp
@@ -42,11 +42,11 @@ public:
       delete mutex;
   }
 
-  simgrid::s4u::Mutex& mutex() { return mutex_; }
+  simgrid::s4u::Mutex& mutex() { return piface_; }
 
 private:
   std::atomic_int_fast32_t refcount_{1};
-  simgrid::s4u::Mutex mutex_;
+  simgrid::s4u::Mutex piface_;
 };
 }
 }
diff --git a/src/s4u/s4u_ConditionVariable.cpp b/src/s4u/s4u_ConditionVariable.cpp
index c42a524daf..9df1f73507 100644
--- a/src/s4u/s4u_ConditionVariable.cpp
+++ b/src/s4u/s4u_ConditionVariable.cpp
@@ -27,12 +27,12 @@ ConditionVariablePtr ConditionVariable::create()
  */
 void ConditionVariable::wait(MutexPtr lock)
 {
-  simcall_cond_wait(cond_, lock->mutex_);
+  simcall_cond_wait(cond_, lock->pimpl_);
 }
 
 void ConditionVariable::wait(std::unique_lock<Mutex>& lock)
 {
-  simcall_cond_wait(cond_, lock.mutex()->mutex_);
+  simcall_cond_wait(cond_, lock.mutex()->pimpl_);
 }
 
 std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, double timeout)
@@ -41,7 +41,7 @@ std::cv_status s4u::ConditionVariable::wait_for(std::unique_lock<Mutex>& lock, d
   if (timeout < 0)
     timeout = 0.0;
 
-  if (simcall_cond_wait_timeout(cond_, lock.mutex()->mutex_, timeout)) {
+  if (simcall_cond_wait_timeout(cond_, lock.mutex()->pimpl_, timeout)) {
     // If we reached the timeout, we have to take the lock again:
     lock.mutex()->lock();
     return std::cv_status::timeout;
diff --git a/src/s4u/s4u_Mutex.cpp b/src/s4u/s4u_Mutex.cpp
index 6c5d171902..f9bc89211a 100644
--- a/src/s4u/s4u_Mutex.cpp
+++ b/src/s4u/s4u_Mutex.cpp
@@ -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,13 +21,13 @@ 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
@@ -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
-- 
2.20.1