From 2a75332505e59036664e31e2963525f20553df7f Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Sun, 14 Apr 2019 13:18:00 +0800 Subject: [PATCH] src/: use ref_t instead of Message::ref Signed-off-by: Kefu Chai --- src/client/Client.cc | 2 +- src/client/MetaSession.h | 2 +- src/mds/Beacon.cc | 4 +-- src/mds/Beacon.h | 4 +-- src/mds/CInode.cc | 2 +- src/mds/CInode.h | 2 +- src/mds/Locker.cc | 22 +++++++-------- src/mds/Locker.h | 6 ++-- src/mds/MDCache.cc | 36 ++++++++++++------------ src/mds/MDCache.h | 12 ++++---- src/mds/MDSDaemon.cc | 2 +- src/mds/MDSDaemon.h | 2 +- src/mds/MDSTableServer.cc | 2 +- src/mds/MDSTableServer.h | 2 +- src/mds/Server.cc | 24 ++++++++-------- src/mds/Server.h | 10 +++---- src/mds/SessionMap.h | 2 +- src/mds/journal.cc | 2 +- src/msg/DispatchQueue.cc | 18 ++++++------ src/msg/Message.cc | 2 +- src/msg/Messenger.h | 10 +++---- src/tools/ceph-dencoder/ceph_dencoder.cc | 6 ++-- 22 files changed, 87 insertions(+), 87 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 96f683bcc46..4499cb19487 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -2249,7 +2249,7 @@ void Client::send_request(MetaRequest *request, MetaSession *session, session->con->send_message2(std::move(r)); } -MClientRequest::ref Client::build_client_request(MetaRequest *request) +ref_t Client::build_client_request(MetaRequest *request) { auto req = MClientRequest::create(request->get_op()); req->set_tid(request->tid); diff --git a/src/client/MetaSession.h b/src/client/MetaSession.h index af2d7acd764..958d0bd96c1 100644 --- a/src/client/MetaSession.h +++ b/src/client/MetaSession.h @@ -54,7 +54,7 @@ struct MetaSession { std::set flushing_caps_tids; std::set early_flushing_caps; - MClientCapRelease::ref release; + ceph::ref_t release; MetaSession(mds_rank_t mds_num, ConnectionRef con, const entity_addrvec_t& addrs) diff --git a/src/mds/Beacon.cc b/src/mds/Beacon.cc index 285ca5b3b60..e08bf3ee4d0 100644 --- a/src/mds/Beacon.cc +++ b/src/mds/Beacon.cc @@ -92,13 +92,13 @@ bool Beacon::ms_can_fast_dispatch2(const cref_t& m) const return m->get_type() == MSG_MDS_BEACON; } -void Beacon::ms_fast_dispatch2(const Message::ref& m) +void Beacon::ms_fast_dispatch2(const ref_t& m) { bool handled = ms_dispatch2(m); ceph_assert(handled); } -bool Beacon::ms_dispatch2(const Message::ref& m) +bool Beacon::ms_dispatch2(const ref_t& m) { if (m->get_type() == MSG_MDS_BEACON) { if (m->get_connection()->get_peer_type() == CEPH_ENTITY_TYPE_MON) { diff --git a/src/mds/Beacon.h b/src/mds/Beacon.h index 18353c6c693..a7382783f45 100644 --- a/src/mds/Beacon.h +++ b/src/mds/Beacon.h @@ -53,8 +53,8 @@ public: bool ms_can_fast_dispatch_any() const override { return true; } bool ms_can_fast_dispatch2(const cref_t& m) const override; - void ms_fast_dispatch2(const Message::ref& m) override; - bool ms_dispatch2(const Message::ref &m) override; + void ms_fast_dispatch2(const ref_t& m) override; + bool ms_dispatch2(const ref_t &m) override; void ms_handle_connect(Connection *c) override {} bool ms_handle_reset(Connection *c) override {return false;} void ms_handle_remote_reset(Connection *c) override {} diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index c0f812a766c..d16d29f3344 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -3686,7 +3686,7 @@ int CInode::encode_inodestat(bufferlist& bl, Session *session, return valid; } -void CInode::encode_cap_message(const MClientCaps::ref &m, Capability *cap) +void CInode::encode_cap_message(const ref_t &m, Capability *cap) { ceph_assert(cap); diff --git a/src/mds/CInode.h b/src/mds/CInode.h index 31c71e5ef9e..fd092d68225 100644 --- a/src/mds/CInode.h +++ b/src/mds/CInode.h @@ -891,7 +891,7 @@ public: int encode_inodestat(bufferlist& bl, Session *session, SnapRealm *realm, snapid_t snapid=CEPH_NOSNAP, unsigned max_bytes=0, int getattr_wants=0); - void encode_cap_message(const MClientCaps::ref &m, Capability *cap); + void encode_cap_message(const ref_t &m, Capability *cap); // -- locks -- diff --git a/src/mds/Locker.cc b/src/mds/Locker.cc index db86ee0d2e9..00a8e317165 100644 --- a/src/mds/Locker.cc +++ b/src/mds/Locker.cc @@ -1805,10 +1805,10 @@ class C_Locker_FileUpdate_finish : public LockerLogContext { MutationRef mut; unsigned flags; client_t client; - MClientCaps::ref ack; + ref_t ack; public: C_Locker_FileUpdate_finish(Locker *l, CInode *i, MutationRef& m, unsigned f, - const MClientCaps::ref &ack, client_t c=-1) + const ref_t &ack, client_t c=-1) : LockerLogContext(l), in(i), mut(m), flags(f), client(c), ack(ack) { in->get(CInode::PIN_PTRWAITER); } @@ -1825,7 +1825,7 @@ enum { }; void Locker::file_update_finish(CInode *in, MutationRef& mut, unsigned flags, - client_t client, const MClientCaps::ref &ack) + client_t client, const ref_t &ack) { dout(10) << "file_update_finish on " << *in << dendl; in->pop_and_dirty_projected_inode(mut->ls); @@ -2466,7 +2466,7 @@ bool Locker::check_inode_max_size(CInode *in, bool force_wrlock, mdcache->journal_dirty_inode(mut.get(), metablob, in); } mds->mdlog->submit_entry(le, new C_Locker_FileUpdate_finish(this, in, mut, - UPDATE_SHAREMAX, MClientCaps::ref())); + UPDATE_SHAREMAX, ref_t())); wrlock_force(&in->filelock, mut); // wrlock for duration of journal mut->auth_pin(in); @@ -2634,7 +2634,7 @@ void Locker::_do_null_snapflush(CInode *head_in, client_t client, snapid_t last) CInode *sin = mdcache->pick_inode_snap(head_in, snapid - 1); ceph_assert(sin); ceph_assert(sin->first <= snapid); - _do_snap_update(sin, snapid, 0, sin->first - 1, client, MClientCaps::ref(), MClientCaps::ref()); + _do_snap_update(sin, snapid, 0, sin->first - 1, client, ref_t(), ref_t()); head_in->remove_need_snapflush(sin, snapid, client); } } @@ -2697,7 +2697,7 @@ void Locker::handle_client_caps(const cref_t &m) session->have_completed_flush(m->get_client_tid())) { dout(7) << "handle_client_caps already flushed tid " << m->get_client_tid() << " for client." << client << dendl; - MClientCaps::ref ack; + ref_t ack; if (op == CEPH_CAP_OP_FLUSHSNAP) { ack = MClientCaps::create(CEPH_CAP_OP_FLUSHSNAP_ACK, m->get_ino(), 0, 0, 0, 0, 0, dirty, 0, mds->get_osd_epoch_barrier()); } else { @@ -2821,7 +2821,7 @@ void Locker::handle_client_caps(const cref_t &m) // we can prepare the ack now, since this FLUSHEDSNAP is independent of any // other cap ops. (except possibly duplicate FLUSHSNAP requests, but worst // case we get a dup response, so whatever.) - MClientCaps::ref ack; + ref_t ack; if (dirty) { ack = MClientCaps::create(CEPH_CAP_OP_FLUSHSNAP_ACK, in->ino(), 0, 0, 0, 0, 0, dirty, 0, mds->get_osd_epoch_barrier()); ack->set_snap_follows(follows); @@ -2862,14 +2862,14 @@ void Locker::handle_client_caps(const cref_t &m) ceph_assert(in->last != CEPH_NOSNAP); if (in->is_auth() && dirty) { dout(10) << " updating intermediate snapped inode " << *in << dendl; - _do_cap_update(in, NULL, dirty, follows, m, MClientCaps::ref()); + _do_cap_update(in, NULL, dirty, follows, m, ref_t()); } in = mdcache->pick_inode_snap(head_in, in->last); } } // head inode, and cap - MClientCaps::ref ack; + ref_t ack; int caps = m->get_caps(); if (caps & ~cap->issued()) { @@ -3110,7 +3110,7 @@ void Locker::kick_cap_releases(MDRequestRef& mdr) /** * m and ack might be NULL, so don't dereference them unless dirty != 0 */ -void Locker::_do_snap_update(CInode *in, snapid_t snap, int dirty, snapid_t follows, client_t client, const cref_t &m, const MClientCaps::ref &ack) +void Locker::_do_snap_update(CInode *in, snapid_t snap, int dirty, snapid_t follows, client_t client, const cref_t &m, const ref_t &ack) { dout(10) << "_do_snap_update dirty " << ccap_string(dirty) << " follows " << follows << " snap " << snap @@ -3301,7 +3301,7 @@ void Locker::_update_cap_fields(CInode *in, int dirty, const cref_t */ bool Locker::_do_cap_update(CInode *in, Capability *cap, int dirty, snapid_t follows, - const cref_t &m, const MClientCaps::ref &ack, + const cref_t &m, const ref_t &ack, bool *need_flush) { dout(10) << "_do_cap_update dirty " << ccap_string(dirty) diff --git a/src/mds/Locker.h b/src/mds/Locker.h index 4252f4d1b57..de45423b53f 100644 --- a/src/mds/Locker.h +++ b/src/mds/Locker.h @@ -191,10 +191,10 @@ protected: void adjust_cap_wanted(Capability *cap, int wanted, int issue_seq); void handle_client_caps(const cref_t &m); void _update_cap_fields(CInode *in, int dirty, const cref_t &m, CInode::mempool_inode *pi); - void _do_snap_update(CInode *in, snapid_t snap, int dirty, snapid_t follows, client_t client, const cref_t &m, const MClientCaps::ref &ack); + void _do_snap_update(CInode *in, snapid_t snap, int dirty, snapid_t follows, client_t client, const cref_t &m, const ref_t &ack); void _do_null_snapflush(CInode *head_in, client_t client, snapid_t last=CEPH_NOSNAP); bool _do_cap_update(CInode *in, Capability *cap, int dirty, snapid_t follows, const cref_t &m, - const MClientCaps::ref &ack, bool *need_flush=NULL); + const ref_t &ack, bool *need_flush=NULL); void handle_client_cap_release(const cref_t &m); void _do_cap_release(client_t client, inodeno_t ino, uint64_t cap_id, ceph_seq_t mseq, ceph_seq_t seq); void caps_tick(); @@ -253,7 +253,7 @@ protected: void handle_inode_file_caps(const cref_t &m); void file_update_finish(CInode *in, MutationRef& mut, unsigned flags, - client_t client, const MClientCaps::ref &ack); + client_t client, const ref_t &ack); private: uint64_t calc_new_max_size(CInode::mempool_inode *pi, uint64_t size); public: diff --git a/src/mds/MDCache.cc b/src/mds/MDCache.cc index 70fcf64fb6f..464e25d67b9 100644 --- a/src/mds/MDCache.cc +++ b/src/mds/MDCache.cc @@ -2660,7 +2660,7 @@ void MDCache::send_slave_resolves() { dout(10) << "send_slave_resolves" << dendl; - map resolves; + map> resolves; if (mds->is_resolve()) { for (map >::iterator p = uncommitted_slave_updates.begin(); @@ -2727,7 +2727,7 @@ void MDCache::send_subtree_resolves() return; // not now } - map resolves; + map> resolves; for (set::iterator p = recovery_set.begin(); p != recovery_set.end(); ++p) { @@ -2810,7 +2810,7 @@ void MDCache::send_subtree_resolves() // send for (auto &p : resolves) { - const MMDSResolve::ref &m = p.second; + const ref_t &m = p.second; if (mds->is_resolve()) { m->add_table_commits(TABLE_SNAP, resolve_snapclient_commits); } else { @@ -3911,7 +3911,7 @@ void MDCache::rejoin_send_rejoins() disambiguate_other_imports(); } - map rejoins; + map> rejoins; // if i am rejoining, send a rejoin to everyone. @@ -4049,7 +4049,7 @@ void MDCache::rejoin_send_rejoins() if (!q.first->is_auth()) { ceph_assert(q.second == q.first->authority().first); if (rejoins.count(q.second) == 0) continue; - const MMDSCacheRejoin::ref &rejoin = rejoins[q.second]; + const ref_t &rejoin = rejoins[q.second]; dout(15) << " " << *mdr << " authpin on " << *q.first << dendl; MDSCacheObjectInfo i; @@ -4072,7 +4072,7 @@ void MDCache::rejoin_send_rejoins() if (q.is_xlock() && !obj->is_auth()) { mds_rank_t who = obj->authority().first; if (rejoins.count(who) == 0) continue; - const MMDSCacheRejoin::ref &rejoin = rejoins[who]; + const ref_t &rejoin = rejoins[who]; dout(15) << " " << *mdr << " xlock on " << *lock << " " << *obj << dendl; MDSCacheObjectInfo i; @@ -4086,7 +4086,7 @@ void MDCache::rejoin_send_rejoins() } else if (q.is_remote_wrlock()) { mds_rank_t who = q.wrlock_target; if (rejoins.count(who) == 0) continue; - const MMDSCacheRejoin::ref &rejoin = rejoins[who]; + const ref_t &rejoin = rejoins[who]; dout(15) << " " << *mdr << " wrlock on " << *lock << " " << *obj << dendl; MDSCacheObjectInfo i; @@ -4133,7 +4133,7 @@ void MDCache::rejoin_send_rejoins() * strong dentries (no connectivity!) * strong inodes */ -void MDCache::rejoin_walk(CDir *dir, const MMDSCacheRejoin::ref &rejoin) +void MDCache::rejoin_walk(CDir *dir, const ref_t &rejoin) { dout(10) << "rejoin_walk " << *dir << dendl; @@ -4283,7 +4283,7 @@ void MDCache::handle_cache_rejoin_weak(const cref_t &weak) mds_rank_t from = mds_rank_t(weak->get_source().num()); // possible response(s) - MMDSCacheRejoin::ref ack; // if survivor + ref_t ack; // if survivor set acked_inodes; // if survivor set gather_locks; // if survivor bool survivor = false; // am i a survivor? @@ -5494,9 +5494,9 @@ void MDCache::choose_lock_states_and_reconnect_caps() } void MDCache::prepare_realm_split(SnapRealm *realm, client_t client, inodeno_t ino, - map& splits) + map>& splits) { - MClientSnap::ref snap; + ref_t snap; auto it = splits.find(client); if (it != splits.end()) { snap = it->second; @@ -5514,7 +5514,7 @@ void MDCache::prepare_realm_split(SnapRealm *realm, client_t client, inodeno_t i } void MDCache::prepare_realm_merge(SnapRealm *realm, SnapRealm *parent_realm, - map& splits) + map>& splits) { ceph_assert(parent_realm); @@ -5544,7 +5544,7 @@ void MDCache::prepare_realm_merge(SnapRealm *realm, SnapRealm *parent_realm, } } -void MDCache::send_snaps(map& splits) +void MDCache::send_snaps(map>& splits) { dout(10) << "send_snaps" << dendl; @@ -5766,7 +5766,7 @@ void MDCache::open_snaprealms() realm->open_parents(gather.new_sub())) { dout(10) << " past parents now open on " << *in << dendl; - map splits; + map> splits; // finish off client snaprealm reconnects? map >::iterator q = reconnected_snaprealms.find(in->ino()); if (q != reconnected_snaprealms.end()) { @@ -5919,7 +5919,7 @@ void MDCache::opened_undef_inode(CInode *in) { } void MDCache::finish_snaprealm_reconnect(client_t client, SnapRealm *realm, snapid_t seq, - map& updates) + map>& updates) { if (seq < realm->get_newest_seq()) { dout(10) << "finish_snaprealm_reconnect client." << client << " has old seq " << seq << " < " @@ -5974,7 +5974,7 @@ void MDCache::rejoin_send_acks() rejoin_unlinked_inodes.clear(); // send acks to everyone in the recovery set - map acks; + map> acks; for (set::iterator p = recovery_set.begin(); p != recovery_set.end(); ++p) { @@ -8818,7 +8818,7 @@ void MDCache::handle_open_ino(const cref_t &m, int err) auto from = mds_rank_t(m->get_source().num()); inodeno_t ino = m->ino; - MMDSOpenInoReply::ref reply; + ref_t reply; CInode *in = get_inode(ino); if (in) { dout(10) << " have " << *in << dendl; @@ -9465,7 +9465,7 @@ void MDCache::do_realm_invalidate_and_update_notify(CInode *in, int snapop, bool } set past_children; - map updates; + map> updates; list q; q.push_back(in->snaprealm); while (!q.empty()) { diff --git a/src/mds/MDCache.h b/src/mds/MDCache.h index 88a985f42e2..29a1af01c6e 100644 --- a/src/mds/MDCache.h +++ b/src/mds/MDCache.h @@ -124,7 +124,7 @@ class MDCache { using clock = ceph::coarse_mono_clock; using time = ceph::coarse_mono_time; - typedef std::map expiremap; + typedef std::map> expiremap; // my master MDSRank *mds; @@ -622,7 +622,7 @@ protected: list rejoin_eval_locks; MDSContext::vec rejoin_waiters; - void rejoin_walk(CDir *dir, const MMDSCacheRejoin::ref &rejoin); + void rejoin_walk(CDir *dir, const ref_t &rejoin); void handle_cache_rejoin(const cref_t &m); void handle_cache_rejoin_weak(const cref_t &m); CInode* rejoin_invent_inode(inodeno_t ino, snapid_t last); @@ -719,12 +719,12 @@ public: bool process_imported_caps(); void choose_lock_states_and_reconnect_caps(); void prepare_realm_split(SnapRealm *realm, client_t client, inodeno_t ino, - map& splits); - void prepare_realm_merge(SnapRealm *realm, SnapRealm *parent_realm, map& splits); - void send_snaps(map& splits); + map>& splits); + void prepare_realm_merge(SnapRealm *realm, SnapRealm *parent_realm, map>& splits); + void send_snaps(map>& splits); Capability* rejoin_import_cap(CInode *in, client_t client, const cap_reconnect_t& icr, mds_rank_t frommds); void finish_snaprealm_reconnect(client_t client, SnapRealm *realm, snapid_t seq, - map& updates); + map>& updates); Capability* try_reconnect_cap(CInode *in, Session *session); void export_remaining_imported_caps(); diff --git a/src/mds/MDSDaemon.cc b/src/mds/MDSDaemon.cc index 7b530e0cb1b..4f313160096 100644 --- a/src/mds/MDSDaemon.cc +++ b/src/mds/MDSDaemon.cc @@ -1136,7 +1136,7 @@ void MDSDaemon::respawn() -bool MDSDaemon::ms_dispatch2(const Message::ref &m) +bool MDSDaemon::ms_dispatch2(const ref_t &m) { std::lock_guard l(mds_lock); if (stopping) { diff --git a/src/mds/MDSDaemon.h b/src/mds/MDSDaemon.h index c21c89cf03d..5f12dd14333 100644 --- a/src/mds/MDSDaemon.h +++ b/src/mds/MDSDaemon.h @@ -105,7 +105,7 @@ class MDSDaemon : public Dispatcher, public md_config_obs_t { void wait_for_omap_osds(); private: - bool ms_dispatch2(const Message::ref &m) override; + bool ms_dispatch2(const ref_t &m) override; bool ms_get_authorizer(int dest_type, AuthAuthorizer **authorizer) override; int ms_handle_authentication(Connection *con) override; KeyStore *ms_get_auth1_authorizer_keystore() override; diff --git a/src/mds/MDSTableServer.cc b/src/mds/MDSTableServer.cc index 493b82127ba..04677c9b957 100644 --- a/src/mds/MDSTableServer.cc +++ b/src/mds/MDSTableServer.cc @@ -346,7 +346,7 @@ void MDSTableServer::handle_mds_failure_or_stop(mds_rank_t who) active_clients.erase(who); - list rollback; + list> rollback; for (auto p = pending_notifies.begin(); p != pending_notifies.end(); ) { auto q = p++; if (q->second.mds == who) { diff --git a/src/mds/MDSTableServer.h b/src/mds/MDSTableServer.h index 5851326f5dd..dfd88ae3034 100644 --- a/src/mds/MDSTableServer.h +++ b/src/mds/MDSTableServer.h @@ -32,7 +32,7 @@ private: struct notify_info_t { set notify_ack_gather; mds_rank_t mds; - MMDSTableRequest::ref reply; + ref_t reply; MDSContext *onfinish; notify_info_t() : reply(NULL), onfinish(NULL) {} }; diff --git a/src/mds/Server.cc b/src/mds/Server.cc index 9c99076a862..56b87b26ac1 100644 --- a/src/mds/Server.cc +++ b/src/mds/Server.cc @@ -371,7 +371,7 @@ void Server::reclaim_session(Session *session, const cref_t &m) ceph_abort(); } -void Server::finish_reclaim_session(Session *session, const MClientReclaimReply::ref &reply) +void Server::finish_reclaim_session(Session *session, const ref_t &reply) { Session *target = session->reclaiming_from; if (target) { @@ -1900,7 +1900,7 @@ void Server::early_reply(MDRequestRef& mdr, CInode *tracei, CDentry *tracedn) * include a trace to tracei * Clean up mdr */ -void Server::reply_client_request(MDRequestRef& mdr, const MClientReply::ref &reply) +void Server::reply_client_request(MDRequestRef& mdr, const ref_t &reply) { ceph_assert(mdr.get()); const cref_t &req = mdr->client_request; @@ -2012,7 +2012,7 @@ void Server::reply_client_request(MDRequestRef& mdr, const MClientReply::ref &re * * trace is in reverse order (i.e. root inode comes last) */ -void Server::set_trace_dist(Session *session, const MClientReply::ref &reply, +void Server::set_trace_dist(Session *session, const ref_t &reply, CInode *in, CDentry *dn, snapid_t snapid, int dentry_wanted, @@ -6390,9 +6390,9 @@ void Server::_committed_slave(MDRequestRef& mdr) struct C_MDS_LoggedLinkRollback : public ServerLogContext { MutationRef mut; - map splits; + map> splits; C_MDS_LoggedLinkRollback(Server *s, MutationRef& m, MDRequestRef& r, - map&& _splits) : + map>&& _splits) : ServerLogContext(s, r), mut(m), splits(std::move(_splits)) { } void finish(int r) override { @@ -6448,7 +6448,7 @@ void Server::do_link_rollback(bufferlist &rbl, mds_rank_t master, MDRequestRef& else pi.inode.nlink++; - map splits; + map> splits; if (rollback.snapbl.length() && in->snaprealm) { bool hadrealm; auto p = rollback.snapbl.cbegin(); @@ -6483,7 +6483,7 @@ void Server::do_link_rollback(bufferlist &rbl, mds_rank_t master, MDRequestRef& } void Server::_link_rollback_finish(MutationRef& mut, MDRequestRef& mdr, - map& splits) + map>& splits) { dout(10) << "_link_rollback_finish" << dendl; @@ -8722,7 +8722,7 @@ void Server::_logged_slave_rename(MDRequestRef& mdr, dout(10) << "_logged_slave_rename " << *mdr << dendl; // prepare ack - MMDSSlaveRequest::ref reply; + ref_t reply; if (!mdr->aborted) { reply = MMDSSlaveRequest::create(mdr->reqid, mdr->attempt, MMDSSlaveRequest::OP_RENAMEPREPACK); if (!mdr->more()->slave_update_journaled) @@ -8934,11 +8934,11 @@ struct C_MDS_LoggedRenameRollback : public ServerLogContext { version_t srcdnpv; CDentry *destdn; CDentry *straydn; - map splits[2]; + map> splits[2]; bool finish_mdr; C_MDS_LoggedRenameRollback(Server *s, MutationRef& m, MDRequestRef& r, CDentry *sd, version_t pv, CDentry *dd, CDentry *st, - map _splits[2], bool f) : + map> _splits[2], bool f) : ServerLogContext(s, r), mut(m), srcdn(sd), srcdnpv(pv), destdn(dd), straydn(st), finish_mdr(f) { splits[0].swap(_splits[0]); @@ -9051,7 +9051,7 @@ void Server::do_rename_rollback(bufferlist &rbl, mds_rank_t master, MDRequestRef rollback.orig_src.remote_d_type); } - map splits[2]; + map> splits[2]; CInode::mempool_inode *pip = nullptr; if (in) { @@ -9262,7 +9262,7 @@ void Server::do_rename_rollback(bufferlist &rbl, mds_rank_t master, MDRequestRef void Server::_rename_rollback_finish(MutationRef& mut, MDRequestRef& mdr, CDentry *srcdn, version_t srcdnpv, CDentry *destdn, CDentry *straydn, - map splits[2], bool finish_mdr) + map> splits[2], bool finish_mdr) { dout(10) << "_rename_rollback_finish " << mut->reqid << dendl; diff --git a/src/mds/Server.h b/src/mds/Server.h index b95676f1f76..c7f159adcf3 100644 --- a/src/mds/Server.h +++ b/src/mds/Server.h @@ -156,7 +156,7 @@ public: size_t get_num_pending_reclaim() const { return client_reclaim_gather.size(); } Session *find_session_by_uuid(std::string_view uuid); void reclaim_session(Session *session, const cref_t &m); - void finish_reclaim_session(Session *session, const MClientReclaimReply::ref &reply=nullptr); + void finish_reclaim_session(Session *session, const ref_t &reply=nullptr); void handle_client_reclaim(const cref_t &m); void reconnect_clients(MDSContext *reconnect_done_); @@ -188,7 +188,7 @@ public: void perf_gather_op_latency(const cref_t &req, utime_t lat); void early_reply(MDRequestRef& mdr, CInode *tracei, CDentry *tracedn); void respond_to_request(MDRequestRef& mdr, int r = 0); - void set_trace_dist(Session *session, const MClientReply::ref &reply, CInode *in, CDentry *dn, + void set_trace_dist(Session *session, const ref_t &reply, CInode *in, CDentry *dn, snapid_t snapid, int num_dentries_wanted, MDRequestRef& mdr); @@ -285,7 +285,7 @@ public: void handle_slave_link_prep_ack(MDRequestRef& mdr, const cref_t &m); void do_link_rollback(bufferlist &rbl, mds_rank_t master, MDRequestRef& mdr); void _link_rollback_finish(MutationRef& mut, MDRequestRef& mdr, - map& split); + map>& split); // unlink void handle_client_unlink(MDRequestRef& mdr); @@ -339,7 +339,7 @@ public: void _commit_slave_rename(MDRequestRef& mdr, int r, CDentry *srcdn, CDentry *destdn, CDentry *straydn); void do_rename_rollback(bufferlist &rbl, mds_rank_t master, MDRequestRef& mdr, bool finish_mdr=false); void _rename_rollback_finish(MutationRef& mut, MDRequestRef& mdr, CDentry *srcdn, version_t srcdnpv, - CDentry *destdn, CDentry *staydn, map splits[2], + CDentry *destdn, CDentry *staydn, map> splits[2], bool finish_mdr); void evict_cap_revoke_non_responders(); @@ -347,7 +347,7 @@ public: const std::set &changed); private: - void reply_client_request(MDRequestRef& mdr, const MClientReply::ref &reply); + void reply_client_request(MDRequestRef& mdr, const ref_t &reply); void flush_session(Session *session, MDSGatherBuilder *gather); DecayCounter recall_throttle; diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h index 84c21ceb587..abcaab679d0 100644 --- a/src/mds/SessionMap.h +++ b/src/mds/SessionMap.h @@ -175,7 +175,7 @@ public: entity_addr_t socket_addr; xlist::item item_session_list; - list preopen_out_queue; ///< messages for client, queued before they connect + list> preopen_out_queue; ///< messages for client, queued before they connect elist requests; size_t get_request_count(); diff --git a/src/mds/journal.cc b/src/mds/journal.cc index 2893d7e5981..d44c4ab1949 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -1866,7 +1866,7 @@ void ETableServer::replay(MDSRank *mds) break; } case TABLESERVER_OP_COMMIT: - server->_commit(tid, MMDSTableRequest::ref()); + server->_commit(tid, ref_t()); server->_note_commit(tid, true); break; case TABLESERVER_OP_ROLLBACK: diff --git a/src/msg/DispatchQueue.cc b/src/msg/DispatchQueue.cc index f3d4936a529..3de1f00a503 100644 --- a/src/msg/DispatchQueue.cc +++ b/src/msg/DispatchQueue.cc @@ -36,7 +36,7 @@ double DispatchQueue::get_max_age(utime_t now) const { return (now - marrival.begin()->first); } -uint64_t DispatchQueue::pre_dispatch(const Message::ref& m) +uint64_t DispatchQueue::pre_dispatch(const ref_t& m) { ldout(cct,1) << "<== " << m->get_source_inst() << " " << m->get_seq() @@ -55,7 +55,7 @@ uint64_t DispatchQueue::pre_dispatch(const Message::ref& m) return msize; } -void DispatchQueue::post_dispatch(const Message::ref& m, uint64_t msize) +void DispatchQueue::post_dispatch(const ref_t& m, uint64_t msize) { dispatch_throttle_release(msize); ldout(cct,20) << "done calling dispatch on " << m << dendl; @@ -66,19 +66,19 @@ bool DispatchQueue::can_fast_dispatch(const cref_t &m) const return msgr->ms_can_fast_dispatch(m); } -void DispatchQueue::fast_dispatch(const Message::ref& m) +void DispatchQueue::fast_dispatch(const ref_t& m) { uint64_t msize = pre_dispatch(m); msgr->ms_fast_dispatch(m); post_dispatch(m, msize); } -void DispatchQueue::fast_preprocess(const Message::ref& m) +void DispatchQueue::fast_preprocess(const ref_t& m) { msgr->ms_fast_preprocess(m); } -void DispatchQueue::enqueue(const Message::ref& m, int priority, uint64_t id) +void DispatchQueue::enqueue(const ref_t& m, int priority, uint64_t id) { Mutex::Locker l(lock); if (stop) { @@ -94,7 +94,7 @@ void DispatchQueue::enqueue(const Message::ref& m, int priority, uint64_t id) cond.Signal(); } -void DispatchQueue::local_delivery(const Message::ref& m, int priority) +void DispatchQueue::local_delivery(const ref_t& m, int priority) { m->set_recv_stamp(ceph_clock_now()); Mutex::Locker l(local_delivery_lock); @@ -117,7 +117,7 @@ void DispatchQueue::run_local_delivery() auto p = std::move(local_messages.front()); local_messages.pop(); local_delivery_lock.Unlock(); - const Message::ref& m = p.first; + const ref_t& m = p.first; int priority = p.second; fast_preprocess(m); if (can_fast_dispatch(m)) { @@ -189,7 +189,7 @@ void DispatchQueue::entry() ceph_abort(); } } else { - const Message::ref& m = qitem.get_message(); + const ref_t& m = qitem.get_message(); if (stop) { ldout(cct,10) << " stop flag set, discarding " << m << " " << *m << dendl; } else { @@ -218,7 +218,7 @@ void DispatchQueue::discard_queue(uint64_t id) { i != removed.end(); ++i) { ceph_assert(!(i->is_code())); // We don't discard id 0, ever! - const Message::ref& m = i->get_message(); + const ref_t& m = i->get_message(); remove_arrival(m); dispatch_throttle_release(m->get_dispatch_throttle_size()); } diff --git a/src/msg/Message.cc b/src/msg/Message.cc index 89cbd690fb3..77a65f005ae 100644 --- a/src/msg/Message.cc +++ b/src/msg/Message.cc @@ -331,7 +331,7 @@ Message *decode_message(CephContext *cct, int crcflags, } // make message - Message::ref m; + ref_t m; int type = header.type; switch (type) { diff --git a/src/msg/Messenger.h b/src/msg/Messenger.h index 6763716c945..77aa76136bf 100644 --- a/src/msg/Messenger.h +++ b/src/msg/Messenger.h @@ -656,7 +656,7 @@ public: * @param m The Message we are fast dispatching. * If none of our Dispatchers can handle it, ceph_abort(). */ - void ms_fast_dispatch(const Message::ref &m) { + void ms_fast_dispatch(const ref_t &m) { m->set_dispatch_stamp(ceph_clock_now()); for (const auto &dispatcher : fast_dispatchers) { if (dispatcher->ms_can_fast_dispatch2(m)) { @@ -667,12 +667,12 @@ public: ceph_abort(); } void ms_fast_dispatch(Message *m) { - return ms_fast_dispatch(Message::ref(m, false)); /* consume ref */ + return ms_fast_dispatch(ref_t(m, false)); /* consume ref */ } /** * */ - void ms_fast_preprocess(const Message::ref &m) { + void ms_fast_preprocess(const ref_t &m) { for (const auto &dispatcher : fast_dispatchers) { dispatcher->ms_fast_preprocess2(m); } @@ -684,7 +684,7 @@ public: * * @param m The Message to deliver. */ - void ms_deliver_dispatch(const Message::ref &m) { + void ms_deliver_dispatch(const ref_t &m) { m->set_dispatch_stamp(ceph_clock_now()); for (const auto &dispatcher : dispatchers) { if (dispatcher->ms_dispatch2(m)) @@ -695,7 +695,7 @@ public: ceph_assert(!cct->_conf->ms_die_on_unhandled_msg); } void ms_deliver_dispatch(Message *m) { - return ms_deliver_dispatch(Message::ref(m, false)); /* consume ref */ + return ms_deliver_dispatch(ref_t(m, false)); /* consume ref */ } /** * Notify each Dispatcher of a new Connection. Call diff --git a/src/tools/ceph-dencoder/ceph_dencoder.cc b/src/tools/ceph-dencoder/ceph_dencoder.cc index 1f201ea78d0..18f9262b96e 100644 --- a/src/tools/ceph-dencoder/ceph_dencoder.cc +++ b/src/tools/ceph-dencoder/ceph_dencoder.cc @@ -214,8 +214,8 @@ public: template class MessageDencoderImpl : public Dencoder { - typename T::ref m_object; - list m_list; + ref_t m_object; + list> m_list; public: MessageDencoderImpl() : m_object(T::create()) {} @@ -225,7 +225,7 @@ public: auto p = bl.cbegin(); p.seek(seek); try { - Message::ref n(decode_message(g_ceph_context, 0, p), false); + ref_t n(decode_message(g_ceph_context, 0, p), false); if (!n) throw std::runtime_error("failed to decode"); if (n->get_type() != m_object->get_type()) { -- 2.39.5