mon: Mutex::Locker -> std::lock_guard

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

diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc
index a673e98434fc74313cd83614dfaefc9eece9fe04..e78cd9d0420e53dff9e053776853ec74204a580f 100644 (file)
--- a/src/mon/MonClient.cc
+++ b/src/mon/MonClient.cc
@@ -79,7 +79,7 @@ int MonClient::build_initial_monmap()
 int MonClient::get_monmap()
 {
   ldout(cct, 10) << __func__ << dendl;
-  Mutex::Locker l(monc_lock);
+  std::lock_guard l(monc_lock);
   
   sub.want("monmap", 0, 0);
   if (!_opened())
@@ -142,7 +142,7 @@ int MonClient::get_monmap_and_config()
       break;
     }
     {
-      Mutex::Locker l(monc_lock);
+      std::lock_guard l(monc_lock);
       if (monmap.get_epoch() &&
          !monmap.persistent_features.contains_all(
            ceph::features::mon::FEATURE_MIMIC)) {
@@ -267,7 +267,7 @@ bool MonClient::ms_dispatch(Message *m)
     return false;
   }
 
-  Mutex::Locker lock(monc_lock);
+  std::lock_guard lock(monc_lock);
 
   if (_hunting()) {
     auto p = _find_pending_con(m->get_connection());
@@ -335,7 +335,7 @@ void MonClient::send_log(bool flush)
 
 void MonClient::flush_log()
 {
-  Mutex::Locker l(monc_lock);
+  std::lock_guard l(monc_lock);
   send_log();
 }
 
@@ -390,7 +390,7 @@ int MonClient::init()
 
   entity_name = cct->_conf->name;
 
-  Mutex::Locker l(monc_lock);
+  std::lock_guard l(monc_lock);
 
   string method;
   if (!cct->_conf->auth_supported.empty())
@@ -477,7 +477,7 @@ void MonClient::shutdown()
 
 int MonClient::authenticate(double timeout)
 {
-  Mutex::Locker lock(monc_lock);
+  std::lock_guard lock(monc_lock);
 
   if (active_con) {
     ldout(cct, 5) << "already authenticated" << dendl;
@@ -697,7 +697,7 @@ void MonClient::_add_conns(uint64_t global_id)
 
 bool MonClient::ms_handle_reset(Connection *con)
 {
-  Mutex::Locker lock(monc_lock);
+  std::lock_guard lock(monc_lock);
 
   if (con->get_peer_type() != CEPH_ENTITY_TYPE_MON)
     return false;
@@ -928,7 +928,7 @@ int MonClient::_check_auth_rotating()
 
 int MonClient::wait_auth_rotating(double timeout)
 {
-  Mutex::Locker l(monc_lock);
+  std::lock_guard l(monc_lock);
   utime_t now = ceph_clock_now();
   utime_t until = now;
   until += timeout;
@@ -1074,7 +1074,7 @@ void MonClient::start_mon_command(const vector<string>& cmd,
                                 bufferlist *outbl, string *outs,
                                 Context *onfinish)
 {
-  Mutex::Locker l(monc_lock);
+  std::lock_guard l(monc_lock);
   MonCommand *r = new MonCommand(++last_mon_command_tid);
   r->cmd = cmd;
   r->inbl = inbl;
@@ -1105,7 +1105,7 @@ void MonClient::start_mon_command(const string &mon_name,
                                 bufferlist *outbl, string *outs,
                                 Context *onfinish)
 {
-  Mutex::Locker l(monc_lock);
+  std::lock_guard l(monc_lock);
   MonCommand *r = new MonCommand(++last_mon_command_tid);
   r->target_name = mon_name;
   r->cmd = cmd;
@@ -1123,7 +1123,7 @@ void MonClient::start_mon_command(int rank,
                                 bufferlist *outbl, string *outs,
                                 Context *onfinish)
 {
-  Mutex::Locker l(monc_lock);
+  std::lock_guard l(monc_lock);
   MonCommand *r = new MonCommand(++last_mon_command_tid);
   r->target_rank = rank;
   r->cmd = cmd;
@@ -1141,7 +1141,7 @@ void MonClient::get_version(string map, version_t *newest, version_t *oldest, Co
 {
   version_req_d *req = new version_req_d(onfinish, newest, oldest);
   ldout(cct, 10) << "get_version " << map << " req " << req << dendl;
-  Mutex::Locker l(monc_lock);
+  std::lock_guard l(monc_lock);
   MMonGetVersion *m = new MMonGetVersion();
   m->what = map;
   m->handle = ++version_req_id;
@@ -1171,7 +1171,7 @@ void MonClient::handle_get_version_reply(MMonGetVersionReply* m)
 }
 
 AuthAuthorizer* MonClient::build_authorizer(int service_id) const {
-  Mutex::Locker l(monc_lock);
+  std::lock_guard l(monc_lock);
   if (auth) {
     return auth->build_authorizer(service_id);
   } else {

diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index baeedf5d60f61690560211830e01003784d55d80..4d0755c1469707f58231a9cc8a2b8166f84bdbac 100644 (file)
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -68,7 +68,7 @@ struct MonClientPinger : public Dispatcher {
   }
 
   bool ms_dispatch(Message *m) override {
-    Mutex::Locker l(lock);
+    std::lock_guard l(lock);
     if (m->get_type() != CEPH_MSG_PING)
       return false;
 
@@ -83,7 +83,7 @@ struct MonClientPinger : public Dispatcher {
     return true;
   }
   bool ms_handle_reset(Connection *con) override {
-    Mutex::Locker l(lock);
+    std::lock_guard l(lock);
     done = true;
     ping_recvd_cond.SignalAll();
     return true;
@@ -254,23 +254,23 @@ private:
 
 public:
   void renew_subs() {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     _renew_subs();
   }
   bool sub_want(string what, version_t start, unsigned flags) {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     return sub.want(what, start, flags);
   }
   void sub_got(string what, version_t have) {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     sub.got(what, have);
   }
   void sub_unwant(string what) {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     sub.unwant(what);
   }
   bool sub_want_increment(string what, version_t start, unsigned flags) {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     return sub.inc_want(what, start, flags);
   }
   
@@ -301,11 +301,11 @@ public:
    * putting the message reference!
    */
   void set_passthrough_monmap() {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     passthrough_monmap = true;
   }
   void unset_passthrough_monmap() {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     passthrough_monmap = false;
   }
   /**
@@ -321,7 +321,7 @@ public:
   int ping_monitor(const string &mon_id, string *result_reply);
 
   void send_mon_message(Message *m) {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     _send_mon_message(m);
   }
   /**
@@ -332,7 +332,7 @@ public:
    * to reconnect to another monitor.
    */
   void reopen_session(Context *cb=NULL) {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     if (cb) {
       session_established_context.reset(cb);
     }
@@ -348,18 +348,18 @@ public:
   }
 
   entity_addrvec_t get_mon_addrs(unsigned i) const {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     if (i < monmap.size())
       return monmap.get_addrs(i);
     return entity_addrvec_t();
   }
   int get_num_mon() const {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     return monmap.size();
   }
 
   uint64_t get_global_id() const {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     return global_id;
   }
 
@@ -434,7 +434,7 @@ public:
   template<typename Callback, typename...Args>
   auto with_monmap(Callback&& cb, Args&&...args) const ->
     decltype(cb(monmap, std::forward<Args>(args)...)) {
-    Mutex::Locker l(monc_lock);
+    std::lock_guard l(monc_lock);
     return std::forward<Callback>(cb)(monmap, std::forward<Args>(args)...);
   }
 

diff --git a/src/mon/MonOpRequest.h b/src/mon/MonOpRequest.h
index ef0af47be8e61c35eb1cc1a02efe0c10fd00304b..5c1d6eeacc7d8e8110970fe35a03c4466cb8b156 100644 (file)
--- a/src/mon/MonOpRequest.h
+++ b/src/mon/MonOpRequest.h
@@ -104,7 +104,7 @@ private:
   void _dump(Formatter *f) const override {
     {
       f->open_array_section("events");
-      Mutex::Locker l(lock);
+      std::lock_guard l(lock);
       for (auto& i : events) {
        f->dump_object("event", i);
       }

diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc
index 713c0179b5e8e757acfc4495699881b8c576bcc7..db1fa815bd65432c7bf523cd4a9b9c90e0814b25 100644 (file)
--- a/src/mon/Monitor.cc
+++ b/src/mon/Monitor.cc
@@ -250,7 +250,7 @@ public:
 void Monitor::do_admin_command(std::string_view command, const cmdmap_t& cmdmap,
                               std::string_view format, std::ostream& ss)
 {
-  Mutex::Locker l(lock);
+  std::lock_guard l(lock);
 
   boost::scoped_ptr<Formatter> f(Formatter::create(format));
 
@@ -818,7 +818,7 @@ int Monitor::preinit()
 int Monitor::init()
 {
   dout(2) << "init" << dendl;
-  Mutex::Locker l(lock);
+  std::lock_guard l(lock);
 
   finisher.start();
 
@@ -2890,7 +2890,7 @@ struct C_MgrProxyCommand : public Context {
   C_MgrProxyCommand(Monitor *mon, MonOpRequestRef op, uint64_t s)
     : mon(mon), op(op), size(s) { }
   void finish(int r) {
-    Mutex::Locker l(mon->lock);
+    std::lock_guard l(mon->lock);
     mon->mgr_proxy_bytes -= size;
     mon->reply_command(op, r, outs, outbl, 0);
   }
@@ -3920,7 +3920,7 @@ void Monitor::remove_session(MonSession *s)
 
 void Monitor::remove_all_sessions()
 {
-  Mutex::Locker l(session_map_lock);
+  std::lock_guard l(session_map_lock);
   while (!session_map.sessions.empty()) {
     MonSession *s = session_map.sessions.front();
     remove_session(s);
@@ -3966,7 +3966,7 @@ void Monitor::waitlist_or_zap_client(MonOpRequestRef op)
     // proxied sessions aren't registered and don't have a con; don't remove
     // those.
     if (!s->proxy_con) {
-      Mutex::Locker l(session_map_lock);
+      std::lock_guard l(session_map_lock);
       remove_session(s);
     }
     op->mark_zap();
@@ -4027,7 +4027,7 @@ void Monitor::_ms_dispatch(Message *m)
 
     ConnectionRef con = m->get_connection();
     {
-      Mutex::Locker l(session_map_lock);
+      std::lock_guard l(session_map_lock);
       s = session_map.new_session(m->get_source(),
                                  m->get_source_addrs(),
                                  con.get());
@@ -4797,7 +4797,7 @@ void Monitor::handle_subscribe(MonOpRequestRef op)
       for (map<string, Subscription*>::iterator it = s->sub_map.begin();
           it != s->sub_map.end(); ) {
        if (it->first != p->first && logmon()->sub_name_to_id(it->first) >= 0) {
-         Mutex::Locker l(session_map_lock);
+         std::lock_guard l(session_map_lock);
          session_map.remove_sub((it++)->second);
        } else {
          ++it;
@@ -4806,7 +4806,7 @@ void Monitor::handle_subscribe(MonOpRequestRef op)
     }
 
     {
-      Mutex::Locker l(session_map_lock);
+      std::lock_guard l(session_map_lock);
       session_map.add_update_sub(s, p->first, p->second.start,
                                 p->second.flags & CEPH_SUBSCRIBE_ONETIME,
                                 m->get_connection()->has_feature(CEPH_FEATURE_INCSUBOSDMAP));
@@ -4919,11 +4919,11 @@ bool Monitor::ms_handle_reset(Connection *con)
   if (is_shutdown())
     return false;
 
-  Mutex::Locker l(lock);
+  std::lock_guard l(lock);
 
   dout(10) << "reset/close on session " << s->name << " " << s->addrs << dendl;
   if (!s->closed) {
-    Mutex::Locker l(session_map_lock);
+    std::lock_guard l(session_map_lock);
     remove_session(s);
   }
   return true;
@@ -5395,7 +5395,7 @@ void Monitor::tick()
   
   // trim sessions
   {
-    Mutex::Locker l(session_map_lock);
+    std::lock_guard l(session_map_lock);
     auto p = session_map.sessions.begin();
 
     bool out_for_too_long = (!exited_quorum.is_zero() &&

diff --git a/src/mon/Monitor.h b/src/mon/Monitor.h
index f511e5f6334a75a86408346cb5e428fd07a76a67..1c8cc3229db9e6156141597015b74d108a9fdb4a 100644 (file)
--- a/src/mon/Monitor.h
+++ b/src/mon/Monitor.h
@@ -663,7 +663,7 @@ public:
 
   template<typename Func, typename...Args>
   void with_session_map(Func&& func) {
-    Mutex::Locker l(session_map_lock);
+    std::lock_guard l(session_map_lock);
     std::forward<Func>(func)(session_map);
   }
   void send_latest_monmap(Connection *con);

diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc
index 471855cf68eb3c3afabb6c9b5019ee95b89a71bb..1faaad782a8d4c8a5a074233285a469e2485cabc 100644 (file)
--- a/src/mon/OSDMonitor.cc
+++ b/src/mon/OSDMonitor.cc
@@ -999,7 +999,7 @@ void OSDMonitor::prime_pg_temp(
           << ", priming " << acting
           << dendl;
   {
-    Mutex::Locker l(prime_pg_temp_lock);
+    std::lock_guard l(prime_pg_temp_lock);
     // do not touch a mapping if a change is pending
     pending_inc.new_pg_temp.emplace(
       pgid,

diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc
index ff58212af763beaaca76dc0df3e6157429b62d03..5d07457fdbdecb5d8a331a914c8f3e6970b1c50c 100644 (file)
--- a/src/mon/Paxos.cc
+++ b/src/mon/Paxos.cc
@@ -820,7 +820,7 @@ struct C_Committed : public Context {
   explicit C_Committed(Paxos *p) : paxos(p) {}
   void finish(int r) override {
     ceph_assert(r >= 0);
-    Mutex::Locker l(paxos->mon->lock);
+    std::lock_guard l(paxos->mon->lock);
     if (paxos->is_shutdown()) {
       paxos->abort_commit();
       return;