From 11d6e5ad844bb1722b9701d4a42f03db4647e37d Mon Sep 17 00:00:00 2001 From: Samuel Just Date: Tue, 29 Jul 2014 15:33:30 -0700 Subject: [PATCH] OSD: rename session_waiting_for_map_lock to session_waiting_lock This lock will also protect the waiting_for_pg structures in each session. Signed-off-by: Samuel Just --- src/osd/OSD.cc | 2 +- src/osd/OSD.h | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index e586674f0db..e1e7a54f997 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1649,7 +1649,7 @@ OSD::OSD(CephContext *cct_, ObjectStore *store_, disk_tp(cct, "OSD::disk_tp", cct->_conf->osd_disk_threads, "osd_disk_threads"), command_tp(cct, "OSD::command_tp", 1), paused_recovery(false), - session_waiting_for_map_lock("OSD::session_waiting_for_map_lock"), + session_waiting_lock("OSD::session_waiting_lock"), heartbeat_lock("OSD::heartbeat_lock"), heartbeat_stop(false), heartbeat_update_lock("OSD::heartbeat_update_lock"), heartbeat_need_update(true), heartbeat_epoch(0), diff --git a/src/osd/OSD.h b/src/osd/OSD.h index 83bd6ff2ab3..7ce854b0fd0 100644 --- a/src/osd/OSD.h +++ b/src/osd/OSD.h @@ -1163,22 +1163,23 @@ public: {} }; void dispatch_session_waiting(Session *session, OSDMapRef osdmap); - Mutex session_waiting_for_map_lock; + + Mutex session_waiting_lock; set session_waiting_for_map; /// Caller assumes refs for included Sessions void get_sessions_waiting_for_map(set *out) { - Mutex::Locker l(session_waiting_for_map_lock); + Mutex::Locker l(session_waiting_lock); out->swap(session_waiting_for_map); } void register_session_waiting_on_map(Session *session) { - Mutex::Locker l(session_waiting_for_map_lock); + Mutex::Locker l(session_waiting_lock); if (session_waiting_for_map.count(session) == 0) { session->get(); session_waiting_for_map.insert(session); } } void clear_session_waiting_on_map(Session *session) { - Mutex::Locker l(session_waiting_for_map_lock); + Mutex::Locker l(session_waiting_lock); set::iterator i = session_waiting_for_map.find(session); if (i != session_waiting_for_map.end()) { (*i)->put(); -- 2.47.3