From b3b86254a12284e186e06f1653dbf6bd606904fa Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Mon, 24 Apr 2017 18:27:42 -0400 Subject: [PATCH] osd/OSDMap: use auto where possible Signed-off-by: Sage Weil --- src/mon/OSDMonitor.cc | 29 +++++++++++----------------- src/mon/PGMap.cc | 6 +++--- src/mon/PGMonitor.cc | 4 ++-- src/osd/OSDMap.cc | 4 ++-- src/osd/OSDMap.h | 25 +++++++++++------------- src/osdc/Objecter.cc | 13 ++++++------- src/test/mon/test_mon_workloadgen.cc | 10 ++++------ src/tools/osdmaptool.cc | 5 ++--- 8 files changed, 41 insertions(+), 55 deletions(-) diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 7970bdd6b1f..a31d7bce40a 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -2651,7 +2651,7 @@ bool OSDMonitor::preprocess_pgtemp(MonOpRequestRef op) goto ignore; } - for (map >::iterator p = m->pg_temp.begin(); p != m->pg_temp.end(); ++p) { + for (auto p = m->pg_temp.begin(); p != m->pg_temp.end(); ++p) { dout(20) << " " << p->first << (osdmap.pg_temp->count(p->first) ? (*osdmap.pg_temp)[p->first] : empty) << " -> " << p->second << dendl; @@ -4796,13 +4796,10 @@ bool OSDMonitor::preprocess_command(MonOpRequestRef op) f->close_section(); f->flush(rdata); } else if (prefix == "osd erasure-code-profile ls") { - const map > &profiles = - osdmap.get_erasure_code_profiles(); + const auto &profiles = osdmap.get_erasure_code_profiles(); if (f) f->open_array_section("erasure-code-profiles"); - for(map >::const_iterator i = profiles.begin(); - i != profiles.end(); - ++i) { + for (auto i = profiles.begin(); i != profiles.end(); ++i) { if (f) f->dump_string("profile", i->first.c_str()); else @@ -4866,10 +4863,8 @@ bool OSDMonitor::update_pools_status() bool ret = false; - const map& pools = osdmap.get_pools(); - for (map::const_iterator it = pools.begin(); - it != pools.end(); - ++it) { + auto& pools = osdmap.get_pools(); + for (auto it = pools.begin(); it != pools.end(); ++it) { if (!mon->pgmon()->pg_map.pg_pool_sum.count(it->first)) continue; pool_stat_t& stats = mon->pgmon()->pg_map.pg_pool_sum[it->first]; @@ -4917,9 +4912,8 @@ void OSDMonitor::get_pools_health( list >& summary, list > *detail) const { - const map& pools = osdmap.get_pools(); - for (map::const_iterator it = pools.begin(); - it != pools.end(); ++it) { + auto& pools = osdmap.get_pools(); + for (auto it = pools.begin(); it != pools.end(); ++it) { if (!mon->pgmon()->pg_map.pg_pool_sum.count(it->first)) continue; pool_stat_t& stats = mon->pgmon()->pg_map.pg_pool_sum[it->first]; @@ -6288,9 +6282,8 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, goto reply; } - const map &osdmap_pools = osdmap.get_pools(); - map::const_iterator pit; - for (pit = osdmap_pools.begin(); pit != osdmap_pools.end(); ++pit) { + const auto& osdmap_pools = osdmap.get_pools(); + for (auto pit = osdmap_pools.begin(); pit != osdmap_pools.end(); ++pit) { const int64_t pool_id = pit->first; const pg_pool_t &pool = pit->second; int ruleno = pool.get_crush_ruleset(); @@ -9396,7 +9389,7 @@ int OSDMonitor::_prepare_remove_pool(int64_t pool, ostream *ss) pending_inc.old_pools.insert(pool); // remove any pg_temp mappings for this pool too - for (map >::iterator p = osdmap.pg_temp->begin(); + for (auto p = osdmap.pg_temp->begin(); p != osdmap.pg_temp->end(); ++p) { if (p->first.pool() == (uint64_t)pool) { @@ -9405,7 +9398,7 @@ int OSDMonitor::_prepare_remove_pool(int64_t pool, ostream *ss) pending_inc.new_pg_temp[p->first].clear(); } } - for (map::iterator p = osdmap.primary_temp->begin(); + for (auto p = osdmap.primary_temp->begin(); p != osdmap.primary_temp->end(); ++p) { if (p->first.pool() == (uint64_t)pool) { diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index 8b4a1010ab2..9e5524865f3 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -1983,10 +1983,10 @@ void PGMap::dump_pool_stats(const OSDMap &osd_map, stringstream *ss, break; case pg_pool_t::TYPE_ERASURE: { - const map& ecp = + auto& ecp = osd_map.get_erasure_code_profile(pool->erasure_code_profile); - map::const_iterator pm = ecp.find("m"); - map::const_iterator pk = ecp.find("k"); + auto pm = ecp.find("m"); + auto pk = ecp.find("k"); if (pm != ecp.end() && pk != ecp.end()) { int k = atoi(pk->second.c_str()); int m = atoi(pm->second.c_str()); diff --git a/src/mon/PGMonitor.cc b/src/mon/PGMonitor.cc index b972ade7f07..934515de311 100644 --- a/src/mon/PGMonitor.cc +++ b/src/mon/PGMonitor.cc @@ -1503,8 +1503,8 @@ void PGMonitor::get_health(list >& summary, } // near-target max pools - const map& pools = mon->osdmon()->osdmap.get_pools(); - for (map::const_iterator p = pools.begin(); + auto& pools = mon->osdmon()->osdmap.get_pools(); + for (auto p = pools.begin(); p != pools.end(); ++p) { if ((!p->second.target_max_objects && !p->second.target_max_bytes) || !pg_map.pg_pool_sum.count(p->first)) diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 96bfa8a29e4..1c70174b0c0 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -1190,8 +1190,8 @@ uint64_t OSDMap::get_features(int entity_type, uint64_t *pmask) const } if (entity_type == CEPH_ENTITY_TYPE_OSD) { for (auto &erasure_code_profile : erasure_code_profiles) { - const map &profile = erasure_code_profile.second; - const auto &plugin = profile.find("plugin"); + auto& profile = erasure_code_profile.second; + const auto& plugin = profile.find("plugin"); if (plugin != profile.end()) { if (plugin->second == "isa" || plugin->second == "lrc") features |= CEPH_FEATURE_ERASURE_CODE_PLUGINS_V2; diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 72163d82f8d..6151d09493c 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -194,8 +194,7 @@ public: return &new_pools[pool]; } bool has_erasure_code_profile(const string &name) const { - map >::const_iterator i = - new_erasure_code_profiles.find(name); + auto i = new_erasure_code_profiles.find(name); return i != new_erasure_code_profiles.end(); } void set_erasure_code_profile(const string &name, @@ -424,8 +423,7 @@ public: } bool has_erasure_code_profile(const string &name) const { - map >::const_iterator i = - erasure_code_profiles.find(name); + auto i = erasure_code_profiles.find(name); return i != erasure_code_profiles.end(); } int get_erasure_code_profile_default(CephContext *cct, @@ -436,9 +434,8 @@ public: erasure_code_profiles[name] = profile; } const map &get_erasure_code_profile(const string &name) const { - map >::const_iterator i = - erasure_code_profiles.find(name); static map empty; + auto i = erasure_code_profiles.find(name); if (i == erasure_code_profiles.end()) return empty; else @@ -731,12 +728,12 @@ public: pg_to_up_acting_osds(pg, &up, &up_primary, &acting, &acting_primary); } bool pg_is_ec(pg_t pg) const { - map::const_iterator i = pools.find(pg.pool()); + auto i = pools.find(pg.pool()); assert(i != pools.end()); return i->second.ec_pool(); } bool get_primary_shard(const pg_t& pgid, spg_t *out) const { - map::const_iterator i = get_pools().find(pgid.pool()); + auto i = get_pools().find(pgid.pool()); if (i == get_pools().end()) { return false; } @@ -757,7 +754,7 @@ public: } int64_t lookup_pg_pool_name(const string& name) const { - map::const_iterator p = name_pool.find(name); + auto p = name_pool.find(name); if (p == name_pool.end()) return -ENOENT; return p->second; @@ -773,7 +770,7 @@ public: return pools; } const string& get_pool_name(int64_t p) const { - map::const_iterator i = pool_name.find(p); + auto i = pool_name.find(p); assert(i != pool_name.end()); return i->second; } @@ -781,25 +778,25 @@ public: return pools.count(p); } const pg_pool_t* get_pg_pool(int64_t p) const { - map::const_iterator i = pools.find(p); + auto i = pools.find(p); if (i != pools.end()) return &i->second; return NULL; } unsigned get_pg_size(pg_t pg) const { - map::const_iterator p = pools.find(pg.pool()); + auto p = pools.find(pg.pool()); assert(p != pools.end()); return p->second.get_size(); } int get_pg_type(pg_t pg) const { - map::const_iterator p = pools.find(pg.pool()); + auto p = pools.find(pg.pool()); assert(p != pools.end()); return p->second.get_type(); } pg_t raw_pg_to_pg(pg_t pg) const { - map::const_iterator p = pools.find(pg.pool()); + auto p = pools.find(pg.pool()); assert(p != pools.end()); return p->second.raw_pg_to_pg(pg); } diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 0d8138d8909..5144ef22246 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -1400,14 +1400,13 @@ int Objecter::pool_snap_by_name(int64_t poolid, const char *snap_name, { shared_lock rl(rwlock); - const map& pools = osdmap->get_pools(); - map::const_iterator iter = pools.find(poolid); + auto& pools = osdmap->get_pools(); + auto iter = pools.find(poolid); if (iter == pools.end()) { return -ENOENT; } const pg_pool_t& pg_pool = iter->second; - map::const_iterator p; - for (p = pg_pool.snaps.begin(); + for (auto p = pg_pool.snaps.begin(); p != pg_pool.snaps.end(); ++p) { if (p->second.name == snap_name) { @@ -1423,13 +1422,13 @@ int Objecter::pool_snap_get_info(int64_t poolid, snapid_t snap, { shared_lock rl(rwlock); - const map& pools = osdmap->get_pools(); - map::const_iterator iter = pools.find(poolid); + auto& pools = osdmap->get_pools(); + auto iter = pools.find(poolid); if (iter == pools.end()) { return -ENOENT; } const pg_pool_t& pg_pool = iter->second; - map::const_iterator p = pg_pool.snaps.find(snap); + auto p = pg_pool.snaps.find(snap); if (p == pg_pool.snaps.end()) return -ENOENT; *info = p->second; diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc index 05df8e44db0..f64844c6643 100644 --- a/src/test/mon/test_mon_workloadgen.cc +++ b/src/test/mon/test_mon_workloadgen.cc @@ -495,9 +495,8 @@ class OSDStub : public TestStub return; } - const map &osdmap_pools = osdmap.get_pools(); - map::const_iterator pit; - for (pit = osdmap_pools.begin(); pit != osdmap_pools.end(); ++pit) { + auto& osdmap_pools = osdmap.get_pools(); + for (auto pit = osdmap_pools.begin(); pit != osdmap_pools.end(); ++pit) { const int64_t pool_id = pit->first; const pg_pool_t &pool = pit->second; int ruleno = pool.get_crush_ruleset(); @@ -674,9 +673,8 @@ class OSDStub : public TestStub JSONFormatter f(true); f.open_array_section("pools"); - const map &osdmap_pools = osdmap.get_pools(); - map::const_iterator pit; - for (pit = osdmap_pools.begin(); pit != osdmap_pools.end(); ++pit) { + auto& osdmap_pools = osdmap.get_pools(); + for (auto pit = osdmap_pools.begin(); pit != osdmap_pools.end(); ++pit) { const int64_t pool_id = pit->first; const pg_pool_t &pool = pit->second; f.open_object_section("pool"); diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc index 1301f4f542b..2738412e538 100644 --- a/src/tools/osdmaptool.cc +++ b/src/tools/osdmaptool.cc @@ -454,9 +454,8 @@ int main(int argc, const char **argv) vector size(30, 0); if (test_random) srand(getpid()); - map& pools = osdmap.get_pools(); - for (map::iterator p = pools.begin(); - p != pools.end(); ++p) { + auto& pools = osdmap.get_pools(); + for (auto p = pools.begin(); p != pools.end(); ++p) { if (pool != -1 && p->first != pool) continue; if (pg_num > 0) -- 2.39.5