From 948635a8b2130b561fae08bd5b2405a2dc6d3e9f Mon Sep 17 00:00:00 2001 From: Sage Weil Date: Tue, 16 Oct 2018 14:11:33 -0500 Subject: [PATCH] mgr: Mutex::Locker -> std::lock_guard Signed-off-by: Sage Weil --- src/mgr/ActivePyModules.cc | 54 +++++++++++++++---------------- src/mgr/ClusterState.cc | 12 +++---- src/mgr/ClusterState.h | 14 ++++---- src/mgr/DaemonServer.cc | 40 +++++++++++------------ src/mgr/DaemonState.h | 2 +- src/mgr/Mgr.cc | 18 +++++------ src/mgr/MgrClient.cc | 18 +++++------ src/mgr/MgrClient.h | 4 +-- src/mgr/MgrStandby.cc | 8 ++--- src/mgr/OSDPerfMetricCollector.cc | 8 ++--- src/mgr/PyModule.cc | 4 +-- src/mgr/PyModule.h | 18 +++++------ src/mgr/PyModuleRegistry.cc | 18 +++++------ src/mgr/PyModuleRegistry.h | 4 +-- src/mgr/StandbyPyModules.cc | 4 +-- src/mgr/StandbyPyModules.h | 6 ++-- 16 files changed, 116 insertions(+), 116 deletions(-) diff --git a/src/mgr/ActivePyModules.cc b/src/mgr/ActivePyModules.cc index cb635ab1221..81dbe30705c 100644 --- a/src/mgr/ActivePyModules.cc +++ b/src/mgr/ActivePyModules.cc @@ -60,7 +60,7 @@ void ActivePyModules::dump_server(const std::string &hostname, std::string ceph_version; for (const auto &i : dmc) { - Mutex::Locker l(i.second->lock); + std::lock_guard l(i.second->lock); const auto &key = i.first; const std::string &str_type = key.first; const std::string &svc_name = key.second; @@ -88,7 +88,7 @@ void ActivePyModules::dump_server(const std::string &hostname, PyObject *ActivePyModules::get_server_python(const std::string &hostname) { PyThreadState *tstate = PyEval_SaveThread(); - Mutex::Locker l(lock); + std::lock_guard l(lock); PyEval_RestoreThread(tstate); dout(10) << " (" << hostname << ")" << dendl; @@ -103,7 +103,7 @@ PyObject *ActivePyModules::get_server_python(const std::string &hostname) PyObject *ActivePyModules::list_servers_python() { PyThreadState *tstate = PyEval_SaveThread(); - Mutex::Locker l(lock); + std::lock_guard l(lock); PyEval_RestoreThread(tstate); dout(10) << " >" << dendl; @@ -132,7 +132,7 @@ PyObject *ActivePyModules::get_metadata_python( Py_RETURN_NONE; } - Mutex::Locker l(metadata->lock); + std::lock_guard l(metadata->lock); PyFormatter f; f.dump_string("hostname", metadata->hostname); for (const auto &i : metadata->metadata) { @@ -152,7 +152,7 @@ PyObject *ActivePyModules::get_daemon_status_python( Py_RETURN_NONE; } - Mutex::Locker l(metadata->lock); + std::lock_guard l(metadata->lock); PyFormatter f; for (const auto &i : metadata->service_status) { f.dump_string(i.first.c_str(), i.second); @@ -163,7 +163,7 @@ PyObject *ActivePyModules::get_daemon_status_python( PyObject *ActivePyModules::get_python(const std::string &what) { PyThreadState *tstate = PyEval_SaveThread(); - Mutex::Locker l(lock); + std::lock_guard l(lock); PyEval_RestoreThread(tstate); if (what == "fs_map") { @@ -219,7 +219,7 @@ PyObject *ActivePyModules::get_python(const std::string &what) PyFormatter f; auto dmc = daemon_state.get_by_service("osd"); for (const auto &i : dmc) { - Mutex::Locker l(i.second->lock); + std::lock_guard l(i.second->lock); f.open_object_section(i.first.second.c_str()); f.dump_string("hostname", i.second->hostname); for (const auto &j : i.second->metadata) { @@ -373,7 +373,7 @@ PyObject *ActivePyModules::get_python(const std::string &what) int ActivePyModules::start_one(PyModuleRef py_module) { - Mutex::Locker l(lock); + std::lock_guard l(lock); ceph_assert(modules.count(py_module->get_name()) == 0); @@ -396,7 +396,7 @@ int ActivePyModules::start_one(PyModuleRef py_module) void ActivePyModules::shutdown() { - Mutex::Locker locker(lock); + std::lock_guard locker(lock); // Signal modules to drop out of serve() and/or tear down resources for (auto &i : modules) { @@ -426,7 +426,7 @@ void ActivePyModules::shutdown() void ActivePyModules::notify_all(const std::string ¬ify_type, const std::string ¬ify_id) { - Mutex::Locker l(lock); + std::lock_guard l(lock); dout(10) << __func__ << ": notify_all " << notify_type << dendl; for (auto& i : modules) { @@ -441,7 +441,7 @@ void ActivePyModules::notify_all(const std::string ¬ify_type, void ActivePyModules::notify_all(const LogEntry &log_entry) { - Mutex::Locker l(lock); + std::lock_guard l(lock); dout(10) << __func__ << ": notify_all (clog)" << dendl; for (auto& i : modules) { @@ -462,7 +462,7 @@ bool ActivePyModules::get_store(const std::string &module_name, const std::string &key, std::string *val) const { PyThreadState *tstate = PyEval_SaveThread(); - Mutex::Locker l(lock); + std::lock_guard l(lock); PyEval_RestoreThread(tstate); const std::string global_key = PyModule::config_prefix @@ -496,7 +496,7 @@ bool ActivePyModules::get_config(const std::string &module_name, const std::string &key, std::string *val) const { PyThreadState *tstate = PyEval_SaveThread(); - Mutex::Locker l(lock); + std::lock_guard l(lock); PyEval_RestoreThread(tstate); const std::string global_key = PyModule::config_prefix @@ -504,7 +504,7 @@ bool ActivePyModules::get_config(const std::string &module_name, dout(4) << __func__ << " key: " << global_key << dendl; - Mutex::Locker lock(module_config.lock); + std::lock_guard lock(module_config.lock); auto i = module_config.config.find(global_key); if (i != module_config.config.end()) { @@ -519,7 +519,7 @@ PyObject *ActivePyModules::get_store_prefix(const std::string &module_name, const std::string &prefix) const { PyThreadState *tstate = PyEval_SaveThread(); - Mutex::Locker l(lock); + std::lock_guard l(lock); PyEval_RestoreThread(tstate); const std::string base_prefix = PyModule::config_prefix @@ -529,7 +529,7 @@ PyObject *ActivePyModules::get_store_prefix(const std::string &module_name, PyFormatter f; - Mutex::Locker lock(module_config.lock); + std::lock_guard lock(module_config.lock); for (auto p = store_cache.lower_bound(global_prefix); p != store_cache.end() && p->first.find(global_prefix) == 0; @@ -548,7 +548,7 @@ void ActivePyModules::set_store(const std::string &module_name, Command set_cmd; { PyThreadState *tstate = PyEval_SaveThread(); - Mutex::Locker l(lock); + std::lock_guard l(lock); PyEval_RestoreThread(tstate); if (val) { @@ -593,7 +593,7 @@ void ActivePyModules::set_config(const std::string &module_name, std::map ActivePyModules::get_services() const { std::map result; - Mutex::Locker l(lock); + std::lock_guard l(lock); for (const auto& i : modules) { const auto &module = i.second.get(); std::string svc_str = module->get_uri(); @@ -612,7 +612,7 @@ PyObject* ActivePyModules::with_perf_counters( const std::string &path) const { PyThreadState *tstate = PyEval_SaveThread(); - Mutex::Locker l(lock); + std::lock_guard l(lock); PyEval_RestoreThread(tstate); PyFormatter f; @@ -620,7 +620,7 @@ PyObject* ActivePyModules::with_perf_counters( auto metadata = daemon_state.get(DaemonKey(svc_name, svc_id)); if (metadata) { - Mutex::Locker l2(metadata->lock); + std::lock_guard l2(metadata->lock); if (metadata->perf_counters.instances.count(path)) { auto counter_instance = metadata->perf_counters.instances.at(path); auto counter_type = metadata->perf_counters.types.at(path); @@ -702,7 +702,7 @@ PyObject* ActivePyModules::get_perf_schema_python( const std::string &svc_id) { PyThreadState *tstate = PyEval_SaveThread(); - Mutex::Locker l(lock); + std::lock_guard l(lock); PyEval_RestoreThread(tstate); DaemonStateCollection daemons; @@ -730,7 +730,7 @@ PyObject* ActivePyModules::get_perf_schema_python( daemon_name << key.first << "." << key.second; f.open_object_section(daemon_name.str().c_str()); - Mutex::Locker l(state->lock); + std::lock_guard l(state->lock); for (auto ctr_inst_iter : state->perf_counters.instances) { const auto &counter_name = ctr_inst_iter.first; f.open_object_section(counter_name.c_str()); @@ -756,7 +756,7 @@ PyObject* ActivePyModules::get_perf_schema_python( PyObject *ActivePyModules::get_context() { PyThreadState *tstate = PyEval_SaveThread(); - Mutex::Locker l(lock); + std::lock_guard l(lock); PyEval_RestoreThread(tstate); // Construct a capsule containing ceph context. @@ -814,7 +814,7 @@ PyObject *construct_with_capsule( PyObject *ActivePyModules::get_osdmap() { PyThreadState *tstate = PyEval_SaveThread(); - Mutex::Locker l(lock); + std::lock_guard l(lock); PyEval_RestoreThread(tstate); OSDMap *newmap = new OSDMap; @@ -874,7 +874,7 @@ int ActivePyModules::handle_command( void ActivePyModules::get_health_checks(health_check_map_t *checks) { - Mutex::Locker l(lock); + std::lock_guard l(lock); for (auto& p : modules) { p.second->get_health_checks(checks); } @@ -883,7 +883,7 @@ void ActivePyModules::get_health_checks(health_check_map_t *checks) void ActivePyModules::set_uri(const std::string& module_name, const std::string &uri) { - Mutex::Locker l(lock); + std::lock_guard l(lock); dout(4) << " module " << module_name << " set URI '" << uri << "'" << dendl; @@ -908,7 +908,7 @@ void ActivePyModules::remove_osd_perf_query(OSDPerfMetricQueryID query_id) void ActivePyModules::cluster_log(const std::string &channel, clog_type prio, const std::string &message) { - Mutex::Locker l(lock); + std::lock_guard l(lock); if (channel == "audit") { audit_clog->do_log(prio, message); diff --git a/src/mgr/ClusterState.cc b/src/mgr/ClusterState.cc index 436b53f8f9d..ed741eeecf5 100644 --- a/src/mgr/ClusterState.cc +++ b/src/mgr/ClusterState.cc @@ -34,27 +34,27 @@ ClusterState::ClusterState( void ClusterState::set_objecter(Objecter *objecter_) { - Mutex::Locker l(lock); + std::lock_guard l(lock); objecter = objecter_; } void ClusterState::set_fsmap(FSMap const &new_fsmap) { - Mutex::Locker l(lock); + std::lock_guard l(lock); fsmap = new_fsmap; } void ClusterState::set_mgr_map(MgrMap const &new_mgrmap) { - Mutex::Locker l(lock); + std::lock_guard l(lock); mgr_map = new_mgrmap; } void ClusterState::set_service_map(ServiceMap const &new_service_map) { - Mutex::Locker l(lock); + std::lock_guard l(lock); servicemap = new_service_map; } @@ -66,7 +66,7 @@ void ClusterState::load_digest(MMgrDigest *m) void ClusterState::ingest_pgstats(MPGStats *stats) { - Mutex::Locker l(lock); + std::lock_guard l(lock); const int from = stats->get_orig_source().num(); @@ -135,7 +135,7 @@ void ClusterState::update_delta_stats() void ClusterState::notify_osdmap(const OSDMap &osd_map) { - Mutex::Locker l(lock); + std::lock_guard l(lock); pending_inc.stamp = ceph_clock_now(); pending_inc.version = pg_map.version + 1; // to make apply_incremental happy diff --git a/src/mgr/ClusterState.h b/src/mgr/ClusterState.h index a22c058dec7..69fc92bfd02 100644 --- a/src/mgr/ClusterState.h +++ b/src/mgr/ClusterState.h @@ -70,28 +70,28 @@ public: void notify_osdmap(const OSDMap &osd_map); bool have_fsmap() const { - Mutex::Locker l(lock); + std::lock_guard l(lock); return fsmap.get_epoch() > 0; } template void with_servicemap(Callback&& cb, Args&&...args) const { - Mutex::Locker l(lock); + std::lock_guard l(lock); std::forward(cb)(servicemap, std::forward(args)...); } template void with_fsmap(Callback&& cb, Args&&...args) const { - Mutex::Locker l(lock); + std::lock_guard l(lock); std::forward(cb)(fsmap, std::forward(args)...); } template void with_mgrmap(Callback&& cb, Args&&...args) const { - Mutex::Locker l(lock); + std::lock_guard l(lock); std::forward(cb)(mgr_map, std::forward(args)...); } @@ -99,7 +99,7 @@ public: auto with_pgmap(Callback&& cb, Args&&...args) const -> decltype(cb(pg_map, std::forward(args)...)) { - Mutex::Locker l(lock); + std::lock_guard l(lock); return std::forward(cb)(pg_map, std::forward(args)...); } @@ -107,14 +107,14 @@ public: auto with_mutable_pgmap(Callback&& cb, Args&&...args) -> decltype(cb(pg_map, std::forward(args)...)) { - Mutex::Locker l(lock); + std::lock_guard l(lock); return std::forward(cb)(pg_map, std::forward(args)...); } template void with_monmap(Args &&... args) const { - Mutex::Locker l(lock); + std::lock_guard l(lock); ceph_assert(monc != nullptr); monc->with_monmap(std::forward(args)...); } diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index 3fbf791b69e..e9373bbea72 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -147,7 +147,7 @@ int DaemonServer::init(uint64_t gid, entity_addrvec_t client_addrs) started_at = ceph_clock_now(); - Mutex::Locker l(lock); + std::lock_guard l(lock); timer.init(); schedule_tick_locked( @@ -207,7 +207,7 @@ int DaemonServer::ms_handle_authentication(Connection *con) } if (con->get_peer_type() == CEPH_ENTITY_TYPE_OSD) { - Mutex::Locker l(lock); + std::lock_guard l(lock); s->osd_id = atoi(s->entity_name.get_id().c_str()); dout(10) << "registering osd." << s->osd_id << " session " << s << " con " << con << dendl; @@ -244,7 +244,7 @@ bool DaemonServer::ms_handle_reset(Connection *con) if (!session) { return false; } - Mutex::Locker l(lock); + std::lock_guard l(lock); dout(10) << "unregistering osd." << session->osd_id << " session " << session << " con " << con << dendl; osd_cons[session->osd_id].erase(con); @@ -294,7 +294,7 @@ void DaemonServer::maybe_ready(int32_t osd_id) // Fast path: we don't need to take lock because pgmap_ready // is already set } else { - Mutex::Locker l(lock); + std::lock_guard l(lock); if (reported_osds.find(osd_id) == reported_osds.end()) { dout(4) << "initial report from osd " << osd_id << dendl; @@ -360,7 +360,7 @@ void DaemonServer::schedule_tick_locked(double delay_sec) void DaemonServer::schedule_tick(double delay_sec) { - Mutex::Locker l(lock); + std::lock_guard l(lock); schedule_tick_locked(delay_sec); } @@ -371,7 +371,7 @@ void DaemonServer::handle_osd_perf_metric_query_updated() // Send a fresh MMgrConfigure to all clients, so that they can follow // the new policy for transmitting stats finisher.queue(new FunctionContext([this](int r) { - Mutex::Locker l(lock); + std::lock_guard l(lock); for (auto &c : daemon_connections) { if (c->peer_is_osd()) { _send_configure(c); @@ -387,7 +387,7 @@ void DaemonServer::shutdown() msgr->wait(); dout(10) << "done" << dendl; - Mutex::Locker l(lock); + std::lock_guard l(lock); shutting_down = true; timer.shutdown(); } @@ -419,7 +419,7 @@ static bool key_from_string( bool DaemonServer::handle_open(MMgrOpen *m) { - Mutex::Locker l(lock); + std::lock_guard l(lock); DaemonKey key = key_from_service(m->service_name, m->get_connection()->get_peer_type(), @@ -445,7 +445,7 @@ bool DaemonServer::handle_open(MMgrOpen *m) } if (daemon) { dout(20) << "updating existing DaemonState for " << m->daemon_name << dendl; - Mutex::Locker l(daemon->lock); + std::lock_guard l(daemon->lock); daemon->perf_counters.clear(); if (m->service_daemon) { @@ -494,7 +494,7 @@ bool DaemonServer::handle_open(MMgrOpen *m) bool DaemonServer::handle_close(MMgrClose *m) { - Mutex::Locker l(lock); + std::lock_guard l(lock); DaemonKey key = key_from_service(m->service_name, m->get_connection()->get_peer_type(), @@ -505,7 +505,7 @@ bool DaemonServer::handle_close(MMgrClose *m) DaemonStatePtr daemon = daemon_state.get(key); daemon_state.rm(key); { - Mutex::Locker l(daemon->lock); + std::lock_guard l(daemon->lock); if (daemon->service_daemon) { pending_service_map.rm_daemon(m->service_name, m->daemon_name); pending_service_map_dirty = pending_service_map.epoch; @@ -574,7 +574,7 @@ bool DaemonServer::handle_report(MMgrReport *m) } { - Mutex::Locker l(lock); + std::lock_guard l(lock); // kill session auto priv = m->get_connection()->get_priv(); auto session = static_cast(priv.get()); @@ -602,7 +602,7 @@ bool DaemonServer::handle_report(MMgrReport *m) // Update the DaemonState ceph_assert(daemon != nullptr); { - Mutex::Locker l(daemon->lock); + std::lock_guard l(daemon->lock); auto &daemon_counters = daemon->perf_counters; daemon_counters.update(m); @@ -778,7 +778,7 @@ public: bool DaemonServer::handle_command(MCommand *m) { - Mutex::Locker l(lock); + std::lock_guard l(lock); std::shared_ptr cmdctx = std::make_shared(m); try { return _handle_command(m, cmdctx); @@ -911,7 +911,7 @@ bool DaemonServer::_handle_command( DaemonKey key(p.first, q.first); ceph_assert(daemon_state.exists(key)); auto daemon = daemon_state.get(key); - Mutex::Locker l(daemon->lock); + std::lock_guard l(daemon->lock); f->dump_stream("status_stamp") << daemon->service_status_stamp; f->dump_stream("last_beacon") << daemon->last_service_beacon; f->open_object_section("status"); @@ -1608,7 +1608,7 @@ bool DaemonServer::_handle_command( } } } else if (daemon->config_defaults_bl.length() > 0) { - Mutex::Locker l(daemon->lock); + std::lock_guard l(daemon->lock); TextTable tbl; if (f) { f->open_array_section("config"); @@ -2110,7 +2110,7 @@ void DaemonServer::_prune_pending_service_map() continue; } auto daemon = daemon_state.get(key); - Mutex::Locker l(daemon->lock); + std::lock_guard l(daemon->lock); if (daemon->last_service_beacon == utime_t()) { // we must have just restarted; assume they are alive now. daemon->last_service_beacon = ceph_clock_now(); @@ -2190,7 +2190,7 @@ void DaemonServer::send_report() for (auto service : {"osd", "mon"} ) { auto daemons = daemon_state.get_by_service(service); for (const auto& [key,state] : daemons) { - Mutex::Locker l{state->lock}; + std::lock_guard l{state->lock}; for (const auto& metric : state->daemon_health_metrics) { auto acc = accumulated.find(metric.get_type()); if (acc == accumulated.end()) { @@ -2408,7 +2408,7 @@ void DaemonServer::adjust_pgs() void DaemonServer::got_service_map() { - Mutex::Locker l(lock); + std::lock_guard l(lock); cluster_state.with_servicemap([&](const ServiceMap& service_map) { if (pending_service_map.epoch == 0) { @@ -2447,7 +2447,7 @@ void DaemonServer::got_service_map() void DaemonServer::got_mgr_map() { - Mutex::Locker l(lock); + std::lock_guard l(lock); set have; cluster_state.with_mgrmap([&](const MgrMap& mgrmap) { auto md_update = [&] (DaemonKey key) { diff --git a/src/mgr/DaemonState.h b/src/mgr/DaemonState.h index 5732178390a..f706aab3080 100644 --- a/src/mgr/DaemonState.h +++ b/src/mgr/DaemonState.h @@ -333,7 +333,7 @@ public: std::set *ls) { auto m = get_by_server(server); for (auto& i : m) { - Mutex::Locker l(i.second->lock); + std::lock_guard l(i.second->lock); for (auto& j : i.second->devices) { ls->insert(j.first); } diff --git a/src/mgr/Mgr.cc b/src/mgr/Mgr.cc index 329a1ade2d1..d6b57b9d283 100644 --- a/src/mgr/Mgr.cc +++ b/src/mgr/Mgr.cc @@ -94,7 +94,7 @@ void MetadataUpdate::finish(int r) DaemonStatePtr state; if (daemon_state.exists(key)) { state = daemon_state.get(key); - Mutex::Locker l(state->lock); + std::lock_guard l(state->lock); if (key.first == "mds" || key.first == "mgr") { daemon_meta.erase("name"); } else if (key.first == "osd") { @@ -139,7 +139,7 @@ void MetadataUpdate::finish(int r) void Mgr::background_init(Context *completion) { - Mutex::Locker l(lock); + std::lock_guard l(lock); ceph_assert(!initializing); ceph_assert(!initialized); initializing = true; @@ -214,7 +214,7 @@ std::map Mgr::load_store() void Mgr::init() { - Mutex::Locker l(lock); + std::lock_guard l(lock); ceph_assert(initializing); ceph_assert(!initialized); @@ -389,7 +389,7 @@ void Mgr::shutdown() { finisher.queue(new FunctionContext([&](int) { { - Mutex::Locker l(lock); + std::lock_guard l(lock); monc->sub_unwant("log-info"); monc->sub_unwant("mgrdigest"); monc->sub_unwant("fsmap"); @@ -436,7 +436,7 @@ void Mgr::handle_osd_map() if (daemon_state.exists(k)) { auto metadata = daemon_state.get(k); - Mutex::Locker l(metadata->lock); + std::lock_guard l(metadata->lock); auto addr_iter = metadata->metadata.find("front_addr"); if (addr_iter != metadata->metadata.end()) { const std::string &metadata_addr = addr_iter->second; @@ -496,7 +496,7 @@ void Mgr::handle_service_map(MServiceMap *m) bool Mgr::ms_dispatch(Message *m) { dout(4) << *m << dendl; - Mutex::Locker l(lock); + std::lock_guard l(lock); switch (m->get_type()) { case MSG_MGR_DIGEST: @@ -573,7 +573,7 @@ void Mgr::handle_fs_map(MFSMap* m) bool update = false; if (daemon_state.exists(k)) { auto metadata = daemon_state.get(k); - Mutex::Locker l(metadata->lock); + std::lock_guard l(metadata->lock); if (metadata->metadata.empty() || metadata->metadata.count("addr") == 0) { update = true; @@ -610,7 +610,7 @@ void Mgr::handle_fs_map(MFSMap* m) bool Mgr::got_mgr_map(const MgrMap& m) { - Mutex::Locker l(lock); + std::lock_guard l(lock); dout(10) << m << dendl; set old_modules; @@ -652,7 +652,7 @@ void Mgr::handle_mgr_digest(MMgrDigest* m) std::map Mgr::get_services() const { - Mutex::Locker l(lock); + std::lock_guard l(lock); return py_module_registry->get_services(); } diff --git a/src/mgr/MgrClient.cc b/src/mgr/MgrClient.cc index c436bb9fee1..4bddbe2a19c 100644 --- a/src/mgr/MgrClient.cc +++ b/src/mgr/MgrClient.cc @@ -39,7 +39,7 @@ MgrClient::MgrClient(CephContext *cct_, Messenger *msgr_) void MgrClient::init() { - Mutex::Locker l(lock); + std::lock_guard l(lock); ceph_assert(msgr != nullptr); @@ -48,7 +48,7 @@ void MgrClient::init() void MgrClient::shutdown() { - Mutex::Locker l(lock); + std::lock_guard l(lock); ldout(cct, 10) << dendl; if (connect_retry_callback) { @@ -83,7 +83,7 @@ void MgrClient::shutdown() bool MgrClient::ms_dispatch(Message *m) { - Mutex::Locker l(lock); + std::lock_guard l(lock); switch(m->get_type()) { case MSG_MGR_MAP: @@ -219,7 +219,7 @@ bool MgrClient::handle_mgr_map(MMgrMap *m) bool MgrClient::ms_handle_reset(Connection *con) { - Mutex::Locker l(lock); + std::lock_guard l(lock); if (session && con == session->con) { ldout(cct, 4) << __func__ << " con " << con << dendl; reconnect(); @@ -359,7 +359,7 @@ void MgrClient::_send_report() void MgrClient::send_pgstats() { - Mutex::Locker l(lock); + std::lock_guard l(lock); _send_pgstats(); } @@ -415,7 +415,7 @@ int MgrClient::start_command(const vector& cmd, const bufferlist& inbl, bufferlist *outbl, string *outs, Context *onfinish) { - Mutex::Locker l(lock); + std::lock_guard l(lock); ldout(cct, 20) << "cmd: " << cmd << dendl; @@ -479,7 +479,7 @@ int MgrClient::service_daemon_register( const std::string& name, const std::map& metadata) { - Mutex::Locker l(lock); + std::lock_guard l(lock); if (service == "osd" || service == "mds" || service == "client" || @@ -509,7 +509,7 @@ int MgrClient::service_daemon_register( int MgrClient::service_daemon_update_status( std::map&& status) { - Mutex::Locker l(lock); + std::lock_guard l(lock); ldout(cct,10) << status << dendl; daemon_status = std::move(status); daemon_dirty_status = true; @@ -518,7 +518,7 @@ int MgrClient::service_daemon_update_status( void MgrClient::update_daemon_health(std::vector&& metrics) { - Mutex::Locker l(lock); + std::lock_guard l(lock); daemon_health_metrics = std::move(metrics); } diff --git a/src/mgr/MgrClient.h b/src/mgr/MgrClient.h index ffeb586450a..5b561d26170 100644 --- a/src/mgr/MgrClient.h +++ b/src/mgr/MgrClient.h @@ -124,7 +124,7 @@ public: std::function cb_get) { - Mutex::Locker l(lock); + std::lock_guard l(lock); set_perf_queries_cb = cb_set; get_perf_report_cb = cb_get; } @@ -133,7 +133,7 @@ public: void send_pgstats(); void set_pgstats_cb(std::function&& cb_) { - Mutex::Locker l(lock); + std::lock_guard l(lock); pgstats_cb = std::move(cb_); } diff --git a/src/mgr/MgrStandby.cc b/src/mgr/MgrStandby.cc index da358d868fb..9265c4ff1d5 100644 --- a/src/mgr/MgrStandby.cc +++ b/src/mgr/MgrStandby.cc @@ -105,7 +105,7 @@ int MgrStandby::init() init_async_signal_handler(); register_async_signal_handler(SIGHUP, sighup_handler); - Mutex::Locker l(lock); + std::lock_guard l(lock); // Initialize Messenger client_messenger->add_dispatcher_tail(this); @@ -248,7 +248,7 @@ void MgrStandby::tick() void MgrStandby::handle_signal(int signum) { - Mutex::Locker l(lock); + std::lock_guard l(lock); ceph_assert(signum == SIGINT || signum == SIGTERM); derr << "*** Got signal " << sig_str(signum) << " ***" << dendl; shutdown(); @@ -372,7 +372,7 @@ void MgrStandby::handle_mgr_map(MMgrMap* mmap) [this](int r){ // Advertise our active-ness ASAP instead of waiting for // next tick. - Mutex::Locker l(lock); + std::lock_guard l(lock); send_beacon(); })); dout(1) << "I am now activating" << dendl; @@ -404,7 +404,7 @@ void MgrStandby::handle_mgr_map(MMgrMap* mmap) bool MgrStandby::ms_dispatch(Message *m) { - Mutex::Locker l(lock); + std::lock_guard l(lock); dout(4) << state_str() << " " << *m << dendl; if (m->get_type() == MSG_MGR_MAP) { diff --git a/src/mgr/OSDPerfMetricCollector.cc b/src/mgr/OSDPerfMetricCollector.cc index ca28bcca845..6c4354d7abe 100644 --- a/src/mgr/OSDPerfMetricCollector.cc +++ b/src/mgr/OSDPerfMetricCollector.cc @@ -16,7 +16,7 @@ OSDPerfMetricCollector::OSDPerfMetricCollector(Listener &listener) } std::list OSDPerfMetricCollector::get_queries() { - Mutex::Locker locker(lock); + std::lock_guard locker(lock); std::list query_list; for (auto &it : queries) { @@ -31,7 +31,7 @@ int OSDPerfMetricCollector::add_query(const OSDPerfMetricQuery& query) { bool notify = false; { - Mutex::Locker locker(lock); + std::lock_guard locker(lock); query_id = next_query_id++; auto it = queries.find(query); @@ -56,7 +56,7 @@ int OSDPerfMetricCollector::remove_query(int query_id) { bool notify = false; { - Mutex::Locker locker(lock); + std::lock_guard locker(lock); for (auto it = queries.begin() ; it != queries.end(); it++) { auto &ids = it->second; @@ -92,7 +92,7 @@ void OSDPerfMetricCollector::remove_all_queries() { bool notify; { - Mutex::Locker locker(lock); + std::lock_guard locker(lock); notify = !queries.empty(); queries.clear(); diff --git a/src/mgr/PyModule.cc b/src/mgr/PyModule.cc index cd97f4b5286..9838bbff7c2 100644 --- a/src/mgr/PyModule.cc +++ b/src/mgr/PyModule.cc @@ -145,7 +145,7 @@ void PyModuleConfig::set_config( const std::string global_key = PyModule::config_prefix + module_name + "/" + key; { - Mutex::Locker l(lock); + std::lock_guard l(lock); if (val) { config[global_key] = *val; @@ -534,7 +534,7 @@ int PyModule::load_options() bool PyModule::is_option(const std::string &option_name) { - Mutex::Locker l(lock); + std::lock_guard l(lock); return options.count(option_name) > 0; } diff --git a/src/mgr/PyModule.h b/src/mgr/PyModule.h index db5c501d375..84d3a6f62f0 100644 --- a/src/mgr/PyModule.h +++ b/src/mgr/PyModule.h @@ -131,7 +131,7 @@ public: */ void get_commands(std::vector *out) const { - Mutex::Locker l(lock); + std::lock_guard l(lock); ceph_assert(out != nullptr); out->insert(out->end(), commands.begin(), commands.end()); } @@ -143,28 +143,28 @@ public: */ void fail(const std::string &reason) { - Mutex::Locker l(lock); + std::lock_guard l(lock); failed = true; error_string = reason; } bool is_enabled() const { - Mutex::Locker l(lock); + std::lock_guard l(lock); return enabled || always_on; } - bool is_failed() const { Mutex::Locker l(lock) ; return failed; } - bool is_loaded() const { Mutex::Locker l(lock) ; return loaded; } - bool is_always_on() const { Mutex::Locker l(lock) ; return always_on; } + bool is_failed() const { std::lock_guard l(lock) ; return failed; } + bool is_loaded() const { std::lock_guard l(lock) ; return loaded; } + bool is_always_on() const { std::lock_guard l(lock) ; return always_on; } const std::string &get_name() const { - Mutex::Locker l(lock) ; return module_name; + std::lock_guard l(lock) ; return module_name; } const std::string &get_error_string() const { - Mutex::Locker l(lock) ; return error_string; + std::lock_guard l(lock) ; return error_string; } bool get_can_run() const { - Mutex::Locker l(lock) ; return can_run; + std::lock_guard l(lock) ; return can_run; } }; diff --git a/src/mgr/PyModuleRegistry.cc b/src/mgr/PyModuleRegistry.cc index b95b482dd24..7696fb02eb6 100644 --- a/src/mgr/PyModuleRegistry.cc +++ b/src/mgr/PyModuleRegistry.cc @@ -36,7 +36,7 @@ void PyModuleRegistry::init() { - Mutex::Locker locker(lock); + std::lock_guard locker(lock); // Set up global python interpreter #if PY_MAJOR_VERSION >= 3 @@ -97,7 +97,7 @@ void PyModuleRegistry::init() bool PyModuleRegistry::handle_mgr_map(const MgrMap &mgr_map_) { - Mutex::Locker l(lock); + std::lock_guard l(lock); if (mgr_map.epoch == 0) { mgr_map = mgr_map_; @@ -130,7 +130,7 @@ bool PyModuleRegistry::handle_mgr_map(const MgrMap &mgr_map_) void PyModuleRegistry::standby_start(MonClient &mc) { - Mutex::Locker l(lock); + std::lock_guard l(lock); ceph_assert(active_modules == nullptr); ceph_assert(standby_modules == nullptr); @@ -182,7 +182,7 @@ void PyModuleRegistry::active_start( Objecter &objecter_, Client &client_, Finisher &f, DaemonServer &server) { - Mutex::Locker locker(lock); + std::lock_guard locker(lock); dout(4) << "Starting modules in active mode" << dendl; @@ -219,7 +219,7 @@ void PyModuleRegistry::active_start( void PyModuleRegistry::active_shutdown() { - Mutex::Locker locker(lock); + std::lock_guard locker(lock); if (active_modules != nullptr) { active_modules->shutdown(); @@ -229,7 +229,7 @@ void PyModuleRegistry::active_shutdown() void PyModuleRegistry::shutdown() { - Mutex::Locker locker(lock); + std::lock_guard locker(lock); if (standby_modules != nullptr) { standby_modules->shutdown(); @@ -311,7 +311,7 @@ int PyModuleRegistry::handle_command( std::vector PyModuleRegistry::get_py_commands() const { - Mutex::Locker l(lock); + std::lock_guard l(lock); std::vector result; for (const auto& i : modules) { @@ -338,7 +338,7 @@ std::vector PyModuleRegistry::get_commands() const void PyModuleRegistry::get_health_checks(health_check_map_t *checks) { - Mutex::Locker l(lock); + std::lock_guard l(lock); // Only the active mgr reports module issues if (active_modules) { @@ -412,7 +412,7 @@ void PyModuleRegistry::get_health_checks(health_check_map_t *checks) void PyModuleRegistry::handle_config(const std::string &k, const std::string &v) { - Mutex::Locker l(module_config.lock); + std::lock_guard l(module_config.lock); if (!v.empty()) { dout(4) << "Loaded module_config entry " << k << ":" << v << dendl; diff --git a/src/mgr/PyModuleRegistry.h b/src/mgr/PyModuleRegistry.h index 7e2ae5062d5..d0cbe1881a9 100644 --- a/src/mgr/PyModuleRegistry.h +++ b/src/mgr/PyModuleRegistry.h @@ -68,7 +68,7 @@ public: */ std::list get_modules() const { - Mutex::Locker l(lock); + std::lock_guard l(lock); std::list modules_out; for (const auto &i : modules) { modules_out.push_back(i.second); @@ -117,7 +117,7 @@ public: */ PyModuleRef get_module(const std::string &module_name) { - Mutex::Locker l(lock); + std::lock_guard l(lock); return modules.at(module_name); } diff --git a/src/mgr/StandbyPyModules.cc b/src/mgr/StandbyPyModules.cc index f2d1eeb45b8..0682a268119 100644 --- a/src/mgr/StandbyPyModules.cc +++ b/src/mgr/StandbyPyModules.cc @@ -46,7 +46,7 @@ StandbyPyModules::StandbyPyModules( // FIXME: completely identical to ActivePyModules void StandbyPyModules::shutdown() { - Mutex::Locker locker(lock); + std::lock_guard locker(lock); // Signal modules to drop out of serve() and/or tear down resources for (auto &i : modules) { @@ -74,7 +74,7 @@ void StandbyPyModules::shutdown() int StandbyPyModules::start_one(PyModuleRef py_module) { - Mutex::Locker l(lock); + std::lock_guard l(lock); const std::string &module_name = py_module->get_name(); ceph_assert(modules.count(module_name) == 0); diff --git a/src/mgr/StandbyPyModules.h b/src/mgr/StandbyPyModules.h index f443ba67e79..02d26800cd1 100644 --- a/src/mgr/StandbyPyModules.h +++ b/src/mgr/StandbyPyModules.h @@ -46,7 +46,7 @@ public: void set_mgr_map(const MgrMap &mgr_map_) { - Mutex::Locker l(lock); + std::lock_guard l(lock); mgr_map = mgr_map_; } @@ -58,14 +58,14 @@ public: template void with_mgr_map(Callback&& cb, Args&&...args) const { - Mutex::Locker l(lock); + std::lock_guard l(lock); std::forward(cb)(mgr_map, std::forward(args)...); } template auto with_config(Callback&& cb, Args&&... args) const -> decltype(cb(module_config, std::forward(args)...)) { - Mutex::Locker l(lock); + std::lock_guard l(lock); return std::forward(cb)(module_config, std::forward(args)...); } -- 2.39.5