From 72a8c96dc412fc60f4d4a2ccb55322a6b92ed380 Mon Sep 17 00:00:00 2001 From: Michal Jarzabek Date: Thu, 6 Oct 2016 21:30:43 +0100 Subject: [PATCH] mds/SessionMap.h: remove unneeded use of count Signed-off-by: Michal Jarzabek --- src/mds/SessionMap.h | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h index ec28e4483bf..55242509b59 100644 --- a/src/mds/SessionMap.h +++ b/src/mds/SessionMap.h @@ -404,8 +404,9 @@ public: Session* get_or_add_session(const entity_inst_t& i) { Session *s; - if (session_map.count(i.name)) { - s = session_map[i.name]; + auto session_map_entry = session_map.find(i.name); + if (session_map_entry != session_map.end()) { + s = session_map_entry->second; } else { s = session_map[i.name] = new Session; s->info.inst = i; @@ -512,9 +513,9 @@ public: return session_map.count(w); } Session* get_session(entity_name_t w) { - if (session_map.count(w)) - return session_map[w]; - return 0; + auto session_map_entry = session_map.find(w); + return (session_map_entry != session_map.end() ? + session_map_entry-> second : nullptr); } const Session* get_session(entity_name_t w) const { ceph::unordered_map::const_iterator p = session_map.find(w); @@ -530,9 +531,10 @@ public: void touch_session(Session *session); Session *get_oldest_session(int state) { - if (by_state.count(state) == 0 || by_state[state]->empty()) + auto by_state_entry = by_state.find(state); + if (by_state_entry == by_state.end() || by_state_entry->second->empty()) return 0; - return by_state[state]->front(); + return by_state_entry->second->front(); } void dump(); -- 2.47.3