From a994b3769588a807db9639f7219c1f18277d639d Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Wed, 9 Jan 2019 11:42:11 -0800 Subject: [PATCH] *: use std::string_view instead of char ptr Signed-off-by: Patrick Donnelly --- src/messages/MAuth.h | 2 +- src/messages/MAuthReply.h | 2 +- src/messages/MBackfillReserve.h | 2 +- src/messages/MCacheExpire.h | 2 +- src/messages/MClientCapRelease.h | 2 +- src/messages/MClientCaps.h | 2 +- src/messages/MClientLease.h | 2 +- src/messages/MClientQuota.h | 2 +- src/messages/MClientReclaim.h | 2 +- src/messages/MClientReclaimReply.h | 2 +- src/messages/MClientReconnect.h | 2 +- src/messages/MClientReply.h | 2 +- src/messages/MClientRequest.h | 2 +- src/messages/MClientRequestForward.h | 2 +- src/messages/MClientSession.h | 2 +- src/messages/MClientSnap.h | 2 +- src/messages/MCommand.h | 2 +- src/messages/MCommandReply.h | 2 +- src/messages/MConfig.h | 2 +- src/messages/MDataPing.h | 2 +- src/messages/MDentryLink.h | 2 +- src/messages/MDentryUnlink.h | 2 +- src/messages/MDirUpdate.h | 2 +- src/messages/MDiscover.h | 2 +- src/messages/MDiscoverReply.h | 2 +- src/messages/MExportCaps.h | 2 +- src/messages/MExportCapsAck.h | 2 +- src/messages/MExportDir.h | 2 +- src/messages/MExportDirAck.h | 2 +- src/messages/MExportDirCancel.h | 2 +- src/messages/MExportDirDiscover.h | 2 +- src/messages/MExportDirDiscoverAck.h | 2 +- src/messages/MExportDirFinish.h | 2 +- src/messages/MExportDirNotify.h | 2 +- src/messages/MExportDirNotifyAck.h | 2 +- src/messages/MExportDirPrep.h | 2 +- src/messages/MExportDirPrepAck.h | 2 +- src/messages/MFSMap.h | 2 +- src/messages/MFSMapUser.h | 2 +- src/messages/MForward.h | 2 +- src/messages/MGatherCaps.h | 2 +- src/messages/MGenericMessage.h | 2 +- src/messages/MGetConfig.h | 2 +- src/messages/MGetPoolStats.h | 2 +- src/messages/MGetPoolStatsReply.h | 2 +- src/messages/MHeartbeat.h | 2 +- src/messages/MInodeFileCaps.h | 2 +- src/messages/MLock.h | 2 +- src/messages/MLog.h | 2 +- src/messages/MLogAck.h | 2 +- src/messages/MMDSBeacon.h | 2 +- src/messages/MMDSCacheRejoin.h | 2 +- src/messages/MMDSFindIno.h | 2 +- src/messages/MMDSFindInoReply.h | 2 +- src/messages/MMDSFragmentNotify.h | 2 +- src/messages/MMDSFragmentNotifyAck.h | 2 +- src/messages/MMDSLoadTargets.h | 2 +- src/messages/MMDSMap.h | 2 +- src/messages/MMDSOpenIno.h | 2 +- src/messages/MMDSOpenInoReply.h | 2 +- src/messages/MMDSResolve.h | 2 +- src/messages/MMDSResolveAck.h | 2 +- src/messages/MMDSSlaveRequest.h | 2 +- src/messages/MMDSSnapUpdate.h | 2 +- src/messages/MMDSTableRequest.h | 2 +- src/messages/MMgrBeacon.h | 2 +- src/messages/MMgrClose.h | 2 +- src/messages/MMgrConfigure.h | 2 +- src/messages/MMgrDigest.h | 2 +- src/messages/MMgrMap.h | 2 +- src/messages/MMgrOpen.h | 2 +- src/messages/MMgrReport.h | 2 +- src/messages/MMonCommand.h | 2 +- src/messages/MMonCommandAck.h | 2 +- src/messages/MMonElection.h | 2 +- src/messages/MMonGetMap.h | 2 +- src/messages/MMonGetOSDMap.h | 2 +- src/messages/MMonGetVersion.h | 2 +- src/messages/MMonGetVersionReply.h | 2 +- src/messages/MMonGlobalID.h | 2 +- src/messages/MMonHealth.h | 2 +- src/messages/MMonHealthChecks.h | 2 +- src/messages/MMonJoin.h | 2 +- src/messages/MMonMap.h | 2 +- src/messages/MMonMetadata.h | 2 +- src/messages/MMonMgrReport.h | 2 +- src/messages/MMonPaxos.h | 2 +- src/messages/MMonProbe.h | 2 +- src/messages/MMonQuorumService.h | 2 +- src/messages/MMonScrub.h | 2 +- src/messages/MMonSubscribe.h | 2 +- src/messages/MMonSubscribeAck.h | 2 +- src/messages/MMonSync.h | 2 +- src/messages/MNop.h | 2 +- src/messages/MOSDAlive.h | 2 +- src/messages/MOSDBackoff.h | 2 +- src/messages/MOSDBeacon.h | 2 +- src/messages/MOSDBoot.h | 2 +- src/messages/MOSDECSubOpRead.h | 2 +- src/messages/MOSDECSubOpReadReply.h | 2 +- src/messages/MOSDECSubOpWrite.h | 2 +- src/messages/MOSDECSubOpWriteReply.h | 2 +- src/messages/MOSDFailure.h | 2 +- src/messages/MOSDForceRecovery.h | 2 +- src/messages/MOSDFull.h | 2 +- src/messages/MOSDMap.h | 2 +- src/messages/MOSDMarkMeDown.h | 2 +- src/messages/MOSDOp.h | 2 +- src/messages/MOSDOpReply.h | 2 +- src/messages/MOSDPGBackfill.h | 2 +- src/messages/MOSDPGBackfillRemove.h | 2 +- src/messages/MOSDPGCreate.h | 2 +- src/messages/MOSDPGCreate2.h | 2 +- src/messages/MOSDPGCreated.h | 2 +- src/messages/MOSDPGInfo.h | 2 +- src/messages/MOSDPGLog.h | 2 +- src/messages/MOSDPGNotify.h | 2 +- src/messages/MOSDPGPull.h | 2 +- src/messages/MOSDPGPush.h | 2 +- src/messages/MOSDPGPushReply.h | 2 +- src/messages/MOSDPGQuery.h | 2 +- src/messages/MOSDPGReadyToMerge.h | 2 +- src/messages/MOSDPGRecoveryDelete.h | 2 +- src/messages/MOSDPGRecoveryDeleteReply.h | 2 +- src/messages/MOSDPGRemove.h | 2 +- src/messages/MOSDPGScan.h | 2 +- src/messages/MOSDPGTemp.h | 2 +- src/messages/MOSDPGTrim.h | 2 +- src/messages/MOSDPGUpdateLogMissing.h | 2 +- src/messages/MOSDPGUpdateLogMissingReply.h | 2 +- src/messages/MOSDPing.h | 2 +- src/messages/MOSDRepOp.h | 2 +- src/messages/MOSDRepOpReply.h | 2 +- src/messages/MOSDRepScrub.h | 2 +- src/messages/MOSDRepScrubMap.h | 2 +- src/messages/MOSDScrub.h | 2 +- src/messages/MOSDScrub2.h | 2 +- src/messages/MOSDScrubReserve.h | 2 +- src/messages/MPGStats.h | 2 +- src/messages/MPGStatsAck.h | 2 +- src/messages/MPing.h | 2 +- src/messages/MPoolOp.h | 2 +- src/messages/MPoolOpReply.h | 2 +- src/messages/MRecoveryReserve.h | 2 +- src/messages/MRemoveSnaps.h | 2 +- src/messages/MRoute.h | 2 +- src/messages/MServiceMap.h | 2 +- src/messages/MStatfs.h | 2 +- src/messages/MStatfsReply.h | 2 +- src/messages/MTimeCheck.h | 2 +- src/messages/MTimeCheck2.h | 2 +- src/messages/MWatchNotify.h | 2 +- src/messages/PaxosServiceMessage.h | 2 +- src/mon/AuthMonitor.cc | 2 +- src/msg/Message.h | 3 ++- src/msg/msg_types.h | 2 +- src/osd/HitSet.h | 6 ++++-- src/osd/osd_types.h | 11 ++++++----- 158 files changed, 167 insertions(+), 163 deletions(-) diff --git a/src/messages/MAuth.h b/src/messages/MAuth.h index 759a66ddcce..0075e0b9fba 100644 --- a/src/messages/MAuth.h +++ b/src/messages/MAuth.h @@ -32,7 +32,7 @@ private: ~MAuth() override {} public: - const char *get_type_name() const override { return "auth"; } + std::string_view get_type_name() const override { return "auth"; } void print(ostream& out) const override { out << "auth(proto " << protocol << " " << auth_payload.length() << " bytes" << " epoch " << monmap_epoch << ")"; diff --git a/src/messages/MAuthReply.h b/src/messages/MAuthReply.h index 4a4b509cc8d..be3368e6533 100644 --- a/src/messages/MAuthReply.h +++ b/src/messages/MAuthReply.h @@ -40,7 +40,7 @@ private: ~MAuthReply() override {} public: - const char *get_type_name() const override { return "auth_reply"; } + std::string_view get_type_name() const override { return "auth_reply"; } void print(ostream& o) const override { o << "auth_reply(proto " << protocol << " " << result << " " << cpp_strerror(result); if (result_msg.length()) diff --git a/src/messages/MBackfillReserve.h b/src/messages/MBackfillReserve.h index c9c1f6bcac1..745077abc17 100644 --- a/src/messages/MBackfillReserve.h +++ b/src/messages/MBackfillReserve.h @@ -101,7 +101,7 @@ public: pgid(pgid), query_epoch(query_epoch), type(type), priority(prio) {} - const char *get_type_name() const override { + std::string_view get_type_name() const override { return "MBackfillReserve"; } diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h index 07153fcf024..d54bcaf5c1b 100644 --- a/src/messages/MCacheExpire.h +++ b/src/messages/MCacheExpire.h @@ -75,7 +75,7 @@ protected: ~MCacheExpire() override {} public: - const char *get_type_name() const override { return "cache_expire";} + std::string_view get_type_name() const override { return "cache_expire";} void add_inode(dirfrag_t r, vinodeno_t vino, unsigned nonce) { realms[r].inodes[vino] = nonce; diff --git a/src/messages/MClientCapRelease.h b/src/messages/MClientCapRelease.h index 76a4aae17d7..403169bdc5a 100644 --- a/src/messages/MClientCapRelease.h +++ b/src/messages/MClientCapRelease.h @@ -44,7 +44,7 @@ private: ~MClientCapRelease() override {} public: - const char *get_type_name() const override { return "client_cap_release";} + std::string_view get_type_name() const override { return "client_cap_release";} void print(ostream& out) const override { out << "client_cap_release(" << caps.size() << ")"; } diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h index 56762641a0b..f9c528c97ec 100644 --- a/src/messages/MClientCaps.h +++ b/src/messages/MClientCaps.h @@ -174,7 +174,7 @@ private: file_layout_t layout; public: - const char *get_type_name() const override { return "Cfcap";} + std::string_view get_type_name() const override { return "Cfcap";} void print(ostream& out) const override { out << "client_caps(" << ceph_cap_op_name(head.op) << " ino " << inodeno_t(head.ino) diff --git a/src/messages/MClientLease.h b/src/messages/MClientLease.h index 663f9c8a6ee..5c2bf84bb57 100644 --- a/src/messages/MClientLease.h +++ b/src/messages/MClientLease.h @@ -64,7 +64,7 @@ protected: ~MClientLease() override {} public: - const char *get_type_name() const override { return "client_lease"; } + std::string_view get_type_name() const override { return "client_lease"; } void print(ostream& out) const override { out << "client_lease(a=" << ceph_lease_op_name(get_action()) << " seq " << get_seq() diff --git a/src/messages/MClientQuota.h b/src/messages/MClientQuota.h index 2c58c2fc762..b1aed00bf60 100644 --- a/src/messages/MClientQuota.h +++ b/src/messages/MClientQuota.h @@ -19,7 +19,7 @@ protected: ~MClientQuota() override {} public: - const char *get_type_name() const override { return "client_quota"; } + std::string_view get_type_name() const override { return "client_quota"; } void print(ostream& out) const override { out << "client_quota("; out << " [" << ino << "] "; diff --git a/src/messages/MClientReclaim.h b/src/messages/MClientReclaim.h index 75206f90743..ffb7609c31b 100644 --- a/src/messages/MClientReclaim.h +++ b/src/messages/MClientReclaim.h @@ -27,7 +27,7 @@ public: uint32_t get_flags() const { return flags; } std::string_view get_uuid() const { return uuid; } - const char *get_type_name() const override { return "client_reclaim"; } + std::string_view get_type_name() const override { return "client_reclaim"; } void print(ostream& o) const override { std::ios_base::fmtflags f(o.flags()); o << "client_reclaim(" << get_uuid() << " flags 0x" << std::hex << get_flags() << ")"; diff --git a/src/messages/MClientReclaimReply.h b/src/messages/MClientReclaimReply.h index 7f88c3d1d89..288b88686fb 100644 --- a/src/messages/MClientReclaimReply.h +++ b/src/messages/MClientReclaimReply.h @@ -30,7 +30,7 @@ public: const entity_addrvec_t& get_addrs() const { return addrs; } void set_addrs(const entity_addrvec_t& _addrs) { addrs = _addrs; } - const char *get_type_name() const override { return "client_reclaim_reply"; } + std::string_view get_type_name() const override { return "client_reclaim_reply"; } void print(ostream& o) const override { o << "client_reclaim_reply(" << result << " e " << epoch << ")"; } diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h index 47ac931c9df..96c02d7bbe9 100644 --- a/src/messages/MClientReconnect.h +++ b/src/messages/MClientReconnect.h @@ -35,7 +35,7 @@ private: ~MClientReconnect() override {} public: - const char *get_type_name() const override { return "client_reconnect"; } + std::string_view get_type_name() const override { return "client_reconnect"; } void print(ostream& out) const override { out << "client_reconnect(" << caps.size() << " caps)"; diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h index 6ebf2ad7877..c946d8d61f1 100644 --- a/src/messages/MClientReply.h +++ b/src/messages/MClientReply.h @@ -298,7 +298,7 @@ protected: ~MClientReply() override {} public: - const char *get_type_name() const override { return "creply"; } + std::string_view get_type_name() const override { return "creply"; } void print(ostream& o) const override { o << "client_reply(???:" << get_tid(); o << " = " << get_result(); diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h index f7be533d1ce..602eff1d15b 100644 --- a/src/messages/MClientRequest.h +++ b/src/messages/MClientRequest.h @@ -230,7 +230,7 @@ public: encode(gid_list, payload); } - const char *get_type_name() const override { return "creq"; } + std::string_view get_type_name() const override { return "creq"; } void print(ostream& out) const override { out << "client_request(" << get_orig_source() << ":" << get_tid() diff --git a/src/messages/MClientRequestForward.h b/src/messages/MClientRequestForward.h index ed88617ed96..d25860422c0 100644 --- a/src/messages/MClientRequestForward.h +++ b/src/messages/MClientRequestForward.h @@ -43,7 +43,7 @@ public: int get_num_fwd() { return num_fwd; } bool must_resend() { return client_must_resend; } - const char *get_type_name() const override { return "client_request_forward"; } + std::string_view get_type_name() const override { return "client_request_forward"; } void print(ostream& o) const override { o << "client_request_forward(" << get_tid() << " to mds." << dest_mds diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h index 9fa79cf9fb8..c7a2a3b503d 100644 --- a/src/messages/MClientSession.h +++ b/src/messages/MClientSession.h @@ -55,7 +55,7 @@ protected: ~MClientSession() override {} public: - const char *get_type_name() const override { return "client_session"; } + std::string_view get_type_name() const override { return "client_session"; } void print(ostream& out) const override { out << "client_session(" << ceph_session_op_name(get_op()); if (get_seq()) diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h index 8e2d958f2b5..f0f96e4eb12 100644 --- a/src/messages/MClientSnap.h +++ b/src/messages/MClientSnap.h @@ -37,7 +37,7 @@ protected: ~MClientSnap() override {} public: - const char *get_type_name() const override { return "client_snap"; } + std::string_view get_type_name() const override { return "client_snap"; } void print(ostream& out) const override { out << "client_snap(" << ceph_snap_op_name(head.op); if (head.split) diff --git a/src/messages/MCommand.h b/src/messages/MCommand.h index 8a86258489c..421d04c2c56 100644 --- a/src/messages/MCommand.h +++ b/src/messages/MCommand.h @@ -36,7 +36,7 @@ private: ~MCommand() override {} public: - const char *get_type_name() const override { return "command"; } + std::string_view get_type_name() const override { return "command"; } void print(ostream& o) const override { o << "command(tid " << get_tid() << ": "; for (unsigned i=0; i 0; } void inc_tried_discover() const { ++tried_discover; } - const char *get_type_name() const override { return "dir_update"; } + std::string_view get_type_name() const override { return "dir_update"; } void print(ostream& out) const override { out << "dir_update(" << get_dirfrag() << ")"; } diff --git a/src/messages/MDiscover.h b/src/messages/MDiscover.h index 5f9196d066c..f4418e615fc 100644 --- a/src/messages/MDiscover.h +++ b/src/messages/MDiscover.h @@ -67,7 +67,7 @@ protected: ~MDiscover() override {} public: - const char *get_type_name() const override { return "Dis"; } + std::string_view get_type_name() const override { return "Dis"; } void print(ostream &out) const override { out << "discover(" << header.tid << " " << base_ino << "." << base_dir_frag << " " << want << ")"; diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h index c5ab5c81e7d..bd4f3475442 100644 --- a/src/messages/MDiscoverReply.h +++ b/src/messages/MDiscoverReply.h @@ -145,7 +145,7 @@ protected: ~MDiscoverReply() override {} public: - const char *get_type_name() const override { return "discover_reply"; } + std::string_view get_type_name() const override { return "discover_reply"; } void print(ostream& out) const override { out << "discover_reply(" << header.tid << " " << base_ino << ")"; } diff --git a/src/messages/MExportCaps.h b/src/messages/MExportCaps.h index 006a37526ae..93e53b0f666 100644 --- a/src/messages/MExportCaps.h +++ b/src/messages/MExportCaps.h @@ -37,7 +37,7 @@ protected: ~MExportCaps() override {} public: - const char *get_type_name() const override { return "export_caps"; } + std::string_view get_type_name() const override { return "export_caps"; } void print(ostream& o) const override { o << "export_caps(" << ino << ")"; } diff --git a/src/messages/MExportCapsAck.h b/src/messages/MExportCapsAck.h index 3aeefffc3d8..d159161eed0 100644 --- a/src/messages/MExportCapsAck.h +++ b/src/messages/MExportCapsAck.h @@ -34,7 +34,7 @@ protected: ~MExportCapsAck() override {} public: - const char *get_type_name() const override { return "export_caps_ack"; } + std::string_view get_type_name() const override { return "export_caps_ack"; } void print(ostream& o) const override { o << "export_caps_ack(" << ino << ")"; } diff --git a/src/messages/MExportDir.h b/src/messages/MExportDir.h index 4a451beeef4..8f509e03179 100644 --- a/src/messages/MExportDir.h +++ b/src/messages/MExportDir.h @@ -36,7 +36,7 @@ protected: ~MExportDir() override {} public: - const char *get_type_name() const override { return "Ex"; } + std::string_view get_type_name() const override { return "Ex"; } void print(ostream& o) const override { o << "export(" << dirfrag << ")"; } diff --git a/src/messages/MExportDirAck.h b/src/messages/MExportDirAck.h index ee8b68f98d0..ff8be81637f 100644 --- a/src/messages/MExportDirAck.h +++ b/src/messages/MExportDirAck.h @@ -36,7 +36,7 @@ protected: ~MExportDirAck() override {} public: - const char *get_type_name() const override { return "ExAck"; } + std::string_view get_type_name() const override { return "ExAck"; } void print(ostream& o) const override { o << "export_ack(" << dirfrag << ")"; } diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h index 54f9bec7142..56f2c4d16eb 100644 --- a/src/messages/MExportDirCancel.h +++ b/src/messages/MExportDirCancel.h @@ -36,7 +36,7 @@ protected: ~MExportDirCancel() override {} public: - const char *get_type_name() const override { return "ExCancel"; } + std::string_view get_type_name() const override { return "ExCancel"; } void print(ostream& o) const override { o << "export_cancel(" << dirfrag << ")"; } diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h index 7264e7c2487..74f298bc250 100644 --- a/src/messages/MExportDirDiscover.h +++ b/src/messages/MExportDirDiscover.h @@ -46,7 +46,7 @@ protected: ~MExportDirDiscover() override {} public: - const char *get_type_name() const override { return "ExDis"; } + std::string_view get_type_name() const override { return "ExDis"; } void print(ostream& o) const override { o << "export_discover(" << dirfrag << " " << path << ")"; } diff --git a/src/messages/MExportDirDiscoverAck.h b/src/messages/MExportDirDiscoverAck.h index ba769c3c225..ba8fda5653c 100644 --- a/src/messages/MExportDirDiscoverAck.h +++ b/src/messages/MExportDirDiscoverAck.h @@ -40,7 +40,7 @@ protected: ~MExportDirDiscoverAck() override {} public: - const char *get_type_name() const override { return "ExDisA"; } + std::string_view get_type_name() const override { return "ExDisA"; } void print(ostream& o) const override { o << "export_discover_ack(" << dirfrag; if (success) diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h index e538518c244..6cc35d0935f 100644 --- a/src/messages/MExportDirFinish.h +++ b/src/messages/MExportDirFinish.h @@ -37,7 +37,7 @@ protected: ~MExportDirFinish() override {} public: - const char *get_type_name() const override { return "ExFin"; } + std::string_view get_type_name() const override { return "ExFin"; } void print(ostream& o) const override { o << "export_finish(" << dirfrag << (last ? " last" : "") << ")"; } diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h index 8c8c756ac51..fbb7a30b0c6 100644 --- a/src/messages/MExportDirNotify.h +++ b/src/messages/MExportDirNotify.h @@ -44,7 +44,7 @@ protected: ~MExportDirNotify() override {} public: - const char *get_type_name() const override { return "ExNot"; } + std::string_view get_type_name() const override { return "ExNot"; } void print(ostream& o) const override { o << "export_notify(" << base; o << " " << old_auth << " -> " << new_auth; diff --git a/src/messages/MExportDirNotifyAck.h b/src/messages/MExportDirNotifyAck.h index 6d1ed62c9d5..05f771675c5 100644 --- a/src/messages/MExportDirNotifyAck.h +++ b/src/messages/MExportDirNotifyAck.h @@ -37,7 +37,7 @@ protected: ~MExportDirNotifyAck() override {} public: - const char *get_type_name() const override { return "ExNotA"; } + std::string_view get_type_name() const override { return "ExNotA"; } void print(ostream& o) const override { o << "export_notify_ack(" << dirfrag << ")"; } diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h index 950fbf60241..e10d4f247a4 100644 --- a/src/messages/MExportDirPrep.h +++ b/src/messages/MExportDirPrep.h @@ -52,7 +52,7 @@ protected: ~MExportDirPrep() override {} public: - const char *get_type_name() const override { return "ExP"; } + std::string_view get_type_name() const override { return "ExP"; } void print(ostream& o) const override { o << "export_prep(" << dirfrag << ")"; } diff --git a/src/messages/MExportDirPrepAck.h b/src/messages/MExportDirPrepAck.h index 498dbdd1474..11e59a8d6a8 100644 --- a/src/messages/MExportDirPrepAck.h +++ b/src/messages/MExportDirPrepAck.h @@ -38,7 +38,7 @@ protected: public: bool is_success() const { return success; } - const char *get_type_name() const override { return "ExPAck"; } + std::string_view get_type_name() const override { return "ExPAck"; } void print(ostream& o) const override { o << "export_prep_ack(" << dirfrag << (success ? " success)" : " fail)"); } diff --git a/src/messages/MFSMap.h b/src/messages/MFSMap.h index 4ce2783ba14..7115ba11785 100644 --- a/src/messages/MFSMap.h +++ b/src/messages/MFSMap.h @@ -43,7 +43,7 @@ private: ~MFSMap() override {} public: - const char *get_type_name() const override { return "fsmap"; } + std::string_view get_type_name() const override { return "fsmap"; } void print(ostream& out) const override { out << "fsmap(e " << epoch << ")"; } diff --git a/src/messages/MFSMapUser.h b/src/messages/MFSMapUser.h index eb245f9d66f..bf2f6f629e7 100644 --- a/src/messages/MFSMapUser.h +++ b/src/messages/MFSMapUser.h @@ -41,7 +41,7 @@ private: ~MFSMapUser() override {} public: - const char *get_type_name() const override { return "fsmap.user"; } + std::string_view get_type_name() const override { return "fsmap.user"; } void print(ostream& out) const override { out << "fsmap.user(e " << epoch << ")"; } diff --git a/src/messages/MForward.h b/src/messages/MForward.h index 1c9405832fa..7f552ca1d06 100644 --- a/src/messages/MForward.h +++ b/src/messages/MForward.h @@ -139,7 +139,7 @@ public: return m; } - const char *get_type_name() const override { return "forward"; } + std::string_view get_type_name() const override { return "forward"; } void print(ostream& o) const override { o << "forward("; if (msg) { diff --git a/src/messages/MGatherCaps.h b/src/messages/MGatherCaps.h index f05ddf6a7f3..fe8b4187c55 100644 --- a/src/messages/MGatherCaps.h +++ b/src/messages/MGatherCaps.h @@ -17,7 +17,7 @@ protected: ~MGatherCaps() override {} public: - const char *get_type_name() const override { return "gather_caps"; } + std::string_view get_type_name() const override { return "gather_caps"; } void print(ostream& o) const override { o << "gather_caps(" << ino << ")"; } diff --git a/src/messages/MGenericMessage.h b/src/messages/MGenericMessage.h index 7b2f85df5e2..49e906d6f0f 100644 --- a/src/messages/MGenericMessage.h +++ b/src/messages/MGenericMessage.h @@ -33,7 +33,7 @@ private: //void set_pcid(long pcid) { this->pcid = pcid; } //long get_pcid() { return pcid; } - const char *get_type_name() const override { return tname; } + std::string_view get_type_name() const override { return tname; } void decode_payload() override { } void encode_payload(uint64_t features) override { } diff --git a/src/messages/MGetConfig.h b/src/messages/MGetConfig.h index 2bbf1170373..0e548576f79 100644 --- a/src/messages/MGetConfig.h +++ b/src/messages/MGetConfig.h @@ -22,7 +22,7 @@ public: name(n), host(h) {} - const char *get_type_name() const override { + std::string_view get_type_name() const override { return "get_config"; } void print(ostream& o) const override { diff --git a/src/messages/MGetPoolStats.h b/src/messages/MGetPoolStats.h index 98103f37872..54ee08f65ae 100644 --- a/src/messages/MGetPoolStats.h +++ b/src/messages/MGetPoolStats.h @@ -36,7 +36,7 @@ private: ~MGetPoolStats() override {} public: - const char *get_type_name() const override { return "getpoolstats"; } + std::string_view get_type_name() const override { return "getpoolstats"; } void print(ostream& out) const override { out << "getpoolstats(" << get_tid() << " " << pools << " v" << version << ")"; } diff --git a/src/messages/MGetPoolStatsReply.h b/src/messages/MGetPoolStatsReply.h index 378b80448d5..e9bb829dc17 100644 --- a/src/messages/MGetPoolStatsReply.h +++ b/src/messages/MGetPoolStatsReply.h @@ -34,7 +34,7 @@ private: ~MGetPoolStatsReply() override {} public: - const char *get_type_name() const override { return "getpoolstats"; } + std::string_view get_type_name() const override { return "getpoolstats"; } void print(ostream& out) const override { out << "getpoolstatsreply(" << get_tid() << " v" << version << ")"; } diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h index bb142834392..50259619e90 100644 --- a/src/messages/MHeartbeat.h +++ b/src/messages/MHeartbeat.h @@ -45,7 +45,7 @@ protected: ~MHeartbeat() override {} public: - const char *get_type_name() const override { return "HB"; } + std::string_view get_type_name() const override { return "HB"; } void encode_payload(uint64_t features) override { using ceph::encode; diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h index c01c487b4dd..0d32dcd720f 100644 --- a/src/messages/MInodeFileCaps.h +++ b/src/messages/MInodeFileCaps.h @@ -40,7 +40,7 @@ protected: ~MInodeFileCaps() override {} public: - const char *get_type_name() const override { return "inode_file_caps";} + std::string_view get_type_name() const override { return "inode_file_caps";} void print(ostream& out) const override { out << "inode_file_caps(" << ino << " " << ccap_string(caps) << ")"; } diff --git a/src/messages/MLock.h b/src/messages/MLock.h index 12811e2f72d..eec664d800b 100644 --- a/src/messages/MLock.h +++ b/src/messages/MLock.h @@ -65,7 +65,7 @@ protected: ~MLock() override {} public: - const char *get_type_name() const override { return "ILock"; } + std::string_view get_type_name() const override { return "ILock"; } void print(ostream& out) const override { out << "lock(a=" << get_lock_action_name(action) << " " << get_lock_type_name(lock_type) diff --git a/src/messages/MLog.h b/src/messages/MLog.h index 84ce8d7a7dd..d2c6e9e9914 100644 --- a/src/messages/MLog.h +++ b/src/messages/MLog.h @@ -35,7 +35,7 @@ private: ~MLog() override {} public: - const char *get_type_name() const override { return "log"; } + std::string_view get_type_name() const override { return "log"; } void print(ostream& out) const override { out << "log("; if (entries.size()) diff --git a/src/messages/MLogAck.h b/src/messages/MLogAck.h index a696c6fdf42..012c758d67e 100644 --- a/src/messages/MLogAck.h +++ b/src/messages/MLogAck.h @@ -29,7 +29,7 @@ private: ~MLogAck() override {} public: - const char *get_type_name() const override { return "log_ack"; } + std::string_view get_type_name() const override { return "log_ack"; } void print(ostream& out) const override { out << "log(last " << last << ")"; } diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h index 1d1436ad363..d1da261a614 100644 --- a/src/messages/MMDSBeacon.h +++ b/src/messages/MMDSBeacon.h @@ -231,7 +231,7 @@ public: epoch_t get_last_epoch_seen() const { return version; } MDSMap::DaemonState get_state() const { return state; } version_t get_seq() const { return seq; } - const char *get_type_name() const override { return "mdsbeacon"; } + std::string_view get_type_name() const override { return "mdsbeacon"; } mds_rank_t get_standby_for_rank() const { return standby_for_rank; } const string& get_standby_for_name() const { return standby_for_name; } const fs_cluster_id_t& get_standby_for_fscid() const { return standby_for_fscid; } diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h index 3eef9f717c1..985adb52407 100644 --- a/src/messages/MMDSCacheRejoin.h +++ b/src/messages/MMDSCacheRejoin.h @@ -224,7 +224,7 @@ protected: ~MMDSCacheRejoin() override {} public: - const char *get_type_name() const override { return "cache_rejoin"; } + std::string_view get_type_name() const override { return "cache_rejoin"; } void print(ostream& out) const override { out << "cache_rejoin " << get_opname(op); } diff --git a/src/messages/MMDSFindIno.h b/src/messages/MMDSFindIno.h index ca8e8df711f..a6d661b9471 100644 --- a/src/messages/MMDSFindIno.h +++ b/src/messages/MMDSFindIno.h @@ -31,7 +31,7 @@ protected: ~MMDSFindIno() override {} public: - const char *get_type_name() const override { return "findino"; } + std::string_view get_type_name() const override { return "findino"; } void print(ostream &out) const override { out << "findino(" << tid << " " << ino << ")"; } diff --git a/src/messages/MMDSFindInoReply.h b/src/messages/MMDSFindInoReply.h index c8e110a3501..10e003b3d14 100644 --- a/src/messages/MMDSFindInoReply.h +++ b/src/messages/MMDSFindInoReply.h @@ -31,7 +31,7 @@ protected: ~MMDSFindInoReply() override {} public: - const char *get_type_name() const override { return "findinoreply"; } + std::string_view get_type_name() const override { return "findinoreply"; } void print(ostream &out) const override { out << "findinoreply(" << tid << " " << path << ")"; } diff --git a/src/messages/MMDSFragmentNotify.h b/src/messages/MMDSFragmentNotify.h index 69dff281a20..0baa874f95c 100644 --- a/src/messages/MMDSFragmentNotify.h +++ b/src/messages/MMDSFragmentNotify.h @@ -49,7 +49,7 @@ protected: ~MMDSFragmentNotify() override {} public: - const char *get_type_name() const override { return "fragment_notify"; } + std::string_view get_type_name() const override { return "fragment_notify"; } void print(ostream& o) const override { o << "fragment_notify(" << base_dirfrag << " " << (int)bits << ")"; } diff --git a/src/messages/MMDSFragmentNotifyAck.h b/src/messages/MMDSFragmentNotifyAck.h index 52bbf358a3a..e20a3089ec2 100644 --- a/src/messages/MMDSFragmentNotifyAck.h +++ b/src/messages/MMDSFragmentNotifyAck.h @@ -40,7 +40,7 @@ protected: ~MMDSFragmentNotifyAck() override {} public: - const char *get_type_name() const override { return "fragment_notify_ack"; } + std::string_view get_type_name() const override { return "fragment_notify_ack"; } void print(ostream& o) const override { o << "fragment_notify_ack(" << base_dirfrag << " " << (int)bits << ")"; } diff --git a/src/messages/MMDSLoadTargets.h b/src/messages/MMDSLoadTargets.h index 554d80cda9e..98d845de3b8 100644 --- a/src/messages/MMDSLoadTargets.h +++ b/src/messages/MMDSLoadTargets.h @@ -38,7 +38,7 @@ protected: ~MMDSLoadTargets() override {} public: - const char* get_type_name() const override { return "mds_load_targets"; } + std::string_view get_type_name() const override { return "mds_load_targets"; } void print(ostream& o) const override { o << "mds_load_targets(" << global_id << " " << targets << ")"; } diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h index 2fef2beb53d..726cfac52ef 100644 --- a/src/messages/MMDSMap.h +++ b/src/messages/MMDSMap.h @@ -46,7 +46,7 @@ protected: ~MMDSMap() override {} public: - const char *get_type_name() const override { return "mdsmap"; } + std::string_view get_type_name() const override { return "mdsmap"; } void print(ostream& out) const override { out << "mdsmap(e " << epoch << ")"; } diff --git a/src/messages/MMDSOpenIno.h b/src/messages/MMDSOpenIno.h index f4636186d4c..b9a068bed32 100644 --- a/src/messages/MMDSOpenIno.h +++ b/src/messages/MMDSOpenIno.h @@ -35,7 +35,7 @@ protected: ~MMDSOpenIno() override {} public: - const char *get_type_name() const override { return "openino"; } + std::string_view get_type_name() const override { return "openino"; } void print(ostream &out) const override { out << "openino(" << header.tid << " " << ino << " " << ancestors << ")"; } diff --git a/src/messages/MMDSOpenInoReply.h b/src/messages/MMDSOpenInoReply.h index 56cb37551ff..6f87e6a90e5 100644 --- a/src/messages/MMDSOpenInoReply.h +++ b/src/messages/MMDSOpenInoReply.h @@ -35,7 +35,7 @@ protected: public: - const char *get_type_name() const override { return "openinoreply"; } + std::string_view get_type_name() const override { return "openinoreply"; } void print(ostream &out) const override { out << "openinoreply(" << header.tid << " " << ino << " " << hint << " " << ancestors << ")"; diff --git a/src/messages/MMDSResolve.h b/src/messages/MMDSResolve.h index 0b8ce139e0d..52fad12e7cd 100644 --- a/src/messages/MMDSResolve.h +++ b/src/messages/MMDSResolve.h @@ -72,7 +72,7 @@ protected: ~MMDSResolve() override {} public: - const char *get_type_name() const override { return "mds_resolve"; } + std::string_view get_type_name() const override { return "mds_resolve"; } void print(ostream& out) const override { out << "mds_resolve(" << subtrees.size() diff --git a/src/messages/MMDSResolveAck.h b/src/messages/MMDSResolveAck.h index 8ce63c0ea5b..42698834333 100644 --- a/src/messages/MMDSResolveAck.h +++ b/src/messages/MMDSResolveAck.h @@ -32,7 +32,7 @@ protected: ~MMDSResolveAck() override {} public: - const char *get_type_name() const override { return "resolve_ack"; } + std::string_view get_type_name() const override { return "resolve_ack"; } /*void print(ostream& out) const { out << "resolve_ack.size() << "+" << ambiguous_imap.size() diff --git a/src/messages/MMDSSlaveRequest.h b/src/messages/MMDSSlaveRequest.h index 2971a167a9a..f9be3af824f 100644 --- a/src/messages/MMDSSlaveRequest.h +++ b/src/messages/MMDSSlaveRequest.h @@ -207,7 +207,7 @@ public: decode(desti_snapbl, p); } - const char *get_type_name() const override { return "slave_request"; } + std::string_view get_type_name() const override { return "slave_request"; } void print(ostream& out) const override { out << "slave_request(" << reqid << "." << attempt diff --git a/src/messages/MMDSSnapUpdate.h b/src/messages/MMDSSnapUpdate.h index e8672c68e95..06872cdc153 100644 --- a/src/messages/MMDSSnapUpdate.h +++ b/src/messages/MMDSSnapUpdate.h @@ -40,7 +40,7 @@ protected: ~MMDSSnapUpdate() override {} public: - const char *get_type_name() const override { return "snap_update"; } + std::string_view get_type_name() const override { return "snap_update"; } void print(ostream& o) const override { o << "snap_update(" << ino << " table_tid " << get_tid() << ")"; } diff --git a/src/messages/MMDSTableRequest.h b/src/messages/MMDSTableRequest.h index ae952676e28..4a6e2ca97e4 100644 --- a/src/messages/MMDSTableRequest.h +++ b/src/messages/MMDSTableRequest.h @@ -38,7 +38,7 @@ protected: ~MMDSTableRequest() override {} public: - const char *get_type_name() const override { return "mds_table_request"; } + std::string_view get_type_name() const override { return "mds_table_request"; } void print(ostream& o) const override { o << "mds_table_request(" << get_mdstable_name(table) << " " << get_mdstableserver_opname(op); diff --git a/src/messages/MMgrBeacon.h b/src/messages/MMgrBeacon.h index b35de8be719..f3bb8384c1d 100644 --- a/src/messages/MMgrBeacon.h +++ b/src/messages/MMgrBeacon.h @@ -103,7 +103,7 @@ private: public: - const char *get_type_name() const override { return "mgrbeacon"; } + std::string_view get_type_name() const override { return "mgrbeacon"; } void print(ostream& out) const override { out << get_type_name() << " mgr." << name << "(" << fsid << "," diff --git a/src/messages/MMgrClose.h b/src/messages/MMgrClose.h index 25c31919e66..43d603a8628 100644 --- a/src/messages/MMgrClose.h +++ b/src/messages/MMgrClose.h @@ -30,7 +30,7 @@ public: encode(service_name, payload); } - const char *get_type_name() const override { return "mgrclose"; } + std::string_view get_type_name() const override { return "mgrclose"; } void print(ostream& out) const override { out << get_type_name() << "("; if (service_name.length()) { diff --git a/src/messages/MMgrConfigure.h b/src/messages/MMgrConfigure.h index 05d21578b8b..b9f69095fce 100644 --- a/src/messages/MMgrConfigure.h +++ b/src/messages/MMgrConfigure.h @@ -57,7 +57,7 @@ public: encode(osd_perf_metric_queries, payload); } - const char *get_type_name() const override { return "mgrconfigure"; } + std::string_view get_type_name() const override { return "mgrconfigure"; } void print(ostream& out) const override { out << get_type_name() << "(period=" << stats_period << ", threshold=" << stats_threshold << ")"; diff --git a/src/messages/MMgrDigest.h b/src/messages/MMgrDigest.h index 949984b5800..ec4800d4ab6 100644 --- a/src/messages/MMgrDigest.h +++ b/src/messages/MMgrDigest.h @@ -32,7 +32,7 @@ public: MMgrDigest() : MessageInstance(MSG_MGR_DIGEST) {} - const char *get_type_name() const override { return "mgrdigest"; } + std::string_view get_type_name() const override { return "mgrdigest"; } void print(ostream& out) const override { out << get_type_name(); } diff --git a/src/messages/MMgrMap.h b/src/messages/MMgrMap.h index af223b94b39..032a9c1a875 100644 --- a/src/messages/MMgrMap.h +++ b/src/messages/MMgrMap.h @@ -40,7 +40,7 @@ private: ~MMgrMap() override {} public: - const char *get_type_name() const override { return "mgrmap"; } + std::string_view get_type_name() const override { return "mgrmap"; } void print(ostream& out) const override { out << get_type_name() << "(e " << map.epoch << ")"; } diff --git a/src/messages/MMgrOpen.h b/src/messages/MMgrOpen.h index 0328f159d73..754daf7d340 100644 --- a/src/messages/MMgrOpen.h +++ b/src/messages/MMgrOpen.h @@ -71,7 +71,7 @@ public: encode(config_defaults_bl, payload); } - const char *get_type_name() const override { return "mgropen"; } + std::string_view get_type_name() const override { return "mgropen"; } void print(ostream& out) const override { out << get_type_name() << "("; if (service_name.length()) { diff --git a/src/messages/MMgrReport.h b/src/messages/MMgrReport.h index 82d1bd89e97..dcfbf658546 100644 --- a/src/messages/MMgrReport.h +++ b/src/messages/MMgrReport.h @@ -145,7 +145,7 @@ public: encode(osd_perf_metric_reports, payload); } - const char *get_type_name() const override { return "mgrreport"; } + std::string_view get_type_name() const override { return "mgrreport"; } void print(ostream& out) const override { out << get_type_name() << "("; if (service_name.length()) { diff --git a/src/messages/MMonCommand.h b/src/messages/MMonCommand.h index 7af8f8f919c..afb3142b49d 100644 --- a/src/messages/MMonCommand.h +++ b/src/messages/MMonCommand.h @@ -37,7 +37,7 @@ private: ~MMonCommand() override {} public: - const char *get_type_name() const override { return "mon_command"; } + std::string_view get_type_name() const override { return "mon_command"; } void print(ostream& o) const override { o << "mon_command("; for (unsigned i=0; i states; OSDMap::calc_state_set(state, states); diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h index a8822e7b3e4..9a5062c64ce 100644 --- a/src/messages/MOSDMap.h +++ b/src/messages/MOSDMap.h @@ -159,7 +159,7 @@ public: } } - const char *get_type_name() const override { return "osdmap"; } + std::string_view get_type_name() const override { return "osdmap"; } void print(ostream& out) const override { out << "osd_map(" << get_first() << ".." << get_last(); if (oldest_map || newest_map) diff --git a/src/messages/MOSDMarkMeDown.h b/src/messages/MOSDMarkMeDown.h index 23523950e9d..89c3d75cefd 100644 --- a/src/messages/MOSDMarkMeDown.h +++ b/src/messages/MOSDMarkMeDown.h @@ -89,7 +89,7 @@ public: encode(request_ack, payload); } - const char *get_type_name() const override { return "MOSDMarkMeDown"; } + std::string_view get_type_name() const override { return "MOSDMarkMeDown"; } void print(ostream& out) const override { out << "MOSDMarkMeDown(" << "request_ack=" << request_ack diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h index a8a379d8495..c751b53d97d 100644 --- a/src/messages/MOSDOp.h +++ b/src/messages/MOSDOp.h @@ -571,7 +571,7 @@ struct ceph_osd_request_head { bdata_encode = false; } - const char *get_type_name() const override { return "osd_op"; } + std::string_view get_type_name() const override { return "osd_op"; } void print(ostream& out) const override { out << "osd_op("; if (!partial_decode_needed) { diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h index 33ff6ddc4f1..3649921e63e 100644 --- a/src/messages/MOSDOpReply.h +++ b/src/messages/MOSDOpReply.h @@ -311,7 +311,7 @@ public: } } - const char *get_type_name() const override { return "osd_op_reply"; } + std::string_view get_type_name() const override { return "osd_op_reply"; } void print(ostream& out) const override { out << "osd_op_reply(" << get_tid() diff --git a/src/messages/MOSDPGBackfill.h b/src/messages/MOSDPGBackfill.h index 45e9aa9cdad..47d25b0c674 100644 --- a/src/messages/MOSDPGBackfill.h +++ b/src/messages/MOSDPGBackfill.h @@ -101,7 +101,7 @@ private: ~MOSDPGBackfill() override {} public: - const char *get_type_name() const override { return "pg_backfill"; } + std::string_view get_type_name() const override { return "pg_backfill"; } void print(ostream& out) const override { out << "pg_backfill(" << get_op_name(op) << " " << pgid diff --git a/src/messages/MOSDPGBackfillRemove.h b/src/messages/MOSDPGBackfillRemove.h index d1e1e1a88e5..359145183e6 100644 --- a/src/messages/MOSDPGBackfillRemove.h +++ b/src/messages/MOSDPGBackfillRemove.h @@ -53,7 +53,7 @@ private: ~MOSDPGBackfillRemove() {} public: - const char *get_type_name() const override { return "backfill_remove"; } + std::string_view get_type_name() const override { return "backfill_remove"; } void print(ostream& out) const override { out << "backfill_remove(" << pgid << " e" << map_epoch << " " << ls << ")"; diff --git a/src/messages/MOSDPGCreate.h b/src/messages/MOSDPGCreate.h index 556162458cd..eef056ab860 100644 --- a/src/messages/MOSDPGCreate.h +++ b/src/messages/MOSDPGCreate.h @@ -43,7 +43,7 @@ private: ~MOSDPGCreate() override {} public: - const char *get_type_name() const override { return "pg_create"; } + std::string_view get_type_name() const override { return "pg_create"; } void encode_payload(uint64_t features) override { using ceph::encode; diff --git a/src/messages/MOSDPGCreate2.h b/src/messages/MOSDPGCreate2.h index 3dd2e2069f7..f232483f007 100644 --- a/src/messages/MOSDPGCreate2.h +++ b/src/messages/MOSDPGCreate2.h @@ -29,7 +29,7 @@ private: ~MOSDPGCreate2() override {} public: - const char *get_type_name() const override { + std::string_view get_type_name() const override { return "pg_create2"; } void print(ostream& out) const override { diff --git a/src/messages/MOSDPGCreated.h b/src/messages/MOSDPGCreated.h index cb411df3423..6ccb9f9789f 100644 --- a/src/messages/MOSDPGCreated.h +++ b/src/messages/MOSDPGCreated.h @@ -18,7 +18,7 @@ public: : MessageInstance(MSG_OSD_PG_CREATED, 0), pgid(pgid) {} - const char *get_type_name() const override { return "pg_created"; } + std::string_view get_type_name() const override { return "pg_created"; } void print(ostream& out) const override { out << "osd_pg_created(" << pgid << ")"; } diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h index 8434651e4b8..461a0fa65e7 100644 --- a/src/messages/MOSDPGInfo.h +++ b/src/messages/MOSDPGInfo.h @@ -46,7 +46,7 @@ private: ~MOSDPGInfo() override {} public: - const char *get_type_name() const override { return "pg_info"; } + std::string_view get_type_name() const override { return "pg_info"; } void print(ostream& out) const override { out << "pg_info("; for (auto i = pg_list.begin(); diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h index 86e65baeb84..6c9728ef405 100644 --- a/src/messages/MOSDPGLog.h +++ b/src/messages/MOSDPGLog.h @@ -84,7 +84,7 @@ private: ~MOSDPGLog() override {} public: - const char *get_type_name() const override { return "PGlog"; } + std::string_view get_type_name() const override { return "PGlog"; } void inner_print(ostream& out) const override { // NOTE: log is not const, but operator<< doesn't touch fields // swapped out by OSD code. diff --git a/src/messages/MOSDPGNotify.h b/src/messages/MOSDPGNotify.h index 2447525b4cb..4370eae3a5a 100644 --- a/src/messages/MOSDPGNotify.h +++ b/src/messages/MOSDPGNotify.h @@ -57,7 +57,7 @@ private: ~MOSDPGNotify() override {} public: - const char *get_type_name() const override { return "PGnot"; } + std::string_view get_type_name() const override { return "PGnot"; } void encode_payload(uint64_t features) override { using ceph::encode; diff --git a/src/messages/MOSDPGPull.h b/src/messages/MOSDPGPull.h index 85043e021b0..16eeca7ef74 100644 --- a/src/messages/MOSDPGPull.h +++ b/src/messages/MOSDPGPull.h @@ -93,7 +93,7 @@ public: encode(min_epoch, payload); } - const char *get_type_name() const override { return "MOSDPGPull"; } + std::string_view get_type_name() const override { return "MOSDPGPull"; } void print(ostream& out) const override { out << "MOSDPGPull(" << pgid diff --git a/src/messages/MOSDPGPush.h b/src/messages/MOSDPGPush.h index 611dbd9b361..d7da9133067 100644 --- a/src/messages/MOSDPGPush.h +++ b/src/messages/MOSDPGPush.h @@ -92,7 +92,7 @@ public: encode(min_epoch, payload); } - const char *get_type_name() const override { return "MOSDPGPush"; } + std::string_view get_type_name() const override { return "MOSDPGPush"; } void print(ostream& out) const override { out << "MOSDPGPush(" << pgid diff --git a/src/messages/MOSDPGPushReply.h b/src/messages/MOSDPGPushReply.h index a5c5d880e44..b9b7687e8eb 100644 --- a/src/messages/MOSDPGPushReply.h +++ b/src/messages/MOSDPGPushReply.h @@ -92,7 +92,7 @@ public: out << ")"; } - const char *get_type_name() const override { return "MOSDPGPushReply"; } + std::string_view get_type_name() const override { return "MOSDPGPushReply"; } }; #endif diff --git a/src/messages/MOSDPGQuery.h b/src/messages/MOSDPGQuery.h index 9d6eae43709..d1d9ecd9156 100644 --- a/src/messages/MOSDPGQuery.h +++ b/src/messages/MOSDPGQuery.h @@ -53,7 +53,7 @@ private: ~MOSDPGQuery() override {} public: - const char *get_type_name() const override { return "pg_query"; } + std::string_view get_type_name() const override { return "pg_query"; } void print(ostream& out) const override { out << "pg_query("; for (map::const_iterator p = pg_list.begin(); diff --git a/src/messages/MOSDPGReadyToMerge.h b/src/messages/MOSDPGReadyToMerge.h index 937eaa6723a..cbe22af39b0 100644 --- a/src/messages/MOSDPGReadyToMerge.h +++ b/src/messages/MOSDPGReadyToMerge.h @@ -37,7 +37,7 @@ public: decode(last_epoch_clean, p); decode(ready, p); } - const char *get_type_name() const override { return "osd_pg_ready_to_merge"; } + std::string_view get_type_name() const override { return "osd_pg_ready_to_merge"; } void print(ostream &out) const { out << get_type_name() << "(" << pgid diff --git a/src/messages/MOSDPGRecoveryDelete.h b/src/messages/MOSDPGRecoveryDelete.h index 4774978213a..c6fa1366916 100644 --- a/src/messages/MOSDPGRecoveryDelete.h +++ b/src/messages/MOSDPGRecoveryDelete.h @@ -62,7 +62,7 @@ private: ~MOSDPGRecoveryDelete() {} public: - const char *get_type_name() const { return "recovery_delete"; } + std::string_view get_type_name() const { return "recovery_delete"; } void print(ostream& out) const { out << "MOSDPGRecoveryDelete(" << pgid << " e" << map_epoch << "," << min_epoch << " " << objects << ")"; diff --git a/src/messages/MOSDPGRecoveryDeleteReply.h b/src/messages/MOSDPGRecoveryDeleteReply.h index e2e8189b86f..e6401774167 100644 --- a/src/messages/MOSDPGRecoveryDeleteReply.h +++ b/src/messages/MOSDPGRecoveryDeleteReply.h @@ -58,7 +58,7 @@ public: << " e" << map_epoch << "," << min_epoch << " " << objects << ")"; } - const char *get_type_name() const override { return "recovery_delete_reply"; } + std::string_view get_type_name() const override { return "recovery_delete_reply"; } }; #endif diff --git a/src/messages/MOSDPGRemove.h b/src/messages/MOSDPGRemove.h index 7508bc0f610..94e9885e9d9 100644 --- a/src/messages/MOSDPGRemove.h +++ b/src/messages/MOSDPGRemove.h @@ -45,7 +45,7 @@ private: ~MOSDPGRemove() override {} public: - const char *get_type_name() const override { return "PGrm"; } + std::string_view get_type_name() const override { return "PGrm"; } void encode_payload(uint64_t features) override { using ceph::encode; diff --git a/src/messages/MOSDPGScan.h b/src/messages/MOSDPGScan.h index 04db4ae6165..99f0b0bdd3f 100644 --- a/src/messages/MOSDPGScan.h +++ b/src/messages/MOSDPGScan.h @@ -104,7 +104,7 @@ private: ~MOSDPGScan() override {} public: - const char *get_type_name() const override { return "pg_scan"; } + std::string_view get_type_name() const override { return "pg_scan"; } void print(ostream& out) const override { out << "pg_scan(" << get_op_name(op) << " " << pgid diff --git a/src/messages/MOSDPGTemp.h b/src/messages/MOSDPGTemp.h index 68f2219fead..22a8602b2f2 100644 --- a/src/messages/MOSDPGTemp.h +++ b/src/messages/MOSDPGTemp.h @@ -55,7 +55,7 @@ public: } } - const char *get_type_name() const override { return "osd_pgtemp"; } + std::string_view get_type_name() const override { return "osd_pgtemp"; } void print(ostream &out) const override { out << "osd_pgtemp(e" << map_epoch << " " << pg_temp << " v" << version << ")"; } diff --git a/src/messages/MOSDPGTrim.h b/src/messages/MOSDPGTrim.h index 2ec971d4ded..e596d12bde7 100644 --- a/src/messages/MOSDPGTrim.h +++ b/src/messages/MOSDPGTrim.h @@ -55,7 +55,7 @@ private: ~MOSDPGTrim() override {} public: - const char *get_type_name() const override { return "pg_trim"; } + std::string_view get_type_name() const override { return "pg_trim"; } void inner_print(ostream& out) const override { out << trim_to; } diff --git a/src/messages/MOSDPGUpdateLogMissing.h b/src/messages/MOSDPGUpdateLogMissing.h index f3db4bf935b..cbf9485e915 100644 --- a/src/messages/MOSDPGUpdateLogMissing.h +++ b/src/messages/MOSDPGUpdateLogMissing.h @@ -79,7 +79,7 @@ private: ~MOSDPGUpdateLogMissing() override {} public: - const char *get_type_name() const override { return "PGUpdateLogMissing"; } + std::string_view get_type_name() const override { return "PGUpdateLogMissing"; } void print(ostream& out) const override { out << "pg_update_log_missing(" << pgid << " epoch " << map_epoch << "/" << min_epoch diff --git a/src/messages/MOSDPGUpdateLogMissingReply.h b/src/messages/MOSDPGUpdateLogMissingReply.h index 3f70eded1af..8d7050f2a56 100644 --- a/src/messages/MOSDPGUpdateLogMissingReply.h +++ b/src/messages/MOSDPGUpdateLogMissingReply.h @@ -80,7 +80,7 @@ private: ~MOSDPGUpdateLogMissingReply() override {} public: - const char *get_type_name() const override { return "PGUpdateLogMissingReply"; } + std::string_view get_type_name() const override { return "PGUpdateLogMissingReply"; } void print(ostream& out) const override { out << "pg_update_log_missing_reply(" << pgid << " epoch " << map_epoch << "/" << min_epoch diff --git a/src/messages/MOSDPing.h b/src/messages/MOSDPing.h index 555807d3cce..6a2693a0df2 100644 --- a/src/messages/MOSDPing.h +++ b/src/messages/MOSDPing.h @@ -118,7 +118,7 @@ public: } } - const char *get_type_name() const override { return "osd_ping"; } + std::string_view get_type_name() const override { return "osd_ping"; } void print(ostream& out) const override { out << "osd_ping(" << get_op_name(op) << " e" << map_epoch diff --git a/src/messages/MOSDRepOp.h b/src/messages/MOSDRepOp.h index 0e587c48d74..9d087f391e6 100644 --- a/src/messages/MOSDRepOp.h +++ b/src/messages/MOSDRepOp.h @@ -163,7 +163,7 @@ private: ~MOSDRepOp() override {} public: - const char *get_type_name() const override { return "osd_repop"; } + std::string_view get_type_name() const override { return "osd_repop"; } void print(ostream& out) const override { out << "osd_repop(" << reqid << " " << pgid << " e" << map_epoch << "/" << min_epoch; diff --git a/src/messages/MOSDRepOpReply.h b/src/messages/MOSDRepOpReply.h index 3a7e5a76225..9ca3a54f587 100644 --- a/src/messages/MOSDRepOpReply.h +++ b/src/messages/MOSDRepOpReply.h @@ -138,7 +138,7 @@ private: ~MOSDRepOpReply() override {} public: - const char *get_type_name() const override { return "osd_repop_reply"; } + std::string_view get_type_name() const override { return "osd_repop_reply"; } void print(ostream& out) const override { out << "osd_repop_reply(" << reqid diff --git a/src/messages/MOSDRepScrub.h b/src/messages/MOSDRepScrub.h index 953c1a377bb..40867bedc66 100644 --- a/src/messages/MOSDRepScrub.h +++ b/src/messages/MOSDRepScrub.h @@ -77,7 +77,7 @@ private: ~MOSDRepScrub() override {} public: - const char *get_type_name() const override { return "replica scrub"; } + std::string_view get_type_name() const override { return "replica scrub"; } void print(ostream& out) const override { out << "replica_scrub(pg: " << pgid << ",from:" << scrub_from diff --git a/src/messages/MOSDRepScrubMap.h b/src/messages/MOSDRepScrubMap.h index 45a736cbff5..984ebb4ffa6 100644 --- a/src/messages/MOSDRepScrubMap.h +++ b/src/messages/MOSDRepScrubMap.h @@ -54,7 +54,7 @@ private: ~MOSDRepScrubMap() {} public: - const char *get_type_name() const override { return "rep_scrubmap"; } + std::string_view get_type_name() const override { return "rep_scrubmap"; } void print(ostream& out) const override { out << "rep_scrubmap(" << pgid << " e" << map_epoch << " from shard " << from diff --git a/src/messages/MOSDScrub.h b/src/messages/MOSDScrub.h index 71b9749d610..8df546701ea 100644 --- a/src/messages/MOSDScrub.h +++ b/src/messages/MOSDScrub.h @@ -45,7 +45,7 @@ private: ~MOSDScrub() override {} public: - const char *get_type_name() const override { return "scrub"; } + std::string_view get_type_name() const override { return "scrub"; } void print(ostream& out) const override { out << "scrub("; if (scrub_pgs.empty()) diff --git a/src/messages/MOSDScrub2.h b/src/messages/MOSDScrub2.h index 6e1a6145f77..98fb0f31a1d 100644 --- a/src/messages/MOSDScrub2.h +++ b/src/messages/MOSDScrub2.h @@ -30,7 +30,7 @@ private: ~MOSDScrub2() override {} public: - const char *get_type_name() const override { return "scrub2"; } + std::string_view get_type_name() const override { return "scrub2"; } void print(ostream& out) const override { out << "scrub2(" << scrub_pgs; if (repair) diff --git a/src/messages/MOSDScrubReserve.h b/src/messages/MOSDScrubReserve.h index c8966c1a6ce..a75796f9ae8 100644 --- a/src/messages/MOSDScrubReserve.h +++ b/src/messages/MOSDScrubReserve.h @@ -53,7 +53,7 @@ public: pgid(pgid), map_epoch(map_epoch), type(type), from(from) {} - const char *get_type_name() const { + std::string_view get_type_name() const { return "MOSDScrubReserve"; } diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h index 491da1a96b5..ca907a48aa0 100644 --- a/src/messages/MPGStats.h +++ b/src/messages/MPGStats.h @@ -43,7 +43,7 @@ private: ~MPGStats() override {} public: - const char *get_type_name() const override { return "pg_stats"; } + std::string_view get_type_name() const override { return "pg_stats"; } void print(ostream& out) const override { out << "pg_stats(" << pg_stat.size() << " pgs tid " << get_tid() << " v " << version << ")"; } diff --git a/src/messages/MPGStatsAck.h b/src/messages/MPGStatsAck.h index 20268553001..5fe78bfc00e 100644 --- a/src/messages/MPGStatsAck.h +++ b/src/messages/MPGStatsAck.h @@ -29,7 +29,7 @@ private: ~MPGStatsAck() override {} public: - const char *get_type_name() const override { return "pg_stats_ack"; } + std::string_view get_type_name() const override { return "pg_stats_ack"; } void print(ostream& out) const override { out << "pg_stats_ack(" << pg_stat.size() << " pgs tid " << get_tid() << ")"; } diff --git a/src/messages/MPing.h b/src/messages/MPing.h index 6de6dac6ff6..4175a1d51fb 100644 --- a/src/messages/MPing.h +++ b/src/messages/MPing.h @@ -29,7 +29,7 @@ private: public: void decode_payload() override { } void encode_payload(uint64_t features) override { } - const char *get_type_name() const override { return "ping"; } + std::string_view get_type_name() const override { return "ping"; } }; #endif diff --git a/src/messages/MPoolOp.h b/src/messages/MPoolOp.h index d3db9119ce7..d13c87717c0 100644 --- a/src/messages/MPoolOp.h +++ b/src/messages/MPoolOp.h @@ -46,7 +46,7 @@ private: ~MPoolOp() override {} public: - const char *get_type_name() const override { return "poolop"; } + std::string_view get_type_name() const override { return "poolop"; } void print(ostream& out) const override { out << "pool_op(" << ceph_pool_op_name(op) << " pool " << pool << " tid " << get_tid() diff --git a/src/messages/MPoolOpReply.h b/src/messages/MPoolOpReply.h index 2e83a464a6a..41a6dfbb4ab 100644 --- a/src/messages/MPoolOpReply.h +++ b/src/messages/MPoolOpReply.h @@ -46,7 +46,7 @@ public: response_data.claim(*blp); } - const char *get_type_name() const override { return "poolopreply"; } + std::string_view get_type_name() const override { return "poolopreply"; } void print(ostream& out) const override { out << "pool_op_reply(tid " << get_tid() diff --git a/src/messages/MRecoveryReserve.h b/src/messages/MRecoveryReserve.h index ae10f363495..2dc7d6c37c4 100644 --- a/src/messages/MRecoveryReserve.h +++ b/src/messages/MRecoveryReserve.h @@ -84,7 +84,7 @@ public: pgid(pgid), query_epoch(query_epoch), type(type), priority(prio) {} - const char *get_type_name() const override { + std::string_view get_type_name() const override { return "MRecoveryReserve"; } diff --git a/src/messages/MRemoveSnaps.h b/src/messages/MRemoveSnaps.h index 849ef55f87b..96f1f2df722 100644 --- a/src/messages/MRemoveSnaps.h +++ b/src/messages/MRemoveSnaps.h @@ -33,7 +33,7 @@ protected: ~MRemoveSnaps() override {} public: - const char *get_type_name() const override { return "remove_snaps"; } + std::string_view get_type_name() const override { return "remove_snaps"; } void print(ostream& out) const override { out << "remove_snaps(" << snaps << " v" << version << ")"; } diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h index 1e35a0b2bca..d0cf441e339 100644 --- a/src/messages/MRoute.h +++ b/src/messages/MRoute.h @@ -70,7 +70,7 @@ public: encode(send_osdmap_first, payload); } - const char *get_type_name() const override { return "route"; } + std::string_view get_type_name() const override { return "route"; } void print(ostream& o) const override { if (msg) o << "route(" << *msg; diff --git a/src/messages/MServiceMap.h b/src/messages/MServiceMap.h index 565f3f406e2..275acfcd342 100644 --- a/src/messages/MServiceMap.h +++ b/src/messages/MServiceMap.h @@ -21,7 +21,7 @@ private: ~MServiceMap() override {} public: - const char *get_type_name() const override { return "service_map"; } + std::string_view get_type_name() const override { return "service_map"; } void print(ostream& out) const override { out << "service_map(e" << service_map.epoch << " " << service_map.services.size() << " svc)"; diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h index 45601d78d33..f68d67285b9 100644 --- a/src/messages/MStatfs.h +++ b/src/messages/MStatfs.h @@ -42,7 +42,7 @@ private: ~MStatfs() override {} public: - const char *get_type_name() const override { return "statfs"; } + std::string_view get_type_name() const override { return "statfs"; } void print(ostream& out) const override { out << "statfs(" << get_tid() << " pool " << (data_pool ? *data_pool : -1) << " v" << version << ")"; diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h index 59738c8d293..4dd6b40e416 100644 --- a/src/messages/MStatfsReply.h +++ b/src/messages/MStatfsReply.h @@ -29,7 +29,7 @@ public: h.version = epoch; } - const char *get_type_name() const override { return "statfs_reply"; } + std::string_view get_type_name() const override { return "statfs_reply"; } void print(ostream& out) const override { out << "statfs_reply(" << header.tid << ")"; } diff --git a/src/messages/MTimeCheck.h b/src/messages/MTimeCheck.h index 628640a7534..994c6dd8bb5 100644 --- a/src/messages/MTimeCheck.h +++ b/src/messages/MTimeCheck.h @@ -45,7 +45,7 @@ private: ~MTimeCheck() override { } public: - const char *get_type_name() const override { return "time_check"; } + std::string_view get_type_name() const override { return "time_check"; } const char *get_op_name() const { switch (op) { case OP_PING: return "ping"; diff --git a/src/messages/MTimeCheck2.h b/src/messages/MTimeCheck2.h index 6c100c672b0..1d93fcc916c 100644 --- a/src/messages/MTimeCheck2.h +++ b/src/messages/MTimeCheck2.h @@ -45,7 +45,7 @@ private: ~MTimeCheck2() override { } public: - const char *get_type_name() const override { return "time_check2"; } + std::string_view get_type_name() const override { return "time_check2"; } const char *get_op_name() const { switch (op) { case OP_PING: return "ping"; diff --git a/src/messages/MWatchNotify.h b/src/messages/MWatchNotify.h index 8da4738b35a..b3a46d3e54b 100644 --- a/src/messages/MWatchNotify.h +++ b/src/messages/MWatchNotify.h @@ -82,7 +82,7 @@ public: encode(notifier_gid, payload); } - const char *get_type_name() const override { return "watch-notify"; } + std::string_view get_type_name() const override { return "watch-notify"; } void print(ostream& out) const override { out << "watch-notify(" << ceph_watch_event_name(opcode) << " (" << (int)opcode << ")" diff --git a/src/messages/PaxosServiceMessage.h b/src/messages/PaxosServiceMessage.h index a947b548ee0..5b0b1bf5afb 100644 --- a/src/messages/PaxosServiceMessage.h +++ b/src/messages/PaxosServiceMessage.h @@ -50,7 +50,7 @@ public: paxos_decode(p); } - const char *get_type_name() const override { return "PaxosServiceMessage"; } + std::string_view get_type_name() const override { return "PaxosServiceMessage"; } }; #endif diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index 9ad3de87fb1..21650395486 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -1687,7 +1687,7 @@ bool AuthMonitor::_upgrade_format_to_dumpling() // set daemon profiles if ((p->first.is_osd() || p->first.is_mds()) && mon_caps == "allow rwx") { - new_caps = string("allow profile ") + string(p->first.get_type_name()); + new_caps = string("allow profile ") + p->first.get_type_name(); } // update bootstrap keys diff --git a/src/msg/Message.h b/src/msg/Message.h index 83b2ad07886..42405ed3411 100644 --- a/src/msg/Message.h +++ b/src/msg/Message.h @@ -17,6 +17,7 @@ #include #include +#include #include @@ -496,7 +497,7 @@ public: // virtual bits virtual void decode_payload() = 0; virtual void encode_payload(uint64_t features) = 0; - virtual const char *get_type_name() const = 0; + virtual std::string_view get_type_name() const = 0; virtual void print(ostream& out) const { out << get_type_name() << " magic: " << magic; } diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h index 1049ad540a0..2ade8f926be 100644 --- a/src/msg/msg_types.h +++ b/src/msg/msg_types.h @@ -237,7 +237,7 @@ struct entity_addr_t { TYPE_ANY = 3, ///< ambiguous } type_t; static const type_t TYPE_DEFAULT = TYPE_MSGR2; - static const char *get_type_name(int t) { + static std::string_view get_type_name(int t) { switch (t) { case TYPE_NONE: return "none"; case TYPE_LEGACY: return "v1"; diff --git a/src/osd/HitSet.h b/src/osd/HitSet.h index c6337c2eeb4..943f4064714 100644 --- a/src/osd/HitSet.h +++ b/src/osd/HitSet.h @@ -15,6 +15,8 @@ #ifndef CEPH_OSD_HITSET_H #define CEPH_OSD_HITSET_H +#include + #include #include "include/encoding.h" @@ -39,7 +41,7 @@ public: TYPE_BLOOM = 3 } impl_type_t; - static const char *get_type_name(impl_type_t t) { + static std::string_view get_type_name(impl_type_t t) { switch (t) { case TYPE_NONE: return "none"; case TYPE_EXPLICIT_HASH: return "explicit_hash"; @@ -48,7 +50,7 @@ public: default: return "???"; } } - const char *get_type_name() const { + std::string_view get_type_name() const { if (impl) return get_type_name(impl->get_type()); return get_type_name(TYPE_NONE); diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index c35d20accc6..e5709521cc3 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -21,6 +21,7 @@ #include #include #include +#include #include #include #include @@ -1085,7 +1086,7 @@ struct pg_pool_t { //TYPE_RAID4 = 2, // raid4 (never implemented) TYPE_ERASURE = 3, // erasure-coded }; - static const char *get_type_name(int t) { + static std::string_view get_type_name(int t) { switch (t) { case TYPE_REPLICATED: return "replicated"; //case TYPE_RAID4: return "raid4"; @@ -1093,7 +1094,7 @@ struct pg_pool_t { default: return "???"; } } - const char *get_type_name() const { + std::string_view get_type_name() const { return get_type_name(type); } @@ -3381,7 +3382,7 @@ struct pg_query_t { MISSING = 4, FULLLOG = 5, }; - const char *get_type_name() const { + std::string_view get_type_name() const { switch (type) { case INFO: return "info"; case LOG: return "log"; @@ -4984,7 +4985,7 @@ struct object_manifest_t { bool is_chunked() const { return type == TYPE_CHUNKED; } - static const char *get_type_name(uint8_t m) { + static std::string_view get_type_name(uint8_t m) { switch (m) { case TYPE_NONE: return "none"; case TYPE_REDIRECT: return "redirect"; @@ -4992,7 +4993,7 @@ struct object_manifest_t { default: return "unknown"; } } - const char *get_type_name() const { + std::string_view get_type_name() const { return get_type_name(type); } void clear() { -- 2.39.5