From 4e572ca319de7459e350f38e4e668a468d35c830 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Sat, 9 Mar 2019 11:30:38 -0800 Subject: [PATCH] mds: list to std::list Cleaning up namespaces. Signed-off-by: Patrick Donnelly --- src/mds/Anchor.cc | 2 +- src/mds/Anchor.h | 2 +- src/mds/CInode.cc | 4 +-- src/mds/Capability.cc | 6 ++--- src/mds/Capability.h | 6 ++--- src/mds/FSMap.cc | 2 +- src/mds/FSMap.h | 2 +- src/mds/FSMapUser.cc | 2 +- src/mds/FSMapUser.h | 2 +- src/mds/InoTable.cc | 2 +- src/mds/InoTable.h | 2 +- src/mds/MDSMap.cc | 4 +-- src/mds/MDSMap.h | 4 +-- src/mds/SessionMap.cc | 2 +- src/mds/SessionMap.h | 2 +- src/mds/SnapServer.cc | 2 +- src/mds/SnapServer.h | 2 +- src/mds/events/ECommitted.h | 2 +- src/mds/events/EExport.h | 2 +- src/mds/events/EFragment.h | 2 +- src/mds/events/EImportFinish.h | 2 +- src/mds/events/EImportStart.h | 2 +- src/mds/events/EMetaBlob.h | 10 ++++---- src/mds/events/EOpen.h | 2 +- src/mds/events/EResetJournal.h | 2 +- src/mds/events/ESession.h | 2 +- src/mds/events/ESessions.h | 2 +- src/mds/events/ESlaveUpdate.h | 10 ++++---- src/mds/events/ESubtreeMap.h | 2 +- src/mds/events/ETableClient.h | 2 +- src/mds/events/ETableServer.h | 2 +- src/mds/events/EUpdate.h | 2 +- src/mds/inode_backtrace.cc | 4 +-- src/mds/inode_backtrace.h | 4 +-- src/mds/journal.cc | 46 +++++++++++++++++----------------- src/mds/mdstypes.cc | 26 +++++++++---------- src/mds/mdstypes.h | 26 +++++++++---------- src/mds/snap.cc | 6 ++--- src/mds/snap.h | 6 ++--- 39 files changed, 106 insertions(+), 106 deletions(-) diff --git a/src/mds/Anchor.cc b/src/mds/Anchor.cc index 02cc2d2b46c4..0acc2c2f6590 100644 --- a/src/mds/Anchor.cc +++ b/src/mds/Anchor.cc @@ -44,7 +44,7 @@ void Anchor::dump(Formatter *f) const f->dump_unsigned("d_type", d_type); } -void Anchor::generate_test_instances(list& ls) +void Anchor::generate_test_instances(std::list& ls) { ls.push_back(new Anchor); ls.push_back(new Anchor); diff --git a/src/mds/Anchor.h b/src/mds/Anchor.h index 49b592b9f0e7..e05a6298d7c9 100644 --- a/src/mds/Anchor.h +++ b/src/mds/Anchor.h @@ -42,7 +42,7 @@ public: void encode(bufferlist &bl) const; void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(Anchor) diff --git a/src/mds/CInode.cc b/src/mds/CInode.cc index 178533abf939..c929e937db0c 100644 --- a/src/mds/CInode.cc +++ b/src/mds/CInode.cc @@ -4049,7 +4049,7 @@ void InodeStoreBase::dump(Formatter *f) const } -void InodeStore::generate_test_instances(list &ls) +void InodeStore::generate_test_instances(std::list &ls) { InodeStore *populated = new InodeStore; populated->inode.ino = 0xdeadbeef; @@ -4057,7 +4057,7 @@ void InodeStore::generate_test_instances(list &ls) ls.push_back(populated); } -void InodeStoreBare::generate_test_instances(list &ls) +void InodeStoreBare::generate_test_instances(std::list &ls) { InodeStoreBare *populated = new InodeStoreBare; populated->inode.ino = 0xdeadbeef; diff --git a/src/mds/Capability.cc b/src/mds/Capability.cc index eadbd5cdff88..6cc1c331766d 100644 --- a/src/mds/Capability.cc +++ b/src/mds/Capability.cc @@ -63,7 +63,7 @@ void Capability::Export::dump(Formatter *f) const f->dump_stream("last_issue_stamp") << last_issue_stamp; } -void Capability::Export::generate_test_instances(list& ls) +void Capability::Export::generate_test_instances(std::list& ls) { ls.push_back(new Export); ls.push_back(new Export); @@ -129,7 +129,7 @@ void Capability::revoke_info::dump(Formatter *f) const f->dump_unsigned("last_issue", last_issue); } -void Capability::revoke_info::generate_test_instances(list& ls) +void Capability::revoke_info::generate_test_instances(std::list& ls) { ls.push_back(new revoke_info); ls.push_back(new revoke_info); @@ -271,7 +271,7 @@ void Capability::dump(Formatter *f) const f->close_section(); } -void Capability::generate_test_instances(list& ls) +void Capability::generate_test_instances(std::list& ls) { ls.push_back(new Capability); ls.push_back(new Capability); diff --git a/src/mds/Capability.h b/src/mds/Capability.h index 38681d95becc..24757e120c21 100644 --- a/src/mds/Capability.h +++ b/src/mds/Capability.h @@ -87,7 +87,7 @@ public: void encode(bufferlist &bl) const; void decode(bufferlist::const_iterator &p); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; struct Import { int64_t cap_id; @@ -107,7 +107,7 @@ public: void encode(bufferlist& bl) const; void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; const static unsigned STATE_NOTABLE = (1<<0); @@ -333,7 +333,7 @@ public: void encode(bufferlist &bl) const; void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); snapid_t client_follows; version_t client_xattr_version; diff --git a/src/mds/FSMap.cc b/src/mds/FSMap.cc index e395f2dcbcc8..59a34fda696a 100644 --- a/src/mds/FSMap.cc +++ b/src/mds/FSMap.cc @@ -69,7 +69,7 @@ void FSMap::dump(Formatter *f) const f->close_section(); } -void FSMap::generate_test_instances(list& ls) +void FSMap::generate_test_instances(std::list& ls) { FSMap *m = new FSMap(); diff --git a/src/mds/FSMap.h b/src/mds/FSMap.h index 199b2cf8d148..99bf3736bbf3 100644 --- a/src/mds/FSMap.h +++ b/src/mds/FSMap.h @@ -485,7 +485,7 @@ public: void print_summary(Formatter *f, ostream *out) const; void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER_FEATURES(FSMap) diff --git a/src/mds/FSMapUser.cc b/src/mds/FSMapUser.cc index 47d5f19c76b3..2463019d8d25 100644 --- a/src/mds/FSMapUser.cc +++ b/src/mds/FSMapUser.cc @@ -41,7 +41,7 @@ void FSMapUser::fs_info_t::decode(bufferlist::const_iterator& p) DECODE_FINISH(p); } -void FSMapUser::generate_test_instances(list& ls) +void FSMapUser::generate_test_instances(std::list& ls) { FSMapUser *m = new FSMapUser(); m->epoch = 2; diff --git a/src/mds/FSMapUser.h b/src/mds/FSMapUser.h index 23af84731a6e..c02e3d53aa8b 100644 --- a/src/mds/FSMapUser.h +++ b/src/mds/FSMapUser.h @@ -53,7 +53,7 @@ public: void print(ostream& out) const; void print_summary(Formatter *f, ostream *out); - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER_FEATURES(FSMapUser::fs_info_t) WRITE_CLASS_ENCODER_FEATURES(FSMapUser) diff --git a/src/mds/InoTable.cc b/src/mds/InoTable.cc index 43fe380c7895..caa1bfc45310 100644 --- a/src/mds/InoTable.cc +++ b/src/mds/InoTable.cc @@ -185,7 +185,7 @@ void InoTable::dump(Formatter *f) const } -void InoTable::generate_test_instances(list& ls) +void InoTable::generate_test_instances(std::list& ls) { ls.push_back(new InoTable()); } diff --git a/src/mds/InoTable.h b/src/mds/InoTable.h index 0e26e1e9872e..f16531c53aef 100644 --- a/src/mds/InoTable.h +++ b/src/mds/InoTable.h @@ -69,7 +69,7 @@ class InoTable : public MDSTable { decode_state(bl); } void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void skip_inos(inodeno_t i); diff --git a/src/mds/MDSMap.cc b/src/mds/MDSMap.cc index 4b213cf70438..dc31cb44125e 100644 --- a/src/mds/MDSMap.cc +++ b/src/mds/MDSMap.cc @@ -112,7 +112,7 @@ void MDSMap::mds_info_t::print_summary(ostream &out) const } } -void MDSMap::mds_info_t::generate_test_instances(list& ls) +void MDSMap::mds_info_t::generate_test_instances(std::list& ls) { mds_info_t *sample = new mds_info_t(); ls.push_back(sample); @@ -187,7 +187,7 @@ void MDSMap::dump(Formatter *f) const f->dump_int("standby_count_wanted", std::max(0, standby_count_wanted)); } -void MDSMap::generate_test_instances(list& ls) +void MDSMap::generate_test_instances(std::list& ls) { MDSMap *m = new MDSMap(); m->max_mds = 1; diff --git a/src/mds/MDSMap.h b/src/mds/MDSMap.h index 5ba266a4294f..0a9e50ab0e15 100644 --- a/src/mds/MDSMap.h +++ b/src/mds/MDSMap.h @@ -143,7 +143,7 @@ public: // The long form name for use in cluster log messages` std::string human_name() const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); private: void encode_versioned(bufferlist& bl, uint64_t features) const; void encode_unversioned(bufferlist& bl) const; @@ -668,7 +668,7 @@ public: void print_summary(Formatter *f, ostream *out) const; void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); static bool state_transition_valid(DaemonState prev, DaemonState next); }; diff --git a/src/mds/SessionMap.cc b/src/mds/SessionMap.cc index b3a73e8797a2..144b2607484c 100644 --- a/src/mds/SessionMap.cc +++ b/src/mds/SessionMap.cc @@ -586,7 +586,7 @@ void SessionMapStore::dump(Formatter *f) const f->close_section(); // Sessions } -void SessionMapStore::generate_test_instances(list& ls) +void SessionMapStore::generate_test_instances(std::list& ls) { // pretty boring for now ls.push_back(new SessionMapStore()); diff --git a/src/mds/SessionMap.h b/src/mds/SessionMap.h index d9b2104d27df..84c21ceb587f 100644 --- a/src/mds/SessionMap.h +++ b/src/mds/SessionMap.h @@ -518,7 +518,7 @@ public: return s; } - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void reset_state() { diff --git a/src/mds/SnapServer.cc b/src/mds/SnapServer.cc index d9690d400fce..fc1c59b15312 100644 --- a/src/mds/SnapServer.cc +++ b/src/mds/SnapServer.cc @@ -419,7 +419,7 @@ void SnapServer::dump(Formatter *f) const f->close_section(); } -void SnapServer::generate_test_instances(list& ls) +void SnapServer::generate_test_instances(std::list& ls) { list snapinfo_instances; SnapInfo::generate_test_instances(snapinfo_instances); diff --git a/src/mds/SnapServer.h b/src/mds/SnapServer.h index 50925e9553ed..0fee9db9a103 100644 --- a/src/mds/SnapServer.h +++ b/src/mds/SnapServer.h @@ -138,7 +138,7 @@ public: } void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); bool force_update(snapid_t last, snapid_t v2_since, map& _snaps); diff --git a/src/mds/events/ECommitted.h b/src/mds/events/ECommitted.h index 0459f9d0fae5..41b1208133f4 100644 --- a/src/mds/events/ECommitted.h +++ b/src/mds/events/ECommitted.h @@ -33,7 +33,7 @@ public: void encode(bufferlist &bl, uint64_t features) const override; void decode(bufferlist::const_iterator &bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void update_segment() override {} void replay(MDSRank *mds) override; diff --git a/src/mds/events/EExport.h b/src/mds/events/EExport.h index 94e39a848163..589062db2a15 100644 --- a/src/mds/events/EExport.h +++ b/src/mds/events/EExport.h @@ -49,7 +49,7 @@ public: void encode(bufferlist& bl, uint64_t features) const override; void decode(bufferlist::const_iterator &bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void replay(MDSRank *mds) override; }; diff --git a/src/mds/events/EFragment.h b/src/mds/events/EFragment.h index 90d9238b030f..9e86f1915980 100644 --- a/src/mds/events/EFragment.h +++ b/src/mds/events/EFragment.h @@ -73,7 +73,7 @@ public: void encode(bufferlist &bl, uint64_t features) const override; void decode(bufferlist::const_iterator &bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void replay(MDSRank *mds) override; }; WRITE_CLASS_ENCODER_FEATURES(EFragment) diff --git a/src/mds/events/EImportFinish.h b/src/mds/events/EImportFinish.h index 699c0527c5b5..24bb1cd13533 100644 --- a/src/mds/events/EImportFinish.h +++ b/src/mds/events/EImportFinish.h @@ -43,7 +43,7 @@ class EImportFinish : public LogEvent { void encode(bufferlist& bl, uint64_t features) const override; void decode(bufferlist::const_iterator &bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void replay(MDSRank *mds) override; diff --git a/src/mds/events/EImportStart.h b/src/mds/events/EImportStart.h index 276469e84cc1..d4673a84accc 100644 --- a/src/mds/events/EImportStart.h +++ b/src/mds/events/EImportStart.h @@ -50,7 +50,7 @@ public: void encode(bufferlist &bl, uint64_t features) const override; void decode(bufferlist::const_iterator &bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void update_segment() override; void replay(MDSRank *mds) override; diff --git a/src/mds/events/EMetaBlob.h b/src/mds/events/EMetaBlob.h index 199e5fa865c1..e0e2add26406 100644 --- a/src/mds/events/EMetaBlob.h +++ b/src/mds/events/EMetaBlob.h @@ -104,7 +104,7 @@ public: void encode(bufferlist& bl, uint64_t features) const; void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void update_inode(MDSRank *mds, CInode *in); bool is_dirty() const { return (state & STATE_DIRTY); } @@ -158,7 +158,7 @@ public: << " dirty=" << dirty << std::endl; } void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(remotebit) @@ -179,7 +179,7 @@ public: void encode(bufferlist& bl) const; void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void print(ostream& out) const { out << " nullbit dn " << dn << " [" << dnfirst << "," << dnlast << "] dnv " << dnv << " dirty=" << dirty << std::endl; @@ -296,7 +296,7 @@ public: void encode(bufferlist& bl, uint64_t features) const; void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER_FEATURES(dirlump) @@ -341,7 +341,7 @@ private: entity_name_t get_client_name() const {return client_name;} void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); // soft stateadd uint64_t last_subtree_map; uint64_t event_seq; diff --git a/src/mds/events/EOpen.h b/src/mds/events/EOpen.h index 192745d9bf0c..06bfd3e882ea 100644 --- a/src/mds/events/EOpen.h +++ b/src/mds/events/EOpen.h @@ -51,7 +51,7 @@ public: void encode(bufferlist& bl, uint64_t features) const override; void decode(bufferlist::const_iterator& bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void update_segment() override; void replay(MDSRank *mds) override; diff --git a/src/mds/events/EResetJournal.h b/src/mds/events/EResetJournal.h index 3004978a22bf..302227fc6439 100644 --- a/src/mds/events/EResetJournal.h +++ b/src/mds/events/EResetJournal.h @@ -27,7 +27,7 @@ class EResetJournal : public LogEvent { void encode(bufferlist& bl, uint64_t features) const override; void decode(bufferlist::const_iterator& bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void print(ostream& out) const override { out << "EResetJournal"; } diff --git a/src/mds/events/ESession.h b/src/mds/events/ESession.h index 0b65765e1479..bddb04705c32 100644 --- a/src/mds/events/ESession.h +++ b/src/mds/events/ESession.h @@ -47,7 +47,7 @@ class ESession : public LogEvent { void encode(bufferlist& bl, uint64_t features) const override; void decode(bufferlist::const_iterator& bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void print(ostream& out) const override { if (open) diff --git a/src/mds/events/ESessions.h b/src/mds/events/ESessions.h index aa0eeff8158b..fad70212084e 100644 --- a/src/mds/events/ESessions.h +++ b/src/mds/events/ESessions.h @@ -47,7 +47,7 @@ public: else decode_new(bl); } void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void print(ostream& out) const override { out << "ESessions " << client_map.size() << " opens cmapv " << cmapv; diff --git a/src/mds/events/ESlaveUpdate.h b/src/mds/events/ESlaveUpdate.h index 23ca430bc1cb..674166fbdfe8 100644 --- a/src/mds/events/ESlaveUpdate.h +++ b/src/mds/events/ESlaveUpdate.h @@ -39,7 +39,7 @@ struct link_rollback { void encode(bufferlist& bl) const; void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(link_rollback) @@ -60,7 +60,7 @@ struct rmdir_rollback { void encode(bufferlist& bl) const; void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(rmdir_rollback) @@ -79,7 +79,7 @@ struct rename_rollback { void encode(bufferlist& bl) const; void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_MEMBER_ENCODER(drec) @@ -93,7 +93,7 @@ struct rename_rollback { void encode(bufferlist& bl) const; void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(rename_rollback::drec) WRITE_CLASS_ENCODER(rename_rollback) @@ -148,7 +148,7 @@ public: void encode(bufferlist& bl, uint64_t features) const override; void decode(bufferlist::const_iterator& bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void replay(MDSRank *mds) override; }; diff --git a/src/mds/events/ESubtreeMap.h b/src/mds/events/ESubtreeMap.h index 08d4a5811768..3dc824087f52 100644 --- a/src/mds/events/ESubtreeMap.h +++ b/src/mds/events/ESubtreeMap.h @@ -39,7 +39,7 @@ public: void encode(bufferlist& bl, uint64_t features) const override; void decode(bufferlist::const_iterator& bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void replay(MDSRank *mds) override; }; diff --git a/src/mds/events/ETableClient.h b/src/mds/events/ETableClient.h index bf3e752d5d44..3f6e454e646d 100644 --- a/src/mds/events/ETableClient.h +++ b/src/mds/events/ETableClient.h @@ -34,7 +34,7 @@ struct ETableClient : public LogEvent { void encode(bufferlist& bl, uint64_t features) const override; void decode(bufferlist::const_iterator& bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void print(ostream& out) const override { out << "ETableClient " << get_mdstable_name(table) << " " << get_mdstableserver_opname(op); diff --git a/src/mds/events/ETableServer.h b/src/mds/events/ETableServer.h index 0005b132466b..59fe8ff1cbda 100644 --- a/src/mds/events/ETableServer.h +++ b/src/mds/events/ETableServer.h @@ -39,7 +39,7 @@ struct ETableServer : public LogEvent { void encode(bufferlist& bl, uint64_t features) const override; void decode(bufferlist::const_iterator& bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void print(ostream& out) const override { out << "ETableServer " << get_mdstable_name(table) diff --git a/src/mds/events/EUpdate.h b/src/mds/events/EUpdate.h index dc710d5210f8..b9f173f82836 100644 --- a/src/mds/events/EUpdate.h +++ b/src/mds/events/EUpdate.h @@ -45,7 +45,7 @@ public: void encode(bufferlist& bl, uint64_t features) const override; void decode(bufferlist::const_iterator& bl) override; void dump(Formatter *f) const override; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); void update_segment() override; void replay(MDSRank *mds) override; diff --git a/src/mds/inode_backtrace.cc b/src/mds/inode_backtrace.cc index 50e986a10d91..8932f62a72be 100644 --- a/src/mds/inode_backtrace.cc +++ b/src/mds/inode_backtrace.cc @@ -40,7 +40,7 @@ void inode_backpointer_t::dump(Formatter *f) const f->dump_unsigned("version", version); } -void inode_backpointer_t::generate_test_instances(list& ls) +void inode_backpointer_t::generate_test_instances(std::list& ls) { ls.push_back(new inode_backpointer_t); ls.push_back(new inode_backpointer_t); @@ -105,7 +105,7 @@ void inode_backtrace_t::dump(Formatter *f) const f->close_section(); } -void inode_backtrace_t::generate_test_instances(list& ls) +void inode_backtrace_t::generate_test_instances(std::list& ls) { ls.push_back(new inode_backtrace_t); ls.push_back(new inode_backtrace_t); diff --git a/src/mds/inode_backtrace.h b/src/mds/inode_backtrace.h index 7c60865c22d5..7ca046d39688 100644 --- a/src/mds/inode_backtrace.h +++ b/src/mds/inode_backtrace.h @@ -33,7 +33,7 @@ struct inode_backpointer_t { void decode(bufferlist::const_iterator &bl); void decode_old(bufferlist::const_iterator &bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(inode_backpointer_t) @@ -62,7 +62,7 @@ struct inode_backtrace_t { void encode(bufferlist& bl) const; void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); /** * Compare two backtraces *for the same inode*. diff --git a/src/mds/journal.cc b/src/mds/journal.cc index 4eec4ada2b1f..c428781dd191 100644 --- a/src/mds/journal.cc +++ b/src/mds/journal.cc @@ -508,7 +508,7 @@ void EMetaBlob::fullbit::dump(Formatter *f) const } } -void EMetaBlob::fullbit::generate_test_instances(list& ls) +void EMetaBlob::fullbit::generate_test_instances(std::list& ls) { CInode::mempool_inode inode; fragtree_t fragtree; @@ -641,7 +641,7 @@ void EMetaBlob::remotebit::dump(Formatter *f) const } void EMetaBlob::remotebit:: -generate_test_instances(list& ls) +generate_test_instances(std::list& ls) { remotebit *remote = new remotebit("/test/dn", 0, 10, 15, 1, IFTODT(S_IFREG), false); ls.push_back(remote); @@ -680,7 +680,7 @@ void EMetaBlob::nullbit::dump(Formatter *f) const f->dump_string("dirty", dirty ? "true" : "false"); } -void EMetaBlob::nullbit::generate_test_instances(list& ls) +void EMetaBlob::nullbit::generate_test_instances(std::list& ls) { nullbit *sample = new nullbit("/test/dentry", 0, 10, 15, false); nullbit *sample2 = new nullbit("/test/dirty", 10, 20, 25, true); @@ -753,7 +753,7 @@ void EMetaBlob::dirlump::dump(Formatter *f) const f->close_section(); // null bits } -void EMetaBlob::dirlump::generate_test_instances(list& ls) +void EMetaBlob::dirlump::generate_test_instances(std::list& ls) { ls.push_back(new dirlump()); } @@ -1084,7 +1084,7 @@ void EMetaBlob::dump(Formatter *f) const f->close_section(); // client requests } -void EMetaBlob::generate_test_instances(list& ls) +void EMetaBlob::generate_test_instances(std::list& ls) { ls.push_back(new EMetaBlob()); } @@ -1709,7 +1709,7 @@ void ESession::dump(Formatter *f) const f->close_section(); // client_metadata } -void ESession::generate_test_instances(list& ls) +void ESession::generate_test_instances(std::list& ls) { ls.push_back(new ESession); } @@ -1762,7 +1762,7 @@ void ESessions::dump(Formatter *f) const f->close_section(); // client map } -void ESessions::generate_test_instances(list& ls) +void ESessions::generate_test_instances(std::list& ls) { ls.push_back(new ESessions()); } @@ -1829,7 +1829,7 @@ void ETableServer::dump(Formatter *f) const f->dump_int("version", version); } -void ETableServer::generate_test_instances(list& ls) +void ETableServer::generate_test_instances(std::list& ls) { ls.push_back(new ETableServer()); } @@ -1921,7 +1921,7 @@ void ETableClient::dump(Formatter *f) const f->dump_int("tid", tid); } -void ETableClient::generate_test_instances(list& ls) +void ETableClient::generate_test_instances(std::list& ls) { ls.push_back(new ETableClient()); } @@ -2019,7 +2019,7 @@ void EUpdate::dump(Formatter *f) const f->dump_string("had slaves", had_slaves ? "true" : "false"); } -void EUpdate::generate_test_instances(list& ls) +void EUpdate::generate_test_instances(std::list& ls) { ls.push_back(new EUpdate()); } @@ -2109,7 +2109,7 @@ void EOpen::dump(Formatter *f) const f->close_section(); // inos } -void EOpen::generate_test_instances(list& ls) +void EOpen::generate_test_instances(std::list& ls) { ls.push_back(new EOpen()); ls.push_back(new EOpen()); @@ -2183,7 +2183,7 @@ void ECommitted::dump(Formatter *f) const { f->dump_stream("reqid") << reqid; } -void ECommitted::generate_test_instances(list& ls) +void ECommitted::generate_test_instances(std::list& ls) { ls.push_back(new ECommitted); ls.push_back(new ECommitted); @@ -2231,7 +2231,7 @@ void link_rollback::dump(Formatter *f) const f->dump_stream("old_dir_rctime") << old_dir_rctime; } -void link_rollback::generate_test_instances(list& ls) +void link_rollback::generate_test_instances(std::list& ls) { ls.push_back(new link_rollback()); } @@ -2270,7 +2270,7 @@ void rmdir_rollback::dump(Formatter *f) const f->dump_string("destination dname", dest_dname); } -void rmdir_rollback::generate_test_instances(list& ls) +void rmdir_rollback::generate_test_instances(std::list& ls) { ls.push_back(new rmdir_rollback()); } @@ -2327,7 +2327,7 @@ void rename_rollback::drec::dump(Formatter *f) const f->dump_stream("old ctime") << old_ctime; } -void rename_rollback::drec::generate_test_instances(list& ls) +void rename_rollback::drec::generate_test_instances(std::list& ls) { ls.push_back(new drec()); ls.back()->remote_d_type = IFTODT(S_IFREG); @@ -2376,7 +2376,7 @@ void rename_rollback::dump(Formatter *f) const f->dump_stream("ctime") << ctime; } -void rename_rollback::generate_test_instances(list& ls) +void rename_rollback::generate_test_instances(std::list& ls) { ls.push_back(new rename_rollback()); ls.back()->orig_src.remote_d_type = IFTODT(S_IFREG); @@ -2427,7 +2427,7 @@ void ESlaveUpdate::dump(Formatter *f) const f->dump_int("original op", origop); } -void ESlaveUpdate::generate_test_instances(list& ls) +void ESlaveUpdate::generate_test_instances(std::list& ls) { ls.push_back(new ESlaveUpdate()); } @@ -2534,7 +2534,7 @@ void ESubtreeMap::dump(Formatter *f) const f->dump_int("expire position", expire_pos); } -void ESubtreeMap::generate_test_instances(list& ls) +void ESubtreeMap::generate_test_instances(std::list& ls) { ls.push_back(new ESubtreeMap()); } @@ -2762,7 +2762,7 @@ void EFragment::dump(Formatter *f) const f->dump_int("bits", bits); } -void EFragment::generate_test_instances(list& ls) +void EFragment::generate_test_instances(std::list& ls) { ls.push_back(new EFragment); ls.push_back(new EFragment); @@ -2855,7 +2855,7 @@ void EExport::dump(Formatter *f) const f->close_section(); // bounds dirfrags } -void EExport::generate_test_instances(list& ls) +void EExport::generate_test_instances(std::list& ls) { EExport *sample = new EExport(); ls.push_back(sample); @@ -2962,7 +2962,7 @@ void EImportStart::dump(Formatter *f) const f->close_section(); } -void EImportStart::generate_test_instances(list& ls) +void EImportStart::generate_test_instances(std::list& ls) { ls.push_back(new EImportStart); } @@ -3020,7 +3020,7 @@ void EImportFinish::dump(Formatter *f) const f->dump_stream("base dirfrag") << base; f->dump_string("success", success ? "true" : "false"); } -void EImportFinish::generate_test_instances(list& ls) +void EImportFinish::generate_test_instances(std::list& ls) { ls.push_back(new EImportFinish); ls.push_back(new EImportFinish); @@ -3050,7 +3050,7 @@ void EResetJournal::dump(Formatter *f) const f->dump_stream("timestamp") << stamp; } -void EResetJournal::generate_test_instances(list& ls) +void EResetJournal::generate_test_instances(std::list& ls) { ls.push_back(new EResetJournal()); } diff --git a/src/mds/mdstypes.cc b/src/mds/mdstypes.cc index 20a2d2d57880..238a3fc4fe17 100644 --- a/src/mds/mdstypes.cc +++ b/src/mds/mdstypes.cc @@ -45,7 +45,7 @@ void frag_info_t::dump(Formatter *f) const f->dump_unsigned("num_subdirs", nsubdirs); } -void frag_info_t::generate_test_instances(list& ls) +void frag_info_t::generate_test_instances(std::list& ls) { ls.push_back(new frag_info_t); ls.push_back(new frag_info_t); @@ -116,7 +116,7 @@ void nest_info_t::dump(Formatter *f) const f->dump_stream("rctime") << rctime; } -void nest_info_t::generate_test_instances(list& ls) +void nest_info_t::generate_test_instances(std::list& ls) { ls.push_back(new nest_info_t); ls.push_back(new nest_info_t); @@ -154,7 +154,7 @@ void quota_info_t::dump(Formatter *f) const f->dump_int("max_files", max_files); } -void quota_info_t::generate_test_instances(list& ls) +void quota_info_t::generate_test_instances(std::list& ls) { ls.push_back(new quota_info_t); ls.push_back(new quota_info_t); @@ -202,7 +202,7 @@ void client_writeable_range_t::dump(Formatter *f) const f->dump_unsigned("follows", follows); } -void client_writeable_range_t::generate_test_instances(list& ls) +void client_writeable_range_t::generate_test_instances(std::list& ls) { ls.push_back(new client_writeable_range_t); ls.push_back(new client_writeable_range_t); @@ -304,7 +304,7 @@ void fnode_t::dump(Formatter *f) const f->close_section(); } -void fnode_t::generate_test_instances(list& ls) +void fnode_t::generate_test_instances(std::list& ls) { ls.push_back(new fnode_t); ls.push_back(new fnode_t); @@ -353,7 +353,7 @@ void old_rstat_t::dump(Formatter *f) const f->close_section(); } -void old_rstat_t::generate_test_instances(list& ls) +void old_rstat_t::generate_test_instances(std::list& ls) { ls.push_back(new old_rstat_t()); ls.push_back(new old_rstat_t()); @@ -557,7 +557,7 @@ void session_info_t::dump(Formatter *f) const f->close_section(); } -void session_info_t::generate_test_instances(list& ls) +void session_info_t::generate_test_instances(std::list& ls) { ls.push_back(new session_info_t); ls.push_back(new session_info_t); @@ -595,7 +595,7 @@ void string_snap_t::dump(Formatter *f) const f->dump_unsigned("snapid", snapid); } -void string_snap_t::generate_test_instances(list& ls) +void string_snap_t::generate_test_instances(std::list& ls) { ls.push_back(new string_snap_t); ls.push_back(new string_snap_t); @@ -638,7 +638,7 @@ void MDSCacheObjectInfo::dump(Formatter *f) const f->dump_unsigned("snapid", snapid); } -void MDSCacheObjectInfo::generate_test_instances(list& ls) +void MDSCacheObjectInfo::generate_test_instances(std::list& ls) { ls.push_back(new MDSCacheObjectInfo); ls.push_back(new MDSCacheObjectInfo); @@ -681,7 +681,7 @@ void mds_table_pending_t::dump(Formatter *f) const f->dump_unsigned("tid", tid); } -void mds_table_pending_t::generate_test_instances(list& ls) +void mds_table_pending_t::generate_test_instances(std::list& ls) { ls.push_back(new mds_table_pending_t); ls.push_back(new mds_table_pending_t); @@ -723,7 +723,7 @@ void inode_load_vec_t::dump(Formatter *f) const f->close_section(); } -void inode_load_vec_t::generate_test_instances(list& ls) +void inode_load_vec_t::generate_test_instances(std::list& ls) { ls.push_back(new inode_load_vec_t(DecayRate())); } @@ -846,7 +846,7 @@ void cap_reconnect_t::dump(Formatter *f) const f->dump_string("has file locks", capinfo.flock_len ? "true" : "false"); } -void cap_reconnect_t::generate_test_instances(list& ls) +void cap_reconnect_t::generate_test_instances(std::list& ls) { ls.push_back(new cap_reconnect_t); ls.back()->path = "/test/path"; @@ -885,7 +885,7 @@ void snaprealm_reconnect_t::dump(Formatter *f) const f->dump_int("parent", realm.parent); } -void snaprealm_reconnect_t::generate_test_instances(list& ls) +void snaprealm_reconnect_t::generate_test_instances(std::list& ls) { ls.push_back(new snaprealm_reconnect_t); ls.back()->realm.ino = 0x10000000001ULL; diff --git a/src/mds/mdstypes.h b/src/mds/mdstypes.h index 49f6944e4bf6..9f7015496935 100644 --- a/src/mds/mdstypes.h +++ b/src/mds/mdstypes.h @@ -209,7 +209,7 @@ struct frag_info_t : public scatter_info_t { void encode(bufferlist &bl) const; void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(frag_info_t) @@ -272,7 +272,7 @@ struct nest_info_t : public scatter_info_t { void encode(bufferlist &bl) const; void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(nest_info_t) @@ -338,7 +338,7 @@ struct quota_info_t } void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); bool is_valid() const { return max_bytes >=0 && max_files >=0; @@ -851,7 +851,7 @@ void inode_t::dump(Formatter *f) const } template class Allocator> -void inode_t::generate_test_instances(list& ls) +void inode_t::generate_test_instances(std::list& ls) { ls.push_back(new inode_t); ls.push_back(new inode_t); @@ -1039,7 +1039,7 @@ struct fnode_t { void encode(bufferlist &bl) const; void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); fnode_t() {} }; WRITE_CLASS_ENCODER(fnode_t) @@ -1052,7 +1052,7 @@ struct old_rstat_t { void encode(bufferlist& bl) const; void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(old_rstat_t) @@ -1181,7 +1181,7 @@ struct session_info_t { void encode(bufferlist& bl, uint64_t features) const; void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER_FEATURES(session_info_t) @@ -1273,7 +1273,7 @@ struct string_snap_t { void encode(bufferlist& bl) const; void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(string_snap_t) @@ -1301,7 +1301,7 @@ struct mds_table_pending_t { void encode(bufferlist& bl) const; void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(mds_table_pending_t) @@ -1387,7 +1387,7 @@ struct cap_reconnect_t { void decode_old(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(cap_reconnect_t) @@ -1408,7 +1408,7 @@ struct snaprealm_reconnect_t { void decode_old(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(snaprealm_reconnect_t) @@ -1541,7 +1541,7 @@ public: void encode(bufferlist &bl) const; void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); private: std::array vec; @@ -1759,7 +1759,7 @@ public: void encode(bufferlist& bl) const; void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; inline std::ostream& operator<<(std::ostream& out, const MDSCacheObjectInfo &info) { diff --git a/src/mds/snap.cc b/src/mds/snap.cc index e53daef2c508..3da4cda2b4b6 100644 --- a/src/mds/snap.cc +++ b/src/mds/snap.cc @@ -50,7 +50,7 @@ void SnapInfo::dump(Formatter *f) const f->dump_string("name", name); } -void SnapInfo::generate_test_instances(list& ls) +void SnapInfo::generate_test_instances(std::list& ls) { ls.push_back(new SnapInfo); ls.push_back(new SnapInfo); @@ -106,7 +106,7 @@ void snaplink_t::dump(Formatter *f) const f->dump_unsigned("first", first); } -void snaplink_t::generate_test_instances(list& ls) +void snaplink_t::generate_test_instances(std::list& ls) { ls.push_back(new snaplink_t); ls.push_back(new snaplink_t); @@ -196,7 +196,7 @@ void sr_t::dump(Formatter *f) const f->close_section(); } -void sr_t::generate_test_instances(list& ls) +void sr_t::generate_test_instances(std::list& ls) { ls.push_back(new sr_t); ls.push_back(new sr_t); diff --git a/src/mds/snap.h b/src/mds/snap.h index b3c00ddf78ad..9ccdf71fe243 100644 --- a/src/mds/snap.h +++ b/src/mds/snap.h @@ -34,7 +34,7 @@ struct SnapInfo { void encode(bufferlist &bl) const; void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); std::string_view get_long_name() const; }; @@ -67,7 +67,7 @@ struct snaplink_t { void encode(bufferlist &bl) const; void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(snaplink_t) @@ -103,7 +103,7 @@ struct sr_t { void encode(bufferlist &bl) const; void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; - static void generate_test_instances(list& ls); + static void generate_test_instances(std::list& ls); }; WRITE_CLASS_ENCODER(sr_t) -- 2.47.3