common/Mutex: Lock -> lock, Unlock -> unlock

This aligns us with the Lockable concept, which means we can use
lock_guard<>, unique_lock<>, etc.

Signed-off-by: Sage Weil <sage@redhat.com>

diff --git a/src/common/Mutex.cc b/src/common/Mutex.cc
index a4ddd1e4e8032eaf851b6c2883e08961a95e42da..f5c38826b8ddb405002f9397073709b57d2f2183 100644 (file)
--- a/src/common/Mutex.cc
+++ b/src/common/Mutex.cc
@@ -73,7 +73,8 @@ Mutex::~Mutex() {
   }
 }
 
-void Mutex::Lock(bool no_lockdep) {
+void Mutex::lock(bool no_lockdep)
+{
   if (lockdep && g_lockdep && !no_lockdep && !recursive) _will_lock();
   int r = pthread_mutex_lock(&_m);
   ceph_assert(r == 0);
@@ -81,7 +82,8 @@ void Mutex::Lock(bool no_lockdep) {
   _post_lock();
 }
 
-void Mutex::Unlock() {
+void Mutex::unlock()
+{
   _pre_unlock();
   if (lockdep && g_lockdep) _will_unlock();
   int r = pthread_mutex_unlock(&_m);

diff --git a/src/common/Mutex.h b/src/common/Mutex.h
index 10130d9a4693a5e8ef448918ca229ba63282be6d..5e536c4898a73d86bfa47de933f8bc9bcb25a7fc 100644 (file)
--- a/src/common/Mutex.h
+++ b/src/common/Mutex.h
@@ -63,6 +63,9 @@ public:
   }
 
   bool TryLock() {
+    return try_lock();
+  }
+  bool try_lock() {
     int r = pthread_mutex_trylock(&_m);
     if (r == 0) {
       if (lockdep && g_lockdep) _locked();
@@ -71,7 +74,10 @@ public:
     return r == 0;
   }
 
-  void Lock(bool no_lockdep=false);
+  void Lock(bool no_lockdep=false) {
+    lock(no_lockdep);
+  }
+  void lock(bool no_lockdep=false);
 
   void _post_lock() {
     if (!recursive) {
@@ -90,7 +96,10 @@ public:
       ceph_assert(nlock == 0);
     }
   }
-  void Unlock();
+  void Unlock() {
+    unlock();
+  }
+  void unlock();
 
   friend class Cond;
 
@@ -101,10 +110,10 @@ public:
 
   public:
     explicit Locker(Mutex& m) : mutex(m) {
-      mutex.Lock();
+      mutex.lock();
     }
     ~Locker() {
-      mutex.Unlock();
+      mutex.unlock();
     }
   };
 };