From f146c6c514b7f1ab8a2420edb5f7b64702bc9639 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Tue, 15 May 2018 23:56:39 +0800 Subject: [PATCH] core: use const_iterator for decode Signed-off-by: Kefu Chai --- src/auth/Auth.h | 12 +- src/auth/AuthClientHandler.h | 2 +- src/auth/AuthServiceHandler.h | 4 +- src/auth/Crypto.cc | 2 +- src/auth/Crypto.h | 4 +- src/auth/KeyRing.cc | 12 +- src/auth/KeyRing.h | 6 +- src/auth/cephx/CephxAuthorizeHandler.cc | 2 +- src/auth/cephx/CephxClientHandler.cc | 2 +- src/auth/cephx/CephxClientHandler.h | 2 +- src/auth/cephx/CephxKeyServer.cc | 2 +- src/auth/cephx/CephxKeyServer.h | 8 +- src/auth/cephx/CephxProtocol.cc | 10 +- src/auth/cephx/CephxProtocol.h | 34 ++--- src/auth/cephx/CephxServiceHandler.cc | 4 +- src/auth/cephx/CephxServiceHandler.h | 4 +- src/auth/cephx/CephxSessionHandler.cc | 2 +- src/auth/none/AuthNoneAuthorizeHandler.cc | 2 +- src/auth/none/AuthNoneClientHandler.h | 2 +- src/auth/none/AuthNoneProtocol.h | 2 +- src/auth/none/AuthNoneServiceHandler.h | 4 +- src/ceph_osd.cc | 2 +- src/client/Client.cc | 14 +- src/cls/cephfs/cls_cephfs.cc | 8 +- src/cls/cephfs/cls_cephfs.h | 6 +- src/cls/cephfs/cls_cephfs_client.cc | 10 +- src/cls/hello/cls_hello.cc | 2 +- src/cls/journal/cls_journal.cc | 38 ++--- src/cls/journal/cls_journal_client.cc | 22 +-- src/cls/journal/cls_journal_client.h | 8 +- src/cls/journal/cls_journal_types.cc | 8 +- src/cls/journal/cls_journal_types.h | 8 +- src/cls/lock/cls_lock.cc | 14 +- src/cls/lock/cls_lock_client.cc | 6 +- src/cls/lock/cls_lock_client.h | 2 +- src/cls/lock/cls_lock_ops.h | 16 +-- src/cls/lock/cls_lock_types.h | 6 +- src/cls/log/cls_log.cc | 12 +- src/cls/log/cls_log_client.cc | 4 +- src/cls/log/cls_log_ops.h | 12 +- src/cls/log/cls_log_types.h | 4 +- src/cls/lua/cls_lua.cc | 2 +- src/cls/lua/cls_lua_ops.h | 2 +- src/cls/numops/cls_numops.cc | 4 +- src/cls/otp/cls_otp.cc | 20 +-- src/cls/otp/cls_otp_client.cc | 6 +- src/cls/otp/cls_otp_ops.h | 18 +-- src/cls/otp/cls_otp_types.h | 6 +- src/cls/refcount/cls_refcount.cc | 22 +-- src/cls/refcount/cls_refcount_client.cc | 4 +- src/cls/refcount/cls_refcount_ops.h | 18 +-- src/cls/statelog/cls_statelog.cc | 12 +- src/cls/statelog/cls_statelog_client.cc | 2 +- src/cls/statelog/cls_statelog_ops.h | 10 +- src/cls/statelog/cls_statelog_types.h | 2 +- src/cls/timeindex/cls_timeindex.cc | 6 +- src/cls/timeindex/cls_timeindex_client.h | 2 +- src/cls/timeindex/cls_timeindex_ops.h | 8 +- src/cls/timeindex/cls_timeindex_types.h | 2 +- src/cls/user/cls_user.cc | 18 +-- src/cls/user/cls_user_client.cc | 4 +- src/cls/user/cls_user_ops.h | 16 +-- src/cls/user/cls_user_types.h | 8 +- src/cls/version/cls_version.cc | 8 +- src/cls/version/cls_version_client.cc | 4 +- src/cls/version/cls_version_ops.h | 8 +- src/cls/version/cls_version_types.h | 4 +- src/common/DecayCounter.cc | 2 +- src/common/DecayCounter.h | 8 +- src/common/LogEntry.cc | 6 +- src/common/LogEntry.h | 6 +- src/common/SloppyCRCMap.cc | 2 +- src/common/SloppyCRCMap.h | 2 +- src/common/bit_vector.hpp | 22 +-- src/common/bloom_filter.cc | 4 +- src/common/bloom_filter.hpp | 4 +- src/common/ceph_json.h | 2 +- src/common/entity_name.h | 2 +- src/common/fs_types.cc | 2 +- src/common/histogram.cc | 2 +- src/common/histogram.h | 2 +- src/common/hobject.cc | 4 +- src/common/hobject.h | 4 +- src/common/obj_bencher.cc | 2 +- src/common/scrub_types.cc | 14 +- src/common/scrub_types.h | 24 ++-- src/common/snap_types.cc | 2 +- src/common/snap_types.h | 4 +- src/common/sstring.hh | 4 +- src/common/zipkin_trace.h | 2 +- src/compressor/Compressor.h | 2 +- src/compressor/brotli/BrotliCompressor.cc | 2 +- src/compressor/brotli/BrotliCompressor.h | 2 +- src/compressor/lz4/LZ4Compressor.h | 4 +- src/compressor/snappy/SnappyCompressor.h | 10 +- src/compressor/zlib/ZlibCompressor.cc | 4 +- src/compressor/zlib/ZlibCompressor.h | 2 +- src/compressor/zstd/ZstdCompressor.h | 4 +- src/crush/CrushWrapper.cc | 6 +- src/crush/CrushWrapper.h | 6 +- src/include/CompatSet.h | 4 +- src/include/btree_map.h | 4 +- src/include/compact_map.h | 4 +- src/include/compact_set.h | 4 +- src/include/encoding.h | 132 +++++++++--------- src/include/filepath.h | 2 +- src/include/frag.h | 6 +- src/include/fs_types.h | 6 +- src/include/health.h | 6 +- src/include/interval_set.h | 8 +- src/include/object.h | 8 +- src/include/types.h | 6 +- src/include/util.h | 2 +- src/include/utime.h | 2 +- src/include/uuid.h | 2 +- src/journal/Entry.cc | 4 +- src/journal/Entry.h | 4 +- src/journal/JournalMetadata.cc | 12 +- src/journal/ObjectPlayer.cc | 2 +- src/key_value_store/cls_kvs.cc | 30 ++-- src/key_value_store/kv_flat_btree_async.cc | 22 +-- src/key_value_store/kv_flat_btree_async.h | 10 +- src/key_value_store/kvs_arg_types.h | 12 +- src/kv/KeyValueDB.h | 4 +- src/librados/IoCtxImpl.cc | 2 +- src/messages/MAuth.h | 2 +- src/messages/MAuthReply.h | 2 +- src/messages/MBackfillReserve.h | 2 +- src/messages/MCacheExpire.h | 4 +- src/messages/MClientCapRelease.h | 2 +- src/messages/MClientCaps.h | 2 +- src/messages/MClientLease.h | 2 +- src/messages/MClientQuota.h | 2 +- src/messages/MClientReconnect.h | 2 +- src/messages/MClientReply.h | 12 +- src/messages/MClientRequest.h | 4 +- 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/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 | 6 +- src/messages/MMDSCacheRejoin.h | 14 +- src/messages/MMDSFindIno.h | 2 +- src/messages/MMDSFindInoReply.h | 2 +- src/messages/MMDSFragmentNotify.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 | 6 +- 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 | 4 +- src/messages/MMonCommand.h | 2 +- src/messages/MMonCommandAck.h | 2 +- src/messages/MMonElection.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 | 6 +- src/messages/MOSDMarkMeDown.h | 2 +- src/messages/MOSDOp.h | 4 +- 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/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 | 4 +- src/messages/MOSDRepOpReply.h | 4 +- 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/MPoolOp.h | 2 +- src/messages/MPoolOpReply.h | 2 +- src/messages/MRecoveryReserve.h | 2 +- src/messages/MRemoveSnaps.h | 2 +- src/messages/MRoute.h | 4 +- src/messages/MServiceMap.h | 2 +- src/messages/MStatfs.h | 2 +- src/messages/MStatfsReply.h | 2 +- src/messages/MTimeCheck.h | 2 +- src/messages/MWatchNotify.h | 2 +- src/messages/PaxosServiceMessage.h | 4 +- src/mgr/DaemonServer.cc | 6 +- src/mgr/DaemonState.cc | 2 +- src/mgr/DaemonState.h | 2 +- src/mgr/PyOSDMap.cc | 2 +- src/mgr/ServiceMap.cc | 6 +- src/mgr/ServiceMap.h | 6 +- src/mon/AuthMonitor.cc | 24 ++-- src/mon/AuthMonitor.h | 2 +- src/mon/ConfigMonitor.cc | 2 +- src/mon/CreatingPGs.h | 4 +- src/mon/Elector.cc | 4 +- src/mon/HealthMonitor.cc | 4 +- src/mon/LogMonitor.cc | 6 +- src/mon/MDSMonitor.cc | 4 +- src/mon/MgrMap.h | 6 +- src/mon/MgrMonitor.cc | 8 +- src/mon/MgrStatMonitor.cc | 4 +- src/mon/MonCap.cc | 2 +- src/mon/MonCap.h | 2 +- src/mon/MonClient.cc | 4 +- src/mon/MonClient.h | 2 +- src/mon/MonCommand.h | 8 +- src/mon/MonMap.cc | 4 +- src/mon/MonMap.h | 6 +- src/mon/Monitor.cc | 16 +-- src/mon/MonitorDBStore.h | 8 +- src/mon/OSDMonitor.cc | 20 +-- src/mon/OSDMonitor.h | 4 +- src/mon/PGMap.cc | 4 +- src/mon/PGMap.h | 6 +- src/mon/Paxos.cc | 4 +- src/mon/Paxos.h | 4 +- src/mon/PaxosService.cc | 2 +- src/mon/mon_types.h | 10 +- src/msg/Message.cc | 4 +- src/msg/Message.h | 4 +- src/msg/async/AsyncConnection.cc | 6 +- src/msg/msg_types.cc | 2 +- src/msg/msg_types.h | 12 +- src/msg/simple/Pipe.cc | 6 +- src/objclass/class_api.cc | 16 +-- src/objclass/objclass.h | 2 +- src/os/ObjectStore.cc | 8 +- src/os/ObjectStore.h | 16 +-- src/os/Transaction.cc | 2 +- src/os/bluestore/BitmapFreelistManager.cc | 8 +- src/os/bluestore/BlueFS.cc | 8 +- src/os/bluestore/BlueStore.cc | 43 +++--- src/os/bluestore/BlueStore.h | 8 +- src/os/bluestore/bluefs_types.cc | 4 +- src/os/bluestore/bluefs_types.h | 6 +- src/os/bluestore/bluestore_types.cc | 2 +- src/os/bluestore/bluestore_types.h | 15 +- src/os/filestore/DBObjectMap.cc | 17 ++- src/os/filestore/DBObjectMap.h | 4 +- src/os/filestore/FileJournal.cc | 4 +- src/os/filestore/FileJournal.h | 4 +- src/os/filestore/FileStore.cc | 12 +- src/os/filestore/FileStore.h | 2 +- src/os/filestore/GenericFileStoreBackend.cc | 2 +- src/os/filestore/HashIndex.cc | 6 +- src/os/filestore/HashIndex.h | 8 +- src/os/filestore/IndexManager.cc | 2 +- src/os/filestore/JournalingObjectStore.cc | 2 +- src/os/filestore/SequencerPosition.h | 2 +- src/os/kstore/KStore.cc | 14 +- src/os/kstore/KStore.h | 2 +- src/os/kstore/kstore_types.cc | 4 +- src/os/kstore/kstore_types.h | 4 +- src/os/memstore/MemStore.cc | 14 +- src/os/memstore/MemStore.h | 6 +- src/os/memstore/PageSet.h | 4 +- src/osd/ECBackend.cc | 4 +- src/osd/ECMsgTypes.cc | 8 +- src/osd/ECMsgTypes.h | 8 +- src/osd/ECUtil.cc | 2 +- src/osd/ECUtil.h | 2 +- src/osd/HitSet.cc | 8 +- src/osd/HitSet.h | 18 +-- src/osd/OSD.cc | 13 +- src/osd/OSDMap.cc | 24 ++-- src/osd/OSDMap.h | 24 ++-- src/osd/PG.cc | 12 +- src/osd/PGBackend.cc | 6 +- src/osd/PGLog.h | 2 +- src/osd/PrimaryLogPG.cc | 58 ++++---- src/osd/PrimaryLogPG.h | 12 +- src/osd/ReplicatedBackend.cc | 4 +- src/osd/SnapMapper.cc | 8 +- src/osd/SnapMapper.h | 2 +- src/osd/osd_types.cc | 96 ++++++------- src/osd/osd_types.h | 122 ++++++++-------- src/osdc/Journaler.cc | 8 +- src/osdc/Journaler.h | 2 +- src/osdc/Objecter.cc | 12 +- src/osdc/Objecter.h | 22 +-- src/test/CMakeLists.txt | 2 +- src/test/cls_log/test_cls_log.cc | 2 +- src/test/common/ObjectContents.h | 2 +- src/test/common/test_bit_vector.cc | 12 +- src/test/common/test_json_formattable.cc | 2 +- src/test/compressor/compressor_example.h | 2 +- src/test/compressor/test_compression.cc | 4 +- src/test/crush/CrushWrapper.cc | 4 +- src/test/encoding.cc | 20 +-- src/test/encoding/ceph_dencoder.cc | 4 +- src/test/encoding/test_ceph_time.h | 4 +- src/test/librados/aio.cc | 2 +- src/test/librados/c_read_operations.cc | 2 +- src/test/librados/io.cc | 2 +- src/test/librados/misc.cc | 10 +- src/test/librados/tier.cc | 12 +- src/test/librados/watch_notify.cc | 22 +-- src/test/librados_test_stub/TestIoCtxImpl.cc | 4 +- src/test/mon/test_mon_workloadgen.cc | 4 +- src/test/msgr/test_msgr.cc | 2 +- src/test/objectstore/FileStoreTracker.cc | 14 +- .../ObjectStoreTransactionBenchmark.cc | 2 +- src/test/objectstore/store_test.cc | 6 +- .../objectstore/test_idempotent_sequence.cc | 2 +- src/test/osd/Object.cc | 2 +- src/test/osd/Object.h | 2 +- src/test/osd/RadosModel.h | 8 +- src/test/osd/TestOSDMap.cc | 2 +- src/test/osd/hitset.cc | 2 +- src/test/perf_local.cc | 6 +- .../rbd_mirror/test_mock_ImageReplayer.cc | 4 +- src/test/test_addrs.cc | 21 +-- src/tools/RadosDump.cc | 8 +- src/tools/RadosDump.h | 20 +-- src/tools/ceph_authtool.cc | 4 +- src/tools/ceph_monstore_tool.cc | 12 +- src/tools/ceph_objectstore_tool.cc | 48 +++---- src/tools/cephfs/DataScan.cc | 14 +- src/tools/cephfs/JournalScanner.cc | 8 +- src/tools/cephfs/JournalTool.cc | 12 +- src/tools/cephfs/TableTool.cc | 2 +- src/tools/crushtool.cc | 2 +- src/tools/osdmaptool.cc | 2 +- src/tools/rados/RadosImport.cc | 6 +- src/tools/rados/rados.cc | 16 +-- src/tools/radosacl.cc | 6 +- src/tools/rebuild_mondb.cc | 8 +- 413 files changed, 1326 insertions(+), 1337 deletions(-) diff --git a/src/auth/Auth.h b/src/auth/Auth.h index 71dd5434ecb6..9b8601192b75 100644 --- a/src/auth/Auth.h +++ b/src/auth/Auth.h @@ -35,7 +35,7 @@ struct EntityAuth { encode(key, bl); encode(caps, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -66,7 +66,7 @@ struct AuthCapsInfo { encode(a, bl); encode(caps, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -113,7 +113,7 @@ struct AuthTicket { encode(caps, bl); encode(flags, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -141,7 +141,7 @@ struct AuthAuthorizer { explicit AuthAuthorizer(__u32 p) : protocol(p) {} virtual ~AuthAuthorizer() {} - virtual bool verify_reply(bufferlist::iterator& reply) = 0; + virtual bool verify_reply(bufferlist::const_iterator& reply) = 0; }; @@ -161,7 +161,7 @@ struct ExpiringCryptoKey { encode(key, bl); encode(expiration, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -189,7 +189,7 @@ struct RotatingSecrets { encode(secrets, bl); encode(max_ver, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); diff --git a/src/auth/AuthClientHandler.h b/src/auth/AuthClientHandler.h index b397f883c923..9b34550f9b23 100644 --- a/src/auth/AuthClientHandler.h +++ b/src/auth/AuthClientHandler.h @@ -52,7 +52,7 @@ public: virtual void reset() = 0; virtual void prepare_build_request() = 0; virtual int build_request(bufferlist& bl) const = 0; - virtual int handle_response(int ret, bufferlist::iterator& iter) = 0; + virtual int handle_response(int ret, bufferlist::const_iterator& iter) = 0; virtual bool build_rotating_request(bufferlist& bl) const = 0; virtual AuthAuthorizer *build_authorizer(uint32_t service_id) const = 0; diff --git a/src/auth/AuthServiceHandler.h b/src/auth/AuthServiceHandler.h index 4d8a649374ff..51551f4cf8da 100644 --- a/src/auth/AuthServiceHandler.h +++ b/src/auth/AuthServiceHandler.h @@ -35,8 +35,8 @@ public: virtual ~AuthServiceHandler() { } - virtual int start_session(EntityName& name, bufferlist::iterator& indata, bufferlist& result, AuthCapsInfo& caps) = 0; - virtual int handle_request(bufferlist::iterator& indata, bufferlist& result, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid = NULL) = 0; + virtual int start_session(EntityName& name, bufferlist::const_iterator& indata, bufferlist& result, AuthCapsInfo& caps) = 0; + virtual int handle_request(bufferlist::const_iterator& indata, bufferlist& result, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid = NULL) = 0; EntityName& get_entity_name() { return entity_name; } }; diff --git a/src/auth/Crypto.cc b/src/auth/Crypto.cc index 80cde1c010d8..1695c4de17da 100644 --- a/src/auth/Crypto.cc +++ b/src/auth/Crypto.cc @@ -307,7 +307,7 @@ void CryptoKey::encode(bufferlist& bl) const bl.append(secret); } -void CryptoKey::decode(bufferlist::iterator& bl) +void CryptoKey::decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(type, bl); diff --git a/src/auth/Crypto.h b/src/auth/Crypto.h index 318a4bd3a273..a0cb5725652e 100644 --- a/src/auth/Crypto.h +++ b/src/auth/Crypto.h @@ -79,7 +79,7 @@ public: } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); int get_type() const { return type; } utime_t get_created() const { return created; } @@ -107,7 +107,7 @@ public: e.append(s); bufferlist bl; bl.decode_base64(e); - bufferlist::iterator p = bl.begin(); + auto p = std::cbegin(bl); decode(p); } diff --git a/src/auth/KeyRing.cc b/src/auth/KeyRing.cc index 832cae0a346b..c9e092e44007 100644 --- a/src/auth/KeyRing.cc +++ b/src/auth/KeyRing.cc @@ -144,7 +144,7 @@ void KeyRing::encode_formatted(string label, Formatter *f, bufferlist& bl) for (map::iterator q = p->second.caps.begin(); q != p->second.caps.end(); ++q) { - bufferlist::iterator dataiter = q->second.begin(); + auto dataiter = q->second.cbegin(); string caps; using ceph::decode; decode(caps, dataiter); @@ -157,7 +157,7 @@ void KeyRing::encode_formatted(string label, Formatter *f, bufferlist& bl) f->flush(bl); } -void KeyRing::decode_plaintext(bufferlist::iterator& bli) +void KeyRing::decode_plaintext(bufferlist::const_iterator& bli) { int ret; bufferlist bl; @@ -200,9 +200,9 @@ void KeyRing::decode_plaintext(bufferlist::iterator& bli) } } -void KeyRing::decode(bufferlist::iterator& bl) { +void KeyRing::decode(bufferlist::const_iterator& bl) { __u8 struct_v; - bufferlist::iterator start_pos = bl; + auto start_pos = bl; try { using ceph::decode; decode(struct_v, bl); @@ -227,7 +227,7 @@ int KeyRing::load(CephContext *cct, const std::string &filename) } try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(iter); } catch (const buffer::error& err) { @@ -252,7 +252,7 @@ void KeyRing::print(ostream& out) for (map::iterator q = p->second.caps.begin(); q != p->second.caps.end(); ++q) { - bufferlist::iterator dataiter = q->second.begin(); + auto dataiter = q->second.cbegin(); string caps; using ceph::decode; decode(caps, dataiter); diff --git a/src/auth/KeyRing.h b/src/auth/KeyRing.h index e12671a251f4..5970ca8520fc 100644 --- a/src/auth/KeyRing.h +++ b/src/auth/KeyRing.h @@ -24,7 +24,7 @@ class KeyRing : public KeyStore { int set_modifier(const char *type, const char *val, EntityName& name, map& caps); public: - void decode_plaintext(bufferlist::iterator& bl); + void decode_plaintext(bufferlist::const_iterator& bl); /* Create a KeyRing from a Ceph context. * We will use the configuration stored inside the context. */ int from_ceph_context(CephContext *cct); @@ -99,7 +99,7 @@ public: void import(CephContext *cct, KeyRing& other); // encoders - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void encode_plaintext(bufferlist& bl); void encode_formatted(string label, Formatter *f, bufferlist& bl); @@ -108,7 +108,7 @@ public: // don't use WRITE_CLASS_ENCODER macro because we don't have an encode // macro. don't juse encode_plaintext in that case because it is not // wrappable; it assumes it gets the entire bufferlist. -static inline void decode(KeyRing& kr, bufferlist::iterator& p) { +static inline void decode(KeyRing& kr, bufferlist::const_iterator& p) { kr.decode(p); } diff --git a/src/auth/cephx/CephxAuthorizeHandler.cc b/src/auth/cephx/CephxAuthorizeHandler.cc index d455b190a997..ced50fddda60 100644 --- a/src/auth/cephx/CephxAuthorizeHandler.cc +++ b/src/auth/cephx/CephxAuthorizeHandler.cc @@ -10,7 +10,7 @@ bool CephxAuthorizeHandler::verify_authorizer(CephContext *cct, KeyStore *keys, bufferlist& authorizer_data, bufferlist& authorizer_reply, EntityName& entity_name, uint64_t& global_id, AuthCapsInfo& caps_info, CryptoKey& session_key, uint64_t *auid) { - bufferlist::iterator iter = authorizer_data.begin(); + auto iter = authorizer_data.cbegin(); if (!authorizer_data.length()) { ldout(cct, 1) << "verify authorizer, authorizer_data.length()=0" << dendl; diff --git a/src/auth/cephx/CephxClientHandler.cc b/src/auth/cephx/CephxClientHandler.cc index 1eb9303a2a73..29d9aeb672ea 100644 --- a/src/auth/cephx/CephxClientHandler.cc +++ b/src/auth/cephx/CephxClientHandler.cc @@ -107,7 +107,7 @@ bool CephxClientHandler::_need_tickets() const return need && need != CEPH_ENTITY_TYPE_MGR; } -int CephxClientHandler::handle_response(int ret, bufferlist::iterator& indata) +int CephxClientHandler::handle_response(int ret, bufferlist::const_iterator& indata) { ldout(cct, 10) << "handle_response ret = " << ret << dendl; RWLock::WLocker l(lock); diff --git a/src/auth/cephx/CephxClientHandler.h b/src/auth/cephx/CephxClientHandler.h index 9c6522246e62..5d7b489b2046 100644 --- a/src/auth/cephx/CephxClientHandler.h +++ b/src/auth/cephx/CephxClientHandler.h @@ -54,7 +54,7 @@ public: } void prepare_build_request() override; int build_request(bufferlist& bl) const override; - int handle_response(int ret, bufferlist::iterator& iter) override; + int handle_response(int ret, bufferlist::const_iterator& iter) override; bool build_rotating_request(bufferlist& bl) const override; int get_protocol() const override { return CEPH_AUTH_CEPHX; } diff --git a/src/auth/cephx/CephxKeyServer.cc b/src/auth/cephx/CephxKeyServer.cc index 588a0d9ffa6a..38483253d0cd 100644 --- a/src/auth/cephx/CephxKeyServer.cc +++ b/src/auth/cephx/CephxKeyServer.cc @@ -327,7 +327,7 @@ int KeyServer::encode_secrets(Formatter *f, stringstream *ds) const for (; capsiter != mapiter->second.caps.end(); ++capsiter) { // FIXME: need a const_iterator for bufferlist, but it doesn't exist yet. bufferlist *bl = const_cast(&capsiter->second); - bufferlist::iterator dataiter = bl->begin(); + auto dataiter = bl->cbegin(); string caps; using ceph::decode; decode(caps, dataiter); diff --git a/src/auth/cephx/CephxKeyServer.h b/src/auth/cephx/CephxKeyServer.h index 896e6e770eae..2b069c4d32e0 100644 --- a/src/auth/cephx/CephxKeyServer.h +++ b/src/auth/cephx/CephxKeyServer.h @@ -47,7 +47,7 @@ struct KeyServerData { encode(secrets, bl); encode(rotating_secrets, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -66,7 +66,7 @@ struct KeyServerData { } void decode_rotating(bufferlist& rotating_bl) { using ceph::decode; - bufferlist::iterator iter = rotating_bl.begin(); + auto iter = rotating_bl.cbegin(); __u8 struct_v; decode(struct_v, iter); decode(rotating_ver, iter); @@ -144,7 +144,7 @@ struct KeyServerData { encode(auth, bl); } } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -231,7 +231,7 @@ public: using ceph::encode; encode(data, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { Mutex::Locker l(lock); using ceph::decode; decode(data, bl); diff --git a/src/auth/cephx/CephxProtocol.cc b/src/auth/cephx/CephxProtocol.cc index 765d48f846c9..cf103e9f2940 100644 --- a/src/auth/cephx/CephxProtocol.cc +++ b/src/auth/cephx/CephxProtocol.cc @@ -142,7 +142,7 @@ bool cephx_build_service_ticket_reply(CephContext *cct, * this ServiceTicket with the result. */ bool CephXTicketHandler::verify_service_ticket_reply(CryptoKey& secret, - bufferlist::iterator& indata) + bufferlist::const_iterator& indata) { __u8 service_ticket_v; decode(service_ticket_v, indata); @@ -169,7 +169,7 @@ bool CephXTicketHandler::verify_service_ticket_reply(CryptoKey& secret, } else { decode(service_ticket_bl, indata); } - bufferlist::iterator iter = service_ticket_bl.begin(); + auto iter = service_ticket_bl.cbegin(); decode(ticket, iter); ldout(cct, 10) << " ticket.secret_id=" << ticket.secret_id << dendl; @@ -261,7 +261,7 @@ void CephXTicketManager::invalidate_ticket(uint32_t service_id) * this ServiceTicket with the result. */ bool CephXTicketManager::verify_service_ticket_reply(CryptoKey& secret, - bufferlist::iterator& indata) + bufferlist::const_iterator& indata) { __u8 service_ticket_reply_v; decode(service_ticket_reply_v, indata); @@ -389,7 +389,7 @@ bool cephx_decode_ticket(CephContext *cct, KeyStore *keys, uint32_t service_id, * {timestamp + 1}^session_key */ bool cephx_verify_authorizer(CephContext *cct, KeyStore *keys, - bufferlist::iterator& indata, + bufferlist::const_iterator& indata, CephXServiceTicketInfo& ticket_info, bufferlist& reply_bl) { __u8 authorizer_v; @@ -474,7 +474,7 @@ bool cephx_verify_authorizer(CephContext *cct, KeyStore *keys, return true; } -bool CephXAuthorizer::verify_reply(bufferlist::iterator& indata) +bool CephXAuthorizer::verify_reply(bufferlist::const_iterator& indata) { CephXAuthorizeReply reply; diff --git a/src/auth/cephx/CephxProtocol.h b/src/auth/cephx/CephxProtocol.h index 7abc16d7628d..055a233cba3b 100644 --- a/src/auth/cephx/CephxProtocol.h +++ b/src/auth/cephx/CephxProtocol.h @@ -103,7 +103,7 @@ struct CephXServerChallenge { encode(struct_v, bl); encode(server_challenge, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -122,7 +122,7 @@ struct CephXRequestHeader { using ceph::encode; encode(request_type, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(request_type, bl); } @@ -138,7 +138,7 @@ struct CephXResponseHeader { encode(request_type, bl); encode(status, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(request_type, bl); decode(status, bl); @@ -160,7 +160,7 @@ struct CephXTicketBlob { encode(blob, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -184,7 +184,7 @@ struct CephXAuthenticate { encode(key, bl); encode(old_ticket, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -203,7 +203,7 @@ struct CephXChallengeBlob { encode(server_challenge, bl); encode(client_challenge, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(server_challenge, bl); decode(client_challenge, bl); @@ -252,7 +252,7 @@ struct CephXServiceTicketRequest { encode(struct_v, bl); encode(keys, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -274,7 +274,7 @@ struct CephXAuthorizeReply { encode(struct_v, bl); encode(nonce_plus_one, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -294,7 +294,7 @@ public: : AuthAuthorizer(CEPH_AUTH_CEPHX), cct(cct_), nonce(0) {} bool build_authorizer(); - bool verify_reply(bufferlist::iterator& reply) override; + bool verify_reply(bufferlist::const_iterator& reply) override; }; @@ -314,7 +314,7 @@ struct CephXTicketHandler { // to build our ServiceTicket bool verify_service_ticket_reply(CryptoKey& principal_secret, - bufferlist::iterator& indata); + bufferlist::const_iterator& indata); // to access the service CephXAuthorizer *build_authorizer(uint64_t global_id) const; @@ -336,7 +336,7 @@ struct CephXTicketManager { explicit CephXTicketManager(CephContext *cct_) : global_id(0), cct(cct_) {} bool verify_service_ticket_reply(CryptoKey& principal_secret, - bufferlist::iterator& indata); + bufferlist::const_iterator& indata); CephXTicketHandler& get_handler(uint32_t type) { tickets_map_t::iterator i = tickets_map.find(type); @@ -372,7 +372,7 @@ struct CephXServiceTicket { encode(session_key, bl); encode(validity, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -394,7 +394,7 @@ struct CephXServiceTicketInfo { encode(ticket, bl); encode(session_key, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -412,7 +412,7 @@ struct CephXAuthorize { encode(struct_v, bl); encode(nonce, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; decode(struct_v, bl); @@ -432,7 +432,7 @@ bool cephx_decode_ticket(CephContext *cct, KeyStore *keys, * Verify authorizer and generate reply authorizer */ extern bool cephx_verify_authorizer(CephContext *cct, KeyStore *keys, - bufferlist::iterator& indata, + bufferlist::const_iterator& indata, CephXServiceTicketInfo& ticket_info, bufferlist& reply_bl); @@ -455,7 +455,7 @@ void decode_decrypt_enc_bl(CephContext *cct, T& t, CryptoKey key, bufferlist& bl if (key.decrypt(cct, bl_enc, bl, &error) < 0) return; - bufferlist::iterator iter2 = bl.begin(); + auto iter2 = bl.cbegin(); __u8 struct_v; decode(struct_v, iter2); decode(magic, iter2); @@ -485,7 +485,7 @@ void encode_encrypt_enc_bl(CephContext *cct, const T& t, const CryptoKey& key, template int decode_decrypt(CephContext *cct, T& t, const CryptoKey& key, - bufferlist::iterator& iter, std::string &error) + bufferlist::const_iterator& iter, std::string &error) { bufferlist bl_enc; try { diff --git a/src/auth/cephx/CephxServiceHandler.cc b/src/auth/cephx/CephxServiceHandler.cc index 2e749796b48a..acd9fa64b724 100644 --- a/src/auth/cephx/CephxServiceHandler.cc +++ b/src/auth/cephx/CephxServiceHandler.cc @@ -27,7 +27,7 @@ #undef dout_prefix #define dout_prefix *_dout << "cephx server " << entity_name << ": " -int CephxServiceHandler::start_session(EntityName& name, bufferlist::iterator& indata, bufferlist& result_bl, AuthCapsInfo& caps) +int CephxServiceHandler::start_session(EntityName& name, bufferlist::const_iterator& indata, bufferlist& result_bl, AuthCapsInfo& caps) { entity_name = name; @@ -42,7 +42,7 @@ int CephxServiceHandler::start_session(EntityName& name, bufferlist::iterator& i return CEPH_AUTH_CEPHX; } -int CephxServiceHandler::handle_request(bufferlist::iterator& indata, bufferlist& result_bl, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid) +int CephxServiceHandler::handle_request(bufferlist::const_iterator& indata, bufferlist& result_bl, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid) { int ret = 0; diff --git a/src/auth/cephx/CephxServiceHandler.h b/src/auth/cephx/CephxServiceHandler.h index 390a6dc1b872..b51ee5f13738 100644 --- a/src/auth/cephx/CephxServiceHandler.h +++ b/src/auth/cephx/CephxServiceHandler.h @@ -29,8 +29,8 @@ public: : AuthServiceHandler(cct_), key_server(ks), server_challenge(0) {} ~CephxServiceHandler() override {} - int start_session(EntityName& name, bufferlist::iterator& indata, bufferlist& result_bl, AuthCapsInfo& caps) override; - int handle_request(bufferlist::iterator& indata, bufferlist& result_bl, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid = NULL) override; + int start_session(EntityName& name, bufferlist::const_iterator& indata, bufferlist& result_bl, AuthCapsInfo& caps) override; + int handle_request(bufferlist::const_iterator& indata, bufferlist& result_bl, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid = NULL) override; void build_cephx_response_header(int request_type, int status, bufferlist& bl); }; diff --git a/src/auth/cephx/CephxSessionHandler.cc b/src/auth/cephx/CephxSessionHandler.cc index 00b11338df5d..f9589a06e5da 100644 --- a/src/auth/cephx/CephxSessionHandler.cc +++ b/src/auth/cephx/CephxSessionHandler.cc @@ -54,7 +54,7 @@ int CephxSessionHandler::_calc_signature(Message *m, uint64_t *psig) return -1; } - bufferlist::iterator ci = bl_ciphertext.begin(); + auto ci = bl_ciphertext.cbegin(); decode(*psig, ci); ldout(cct, 10) << __func__ << " seq " << m->get_seq() diff --git a/src/auth/none/AuthNoneAuthorizeHandler.cc b/src/auth/none/AuthNoneAuthorizeHandler.cc index 929bf165c151..298d21bd2a2b 100644 --- a/src/auth/none/AuthNoneAuthorizeHandler.cc +++ b/src/auth/none/AuthNoneAuthorizeHandler.cc @@ -22,7 +22,7 @@ bool AuthNoneAuthorizeHandler::verify_authorizer(CephContext *cct, KeyStore *key EntityName& entity_name, uint64_t& global_id, AuthCapsInfo& caps_info, CryptoKey& session_key, uint64_t *auid) { - bufferlist::iterator iter = authorizer_data.begin(); + auto iter = authorizer_data.cbegin(); try { __u8 struct_v = 1; diff --git a/src/auth/none/AuthNoneClientHandler.h b/src/auth/none/AuthNoneClientHandler.h index 369aa5480dbb..ba843979e09b 100644 --- a/src/auth/none/AuthNoneClientHandler.h +++ b/src/auth/none/AuthNoneClientHandler.h @@ -29,7 +29,7 @@ public: void prepare_build_request() override {} int build_request(bufferlist& bl) const override { return 0; } - int handle_response(int ret, bufferlist::iterator& iter) override { return 0; } + int handle_response(int ret, bufferlist::const_iterator& iter) override { return 0; } bool build_rotating_request(bufferlist& bl) const override { return false; } int get_protocol() const override { return CEPH_AUTH_NONE; } diff --git a/src/auth/none/AuthNoneProtocol.h b/src/auth/none/AuthNoneProtocol.h index a507ef75afda..9664422a6c7e 100644 --- a/src/auth/none/AuthNoneProtocol.h +++ b/src/auth/none/AuthNoneProtocol.h @@ -26,7 +26,7 @@ struct AuthNoneAuthorizer : public AuthAuthorizer { encode(global_id, bl); return 0; } - bool verify_reply(bufferlist::iterator& reply) override { return true; } + bool verify_reply(bufferlist::const_iterator& reply) override { return true; } }; #endif diff --git a/src/auth/none/AuthNoneServiceHandler.h b/src/auth/none/AuthNoneServiceHandler.h index 120a7a9819e7..f784d641b126 100644 --- a/src/auth/none/AuthNoneServiceHandler.h +++ b/src/auth/none/AuthNoneServiceHandler.h @@ -26,12 +26,12 @@ public: : AuthServiceHandler(cct_) {} ~AuthNoneServiceHandler() override {} - int start_session(EntityName& name, bufferlist::iterator& indata, bufferlist& result_bl, AuthCapsInfo& caps) override { + int start_session(EntityName& name, bufferlist::const_iterator& indata, bufferlist& result_bl, AuthCapsInfo& caps) override { entity_name = name; caps.allow_all = true; return CEPH_AUTH_NONE; } - int handle_request(bufferlist::iterator& indata, bufferlist& result_bl, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid = NULL) override { + int handle_request(bufferlist::const_iterator& indata, bufferlist& result_bl, uint64_t& global_id, AuthCapsInfo& caps, uint64_t *auid = NULL) override { return 0; } void build_cephx_response_header(int request_type, int status, bufferlist& bl) { } diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index d3fe2e15fee9..6487679eac2c 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -229,7 +229,7 @@ int main(int argc, const char **argv) if (bl.read_file(dump_pg_log.c_str(), &error) >= 0) { pg_log_entry_t e; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); while (!p.end()) { uint64_t pos = p.get_off(); try { diff --git a/src/client/Client.cc b/src/client/Client.cc index 2a6c5402c7c8..e1be4e27626a 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -887,7 +887,7 @@ Inode * Client::add_update_inode(InodeStat *st, utime_t from, if ((in->xattr_version == 0 || !(issued & CEPH_CAP_XATTR_EXCL)) && st->xattrbl.length() && st->xattr_version > in->xattr_version) { - bufferlist::iterator p = st->xattrbl.begin(); + auto p = st->xattrbl.cbegin(); decode(in->xattrs, p); in->xattr_version = st->xattr_version; } @@ -1072,7 +1072,7 @@ void Client::insert_readdir_results(MetaRequest *request, MetaSession *session, assert(dirp); // the extra buffer list is only set for readdir and lssnap replies - bufferlist::iterator p = reply->get_extra_bl().begin(); + auto p = reply->get_extra_bl().cbegin(); if (!p.end()) { // snapdir? if (request->head.op == CEPH_MDS_OP_LSSNAP) { @@ -1229,7 +1229,7 @@ Inode* Client::insert_trace(MetaRequest *request, MetaSession *session) << " is_dentry=" << (int)reply->head.is_dentry << dendl; - bufferlist::iterator p = reply->get_trace_bl().begin(); + auto p = reply->get_trace_bl().cbegin(); if (request->got_unsafe) { ldout(cct, 10) << "insert_trace -- already got unsafe; ignoring" << dendl; assert(p.end()); @@ -4464,7 +4464,7 @@ void Client::update_snap_trace(bufferlist& bl, SnapRealm **realm_ret, bool flush map dirty_realms; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); while (!p.end()) { SnapRealmInfo info; decode(info, p); @@ -4568,7 +4568,7 @@ void Client::handle_snap(MClientSnap *m) if (m->head.op == CEPH_SNAP_OP_SPLIT) { assert(m->head.split); SnapRealmInfo info; - bufferlist::iterator p = m->bl.begin(); + auto p = m->bl.cbegin(); decode(info, p); assert(info.ino() == m->head.split); @@ -5058,7 +5058,7 @@ void Client::handle_cap_grant(MetaSession *session, Inode *in, Cap *cap, MClient if ((issued & CEPH_CAP_XATTR_EXCL) == 0 && m->xattrbl.length() && m->head.xattr_version > in->xattr_version) { - bufferlist::iterator p = m->xattrbl.begin(); + auto p = m->xattrbl.cbegin(); decode(in->xattrs, p); in->xattr_version = m->head.xattr_version; } @@ -9763,7 +9763,7 @@ int Client::_do_filelock(Inode *in, Fh *fh, int lock_type, int op, int sleep, if (ret == 0) { if (op == CEPH_MDS_OP_GETFILELOCK) { ceph_filelock filelock; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(filelock, p); if (CEPH_LOCK_SHARED == filelock.type) diff --git a/src/cls/cephfs/cls_cephfs.cc b/src/cls/cephfs/cls_cephfs.cc index 047fbd6d801e..81b40f431f2d 100644 --- a/src/cls/cephfs/cls_cephfs.cc +++ b/src/cls/cephfs/cls_cephfs.cc @@ -53,7 +53,7 @@ static int set_if_greater(cls_method_context_t hctx, if (r == -ENOENT || existing_val_bl.length() == 0) { set_val = true; } else if (r >= 0) { - bufferlist::iterator existing_p = existing_val_bl.begin(); + auto existing_p = existing_val_bl.cbegin(); try { A existing_val; decode(existing_val, existing_p); @@ -91,7 +91,7 @@ static int accumulate_inode_metadata(cls_method_context_t hctx, int r = 0; // Decode `in` - bufferlist::iterator q = in->begin(); + auto q = in->cbegin(); AccumulateArgs args; try { args.decode(q); @@ -126,7 +126,7 @@ class PGLSCephFSFilter : public PGLSFilter { protected: std::string scrub_tag; public: - int init(bufferlist::iterator& params) override { + int init(bufferlist::const_iterator& params) override { try { InodeTagFilterArgs args; args.decode(params); @@ -167,7 +167,7 @@ bool PGLSCephFSFilter::filter(const hobject_t &obj, if (!scrub_tag.empty() && xattr_data.length() > 0) { std::string tag_ondisk; - bufferlist::iterator q = xattr_data.begin(); + auto q = xattr_data.cbegin(); try { decode(tag_ondisk, q); if (tag_ondisk == scrub_tag) diff --git a/src/cls/cephfs/cls_cephfs.h b/src/cls/cephfs/cls_cephfs.h index eafaab5b936a..89f4dab45d3a 100644 --- a/src/cls/cephfs/cls_cephfs.h +++ b/src/cls/cephfs/cls_cephfs.h @@ -44,7 +44,7 @@ class ObjCeiling { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(id, p); @@ -95,7 +95,7 @@ public: ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(obj_xattr_name, bl); @@ -120,7 +120,7 @@ class InodeTagFilterArgs ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(scrub_tag, bl); diff --git a/src/cls/cephfs/cls_cephfs_client.cc b/src/cls/cephfs/cls_cephfs_client.cc index 73e72f75e0d0..bc708271df70 100644 --- a/src/cls/cephfs/cls_cephfs_client.cc +++ b/src/cls/cephfs/cls_cephfs_client.cc @@ -107,7 +107,7 @@ int ClsCephFSClient::fetch_inode_accumulate_result( // Load scan_ceiling try { - bufferlist::iterator scan_ceiling_bl_iter = scan_ceiling_bl.begin(); + auto scan_ceiling_bl_iter = scan_ceiling_bl.cbegin(); ObjCeiling ceiling; ceiling.decode(scan_ceiling_bl_iter); result->ceiling_obj_index = ceiling.id; @@ -119,7 +119,7 @@ int ClsCephFSClient::fetch_inode_accumulate_result( // Load scan_max_size try { - bufferlist::iterator scan_max_size_bl_iter = scan_max_size_bl.begin(); + auto scan_max_size_bl_iter = scan_max_size_bl.cbegin(); decode(result->max_obj_size, scan_max_size_bl_iter); } catch (const buffer::error &err) { //dout(4) << "Invalid size attr on '" << oid << "'" << dendl; @@ -128,7 +128,7 @@ int ClsCephFSClient::fetch_inode_accumulate_result( // Load scan_max_mtime try { - bufferlist::iterator scan_max_mtime_bl_iter = scan_max_mtime_bl.begin(); + auto scan_max_mtime_bl_iter = scan_max_mtime_bl.cbegin(); decode(result->max_mtime, scan_max_mtime_bl_iter); } catch (const buffer::error &err) { //dout(4) << "Invalid size attr on '" << oid << "'" << dendl; @@ -138,7 +138,7 @@ int ClsCephFSClient::fetch_inode_accumulate_result( // Deserialize backtrace if (parent_bl.length()) { try { - bufferlist::iterator q = parent_bl.begin(); + auto q = parent_bl.cbegin(); backtrace->decode(q); } catch (buffer::error &e) { //dout(4) << "Corrupt backtrace on '" << oid << "': " << e << dendl; @@ -149,7 +149,7 @@ int ClsCephFSClient::fetch_inode_accumulate_result( // Deserialize layout if (layout_bl.length()) { try { - bufferlist::iterator q = layout_bl.begin(); + auto q = layout_bl.cbegin(); decode(*layout, q); } catch (buffer::error &e) { return -EINVAL; diff --git a/src/cls/hello/cls_hello.cc b/src/cls/hello/cls_hello.cc index a373148d48cb..accca89843e6 100644 --- a/src/cls/hello/cls_hello.cc +++ b/src/cls/hello/cls_hello.cc @@ -252,7 +252,7 @@ static int bad_writer(cls_method_context_t hctx, bufferlist *in, bufferlist *out class PGLSHelloFilter : public PGLSFilter { string val; public: - int init(bufferlist::iterator& params) override { + int init(bufferlist::const_iterator& params) override { try { decode(xattr, params); decode(val, params); diff --git a/src/cls/journal/cls_journal.cc b/src/cls/journal/cls_journal.cc index 8befbf74fc5b..63d4584240b0 100644 --- a/src/cls/journal/cls_journal.cc +++ b/src/cls/journal/cls_journal.cc @@ -63,7 +63,7 @@ int read_key(cls_method_context_t hctx, const string &key, T *t, } try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(*t, iter); } catch (const buffer::error &err) { CLS_ERR("failed to decode input parameters: %s", err.what()); @@ -121,7 +121,7 @@ int expire_tags(cls_method_context_t hctx, const std::string *skip_client_id) { } cls::journal::Client client; - bufferlist::iterator iter = val.second.begin(); + auto iter = val.second.cbegin(); try { decode(client, iter); } catch (const buffer::error &err) { @@ -170,7 +170,7 @@ int expire_tags(cls_method_context_t hctx, const std::string *skip_client_id) { for (auto &val : vals) { cls::journal::Tag tag; - bufferlist::iterator iter = val.second.begin(); + auto iter = val.second.cbegin(); try { decode(tag, iter); } catch (const buffer::error &err) { @@ -231,7 +231,7 @@ int get_client_list_range(cls_method_context_t hctx, for (std::map::iterator it = vals.begin(); it != vals.end(); ++it) { try { - bufferlist::iterator iter = it->second.begin(); + auto iter = it->second.cbegin(); cls::journal::Client client; decode(client, iter); @@ -306,7 +306,7 @@ int journal_create(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint8_t splay_width; int64_t pool_id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(order, iter); decode(splay_width, iter); decode(pool_id, iter); @@ -454,7 +454,7 @@ int journal_set_minimum_set(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint64_t object_set; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(object_set, iter); } catch (const buffer::error &err) { CLS_ERR("failed to decode input parameters: %s", err.what()); @@ -525,7 +525,7 @@ int journal_set_active_set(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint64_t object_set; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(object_set, iter); } catch (const buffer::error &err) { CLS_ERR("failed to decode input parameters: %s", err.what()); @@ -577,7 +577,7 @@ int journal_get_client(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { std::string id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(id, iter); } catch (const buffer::error &err) { CLS_ERR("failed to decode input parameters: %s", err.what()); @@ -608,7 +608,7 @@ int journal_client_register(cls_method_context_t hctx, bufferlist *in, std::string id; bufferlist data; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(id, iter); decode(data, iter); } catch (const buffer::error &err) { @@ -658,7 +658,7 @@ int journal_client_update_data(cls_method_context_t hctx, bufferlist *in, std::string id; bufferlist data; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(id, iter); decode(data, iter); } catch (const buffer::error &err) { @@ -695,7 +695,7 @@ int journal_client_update_state(cls_method_context_t hctx, bufferlist *in, cls::journal::ClientState state; bufferlist data; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(id, iter); uint8_t state_raw; decode(state_raw, iter); @@ -731,7 +731,7 @@ int journal_client_unregister(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { std::string id; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(id, iter); } catch (const buffer::error &err) { CLS_ERR("failed to decode input parameters: %s", err.what()); @@ -773,7 +773,7 @@ int journal_client_commit(cls_method_context_t hctx, bufferlist *in, std::string id; cls::journal::ObjectSetPosition commit_position; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(id, iter); decode(commit_position, iter); } catch (const buffer::error &err) { @@ -824,7 +824,7 @@ int journal_client_list(cls_method_context_t hctx, bufferlist *in, std::string start_after; uint64_t max_return; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(start_after, iter); decode(max_return, iter); } catch (const buffer::error &err) { @@ -872,7 +872,7 @@ int journal_get_tag(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint64_t tag_tid; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(tag_tid, iter); } catch (const buffer::error &err) { CLS_ERR("failed to decode input parameters: %s", err.what()); @@ -905,7 +905,7 @@ int journal_tag_create(cls_method_context_t hctx, bufferlist *in, uint64_t tag_class; bufferlist data; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(tag_tid, iter); decode(tag_class, iter); decode(data, iter); @@ -999,7 +999,7 @@ int journal_tag_list(cls_method_context_t hctx, bufferlist *in, // handle compiler false positive about use-before-init tag_class = boost::none; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(start_after_tag_tid, iter); decode(max_return, iter); decode(client_id, iter); @@ -1042,7 +1042,7 @@ int journal_tag_list(cls_method_context_t hctx, bufferlist *in, for (auto &val : vals) { cls::journal::Tag tag; - bufferlist::iterator iter = val.second.begin(); + auto iter = val.second.cbegin(); try { decode(tag, iter); } catch (const buffer::error &err) { @@ -1097,7 +1097,7 @@ int journal_object_guard_append(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { uint64_t soft_max_size; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(soft_max_size, iter); } catch (const buffer::error &err) { CLS_ERR("failed to decode input parameters: %s", err.what()); diff --git a/src/cls/journal/cls_journal_client.cc b/src/cls/journal/cls_journal_client.cc index a003468616ec..753da51a14b5 100644 --- a/src/cls/journal/cls_journal_client.cc +++ b/src/cls/journal/cls_journal_client.cc @@ -63,7 +63,7 @@ struct C_ClientList : public C_AioExec { } try { - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); std::set partial_clients; decode(partial_clients, iter); @@ -120,7 +120,7 @@ struct C_ImmutableMetadata : public C_AioExec { void finish(int r) override { if (r == 0) { try { - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); decode(*order, iter); decode(*splay_width, iter); decode(*pool_id, iter); @@ -160,7 +160,7 @@ struct C_MutableMetadata : public C_AioExec { void finish(int r) override { if (r == 0) { try { - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); decode(*minimum_set, iter); decode(*active_set, iter); client_list->send(""); @@ -241,7 +241,7 @@ int get_client(librados::IoCtx &ioctx, const std::string &oid, return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); r = get_client_finish(&iter, client); if (r < 0) { return r; @@ -256,7 +256,7 @@ void get_client_start(librados::ObjectReadOperation *op, op->exec("journal", "get_client", bl); } -int get_client_finish(bufferlist::iterator *iter, +int get_client_finish(bufferlist::const_iterator *iter, cls::journal::Client *client) { try { decode(*client, *iter); @@ -359,7 +359,7 @@ int get_next_tag_tid(librados::IoCtx &ioctx, const std::string &oid, return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); r = get_next_tag_tid_finish(&iter, tag_tid); if (r < 0) { return r; @@ -372,7 +372,7 @@ void get_next_tag_tid_start(librados::ObjectReadOperation *op) { op->exec("journal", "get_next_tag_tid", bl); } -int get_next_tag_tid_finish(bufferlist::iterator *iter, +int get_next_tag_tid_finish(bufferlist::const_iterator *iter, uint64_t *tag_tid) { try { decode(*tag_tid, *iter); @@ -393,7 +393,7 @@ int get_tag(librados::IoCtx &ioctx, const std::string &oid, return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); r = get_tag_finish(&iter, tag); if (r < 0) { return r; @@ -408,7 +408,7 @@ void get_tag_start(librados::ObjectReadOperation *op, op->exec("journal", "get_tag", bl); } -int get_tag_finish(bufferlist::iterator *iter, cls::journal::Tag *tag) { +int get_tag_finish(bufferlist::const_iterator *iter, cls::journal::Tag *tag) { try { decode(*tag, *iter); } catch (const buffer::error &err) { @@ -450,7 +450,7 @@ int tag_list(librados::IoCtx &ioctx, const std::string &oid, return r; } - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); std::set decode_tags; r = tag_list_finish(&iter, &decode_tags); if (r < 0) { @@ -477,7 +477,7 @@ void tag_list_start(librados::ObjectReadOperation *op, op->exec("journal", "tag_list", bl); } -int tag_list_finish(bufferlist::iterator *iter, +int tag_list_finish(bufferlist::const_iterator *iter, std::set *tags) { try { decode(*tags, *iter); diff --git a/src/cls/journal/cls_journal_client.h b/src/cls/journal/cls_journal_client.h index 8635b805d4c7..172fc6f984c4 100644 --- a/src/cls/journal/cls_journal_client.h +++ b/src/cls/journal/cls_journal_client.h @@ -40,7 +40,7 @@ int get_client(librados::IoCtx &ioctx, const std::string &oid, const std::string &id, cls::journal::Client *client); void get_client_start(librados::ObjectReadOperation *op, const std::string &id); -int get_client_finish(bufferlist::iterator *iter, +int get_client_finish(bufferlist::const_iterator *iter, cls::journal::Client *client); int client_register(librados::IoCtx &ioctx, const std::string &oid, @@ -75,14 +75,14 @@ void client_list(librados::IoCtx &ioctx, const std::string &oid, int get_next_tag_tid(librados::IoCtx &ioctx, const std::string &oid, uint64_t *tag_tid); void get_next_tag_tid_start(librados::ObjectReadOperation *op); -int get_next_tag_tid_finish(bufferlist::iterator *iter, +int get_next_tag_tid_finish(bufferlist::const_iterator *iter, uint64_t *tag_tid); int get_tag(librados::IoCtx &ioctx, const std::string &oid, uint64_t tag_tid, cls::journal::Tag *tag); void get_tag_start(librados::ObjectReadOperation *op, uint64_t tag_tid); -int get_tag_finish(bufferlist::iterator *iter, cls::journal::Tag *tag); +int get_tag_finish(bufferlist::const_iterator *iter, cls::journal::Tag *tag); int tag_create(librados::IoCtx &ioctx, const std::string &oid, uint64_t tag_tid, uint64_t tag_class, @@ -98,7 +98,7 @@ void tag_list_start(librados::ObjectReadOperation *op, uint64_t start_after_tag_tid, uint64_t max_return, const std::string &client_id, boost::optional tag_class); -int tag_list_finish(bufferlist::iterator *iter, +int tag_list_finish(bufferlist::const_iterator *iter, std::set *tags); // journal entry helpers diff --git a/src/cls/journal/cls_journal_types.cc b/src/cls/journal/cls_journal_types.cc index 0714c4160df5..6976304d0fe2 100644 --- a/src/cls/journal/cls_journal_types.cc +++ b/src/cls/journal/cls_journal_types.cc @@ -16,7 +16,7 @@ void ObjectPosition::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void ObjectPosition::decode(bufferlist::iterator& iter) { +void ObjectPosition::decode(bufferlist::const_iterator& iter) { DECODE_START(1, iter); decode(object_number, iter); decode(tag_tid, iter); @@ -41,7 +41,7 @@ void ObjectSetPosition::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void ObjectSetPosition::decode(bufferlist::iterator& iter) { +void ObjectSetPosition::decode(bufferlist::const_iterator& iter) { DECODE_START(1, iter); decode(object_positions, iter); DECODE_FINISH(iter); @@ -72,7 +72,7 @@ void Client::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void Client::decode(bufferlist::iterator& iter) { +void Client::decode(bufferlist::const_iterator& iter) { DECODE_START(1, iter); decode(id, iter); decode(data, iter); @@ -115,7 +115,7 @@ void Tag::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void Tag::decode(bufferlist::iterator& iter) { +void Tag::decode(bufferlist::const_iterator& iter) { DECODE_START(1, iter); decode(tid, iter); decode(tag_class, iter); diff --git a/src/cls/journal/cls_journal_types.h b/src/cls/journal/cls_journal_types.h index 289abd4b379c..2a6176983dba 100644 --- a/src/cls/journal/cls_journal_types.h +++ b/src/cls/journal/cls_journal_types.h @@ -37,7 +37,7 @@ struct ObjectPosition { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& iter); + void decode(bufferlist::const_iterator& iter); void dump(Formatter *f) const; inline bool operator<(const ObjectPosition &rhs) const { @@ -63,7 +63,7 @@ struct ObjectSetPosition { : object_positions(_object_positions) {} void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& iter); + void decode(bufferlist::const_iterator& iter); void dump(Formatter *f) const; inline bool operator==(const ObjectSetPosition &rhs) const { @@ -101,7 +101,7 @@ struct Client { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& iter); + void decode(bufferlist::const_iterator& iter); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); @@ -128,7 +128,7 @@ struct Tag { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& iter); + void decode(bufferlist::const_iterator& iter); void dump(Formatter *f) const; static void generate_test_instances(std::list &o); diff --git a/src/cls/lock/cls_lock.cc b/src/cls/lock/cls_lock.cc index 99ab3a6837fa..b25c1a0c468a 100644 --- a/src/cls/lock/cls_lock.cc +++ b/src/cls/lock/cls_lock.cc @@ -53,7 +53,7 @@ static int read_lock(cls_method_context_t hctx, const string& name, lock_info_t } try { - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); decode(*lock, it); } catch (const buffer::error &err) { CLS_ERR("error decoding %s", key.c_str()); @@ -214,7 +214,7 @@ static int lock_op(cls_method_context_t hctx, CLS_LOG(20, "lock_op"); cls_lock_lock_op op; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error &err) { return -EINVAL; @@ -279,7 +279,7 @@ static int unlock_op(cls_method_context_t hctx, CLS_LOG(20, "unlock_op"); cls_lock_unlock_op op; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error& err) { return -EINVAL; @@ -307,7 +307,7 @@ static int break_lock(cls_method_context_t hctx, CLS_LOG(20, "break_lock"); cls_lock_break_op op; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error& err) { return -EINVAL; @@ -333,7 +333,7 @@ static int get_info(cls_method_context_t hctx, bufferlist *in, bufferlist *out) CLS_LOG(20, "get_info"); cls_lock_get_info_op op; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error& err) { return -EINVAL; @@ -416,7 +416,7 @@ int assert_locked(cls_method_context_t hctx, bufferlist *in, bufferlist *out) cls_lock_assert_op op; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error& err) { return -EINVAL; @@ -488,7 +488,7 @@ int set_cookie(cls_method_context_t hctx, bufferlist *in, bufferlist *out) cls_lock_set_cookie_op op; try { - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error& err) { return -EINVAL; diff --git a/src/cls/lock/cls_lock_client.cc b/src/cls/lock/cls_lock_client.cc index 0e64ff914a46..19f6a575e612 100644 --- a/src/cls/lock/cls_lock_client.cc +++ b/src/cls/lock/cls_lock_client.cc @@ -116,7 +116,7 @@ namespace rados { return r; cls_lock_list_locks_reply ret; - bufferlist::iterator iter = out.begin(); + auto iter = cbegin(out); try { decode(ret, iter); } catch (buffer::error& err) { @@ -138,7 +138,7 @@ namespace rados { rados_op->exec("lock", "get_info", in); } - int get_lock_info_finish(bufferlist::iterator *iter, + int get_lock_info_finish(bufferlist::const_iterator *iter, map *lockers, ClsLockType *type, string *tag) { @@ -174,7 +174,7 @@ namespace rados { int r = ioctx->operate(oid, &op, &out); if (r < 0) return r; - bufferlist::iterator it = out.begin(); + auto it = std::cbegin(out); return get_lock_info_finish(&it, lockers, type, tag); } diff --git a/src/cls/lock/cls_lock_client.h b/src/cls/lock/cls_lock_client.h index 7aa06238f179..43e14e6a493f 100644 --- a/src/cls/lock/cls_lock_client.h +++ b/src/cls/lock/cls_lock_client.h @@ -52,7 +52,7 @@ namespace rados { list *locks); extern void get_lock_info_start(librados::ObjectReadOperation *rados_op, const std::string& name); - extern int get_lock_info_finish(ceph::bufferlist::iterator *out, + extern int get_lock_info_finish(ceph::bufferlist::const_iterator *out, map *lockers, ClsLockType *type, std::string *tag); diff --git a/src/cls/lock/cls_lock_ops.h b/src/cls/lock/cls_lock_ops.h index 68805b7ba163..0138f6e0c2b9 100644 --- a/src/cls/lock/cls_lock_ops.h +++ b/src/cls/lock/cls_lock_ops.h @@ -29,7 +29,7 @@ struct cls_lock_lock_op encode(flags, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl); decode(name, bl); uint8_t t; @@ -60,7 +60,7 @@ struct cls_lock_unlock_op encode(cookie, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl); decode(name, bl); decode(cookie, bl); @@ -86,7 +86,7 @@ struct cls_lock_break_op encode(cookie, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl); decode(name, bl); decode(locker, bl); @@ -109,7 +109,7 @@ struct cls_lock_get_info_op encode(name, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl); decode(name, bl); DECODE_FINISH(bl); @@ -135,7 +135,7 @@ struct cls_lock_get_info_reply encode(tag, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl); decode(lockers, bl); uint8_t t; @@ -160,7 +160,7 @@ struct cls_lock_list_locks_reply encode(locks, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl); decode(locks, bl); DECODE_FINISH(bl); @@ -188,7 +188,7 @@ struct cls_lock_assert_op encode(tag, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl); decode(name, bl); uint8_t t; @@ -223,7 +223,7 @@ struct cls_lock_set_cookie_op encode(new_cookie, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl); decode(name, bl); uint8_t t; diff --git a/src/cls/lock/cls_lock_types.h b/src/cls/lock/cls_lock_types.h index 064a64d8964d..d88786c6e870 100644 --- a/src/cls/lock/cls_lock_types.h +++ b/src/cls/lock/cls_lock_types.h @@ -49,7 +49,7 @@ namespace rados { encode(cookie, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl); decode(locker, bl); decode(cookie, bl); @@ -85,7 +85,7 @@ namespace rados { encode(description, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl); decode(expiration, bl); decode(addr, bl); @@ -112,7 +112,7 @@ namespace rados { encode(tag, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(1, 1, 1, bl); decode(lockers, bl); uint8_t t; diff --git a/src/cls/log/cls_log.cc b/src/cls/log/cls_log.cc index fd94a2fd16f2..3de35484cb7c 100644 --- a/src/cls/log/cls_log.cc +++ b/src/cls/log/cls_log.cc @@ -50,7 +50,7 @@ static int read_header(cls_method_context_t hctx, cls_log_header& header) return 0; } - bufferlist::iterator iter = header_bl.begin(); + auto iter = header_bl.cbegin(); try { decode(header, iter); } catch (buffer::error& err) { @@ -85,7 +85,7 @@ static void get_index(cls_method_context_t hctx, utime_t& ts, string& index) static int cls_log_add(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_log_add_op op; try { @@ -140,7 +140,7 @@ static int cls_log_add(cls_method_context_t hctx, bufferlist *in, bufferlist *ou static int cls_log_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_log_list_op op; try { @@ -190,7 +190,7 @@ static int cls_log_list(cls_method_context_t hctx, bufferlist *in, bufferlist *o } bufferlist& bl = iter->second; - bufferlist::iterator biter = bl.begin(); + auto biter = bl.cbegin(); try { cls_log_entry e; decode(e, biter); @@ -210,7 +210,7 @@ static int cls_log_list(cls_method_context_t hctx, bufferlist *in, bufferlist *o static int cls_log_trim(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_log_trim_op op; try { @@ -273,7 +273,7 @@ static int cls_log_trim(cls_method_context_t hctx, bufferlist *in, bufferlist *o static int cls_log_info(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_log_info_op op; try { diff --git a/src/cls/log/cls_log_client.cc b/src/cls/log/cls_log_client.cc index ac9ad2844dc3..accc9dd14375 100644 --- a/src/cls/log/cls_log_client.cc +++ b/src/cls/log/cls_log_client.cc @@ -91,7 +91,7 @@ public: if (r >= 0) { cls_log_list_ret ret; try { - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); decode(ret, iter); if (entries) *entries = std::move(ret.entries); @@ -131,7 +131,7 @@ public: if (r >= 0) { cls_log_info_ret ret; try { - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); decode(ret, iter); if (header) *header = ret.header; diff --git a/src/cls/log/cls_log_ops.h b/src/cls/log/cls_log_ops.h index 514b2b82039d..2967da6ea687 100644 --- a/src/cls/log/cls_log_ops.h +++ b/src/cls/log/cls_log_ops.h @@ -19,7 +19,7 @@ struct cls_log_add_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(2, bl); decode(entries, bl); if (struct_v >= 2) { @@ -48,7 +48,7 @@ struct cls_log_list_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(from_time, bl); decode(marker, bl); @@ -74,7 +74,7 @@ struct cls_log_list_ret { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(entries, bl); decode(marker, bl); @@ -106,7 +106,7 @@ struct cls_log_trim_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(2, bl); decode(from_time, bl); decode(to_time, bl); @@ -128,7 +128,7 @@ struct cls_log_info_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); // currently empty request DECODE_FINISH(bl); @@ -145,7 +145,7 @@ struct cls_log_info_ret { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(header, bl); DECODE_FINISH(bl); diff --git a/src/cls/log/cls_log_types.h b/src/cls/log/cls_log_types.h index 482048bcdb32..5ec8628f6ac3 100644 --- a/src/cls/log/cls_log_types.h +++ b/src/cls/log/cls_log_types.h @@ -28,7 +28,7 @@ struct cls_log_entry { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(2, bl); decode(section, bl); decode(name, bl); @@ -52,7 +52,7 @@ struct cls_log_header { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(max_marker, bl); decode(max_time, bl); diff --git a/src/cls/lua/cls_lua.cc b/src/cls/lua/cls_lua.cc index f4d24c276187..12a31a56f717 100644 --- a/src/cls/lua/cls_lua.cc +++ b/src/cls/lua/cls_lua.cc @@ -865,7 +865,7 @@ static int clslua_eval(lua_State *L) cls_lua_eval_op op; try { - bufferlist::iterator it = ctx->inbl->begin(); + auto it = ctx->inbl->cbegin(); decode(op, it); } catch (const buffer::error &err) { CLS_ERR("error: could not decode ceph encoded input"); diff --git a/src/cls/lua/cls_lua_ops.h b/src/cls/lua/cls_lua_ops.h index d516ee1b27e0..c4afbd8a2ddd 100644 --- a/src/cls/lua/cls_lua_ops.h +++ b/src/cls/lua/cls_lua_ops.h @@ -18,7 +18,7 @@ struct cls_lua_eval_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(script, bl); decode(handler, bl); diff --git a/src/cls/numops/cls_numops.cc b/src/cls/numops/cls_numops.cc index 4ade9cf7d51a..760def4a9280 100644 --- a/src/cls/numops/cls_numops.cc +++ b/src/cls/numops/cls_numops.cc @@ -35,7 +35,7 @@ static int add(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string key, diff_str; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(key, iter); decode(diff_str, iter); @@ -90,7 +90,7 @@ static int mul(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { string key, diff_str; - bufferlist::iterator iter = in->begin(); + auto iter = in->cbegin(); try { decode(key, iter); decode(diff_str, iter); diff --git a/src/cls/otp/cls_otp.cc b/src/cls/otp/cls_otp.cc index 76e25522b8ba..355e14dab3e0 100644 --- a/src/cls/otp/cls_otp.cc +++ b/src/cls/otp/cls_otp.cc @@ -48,7 +48,7 @@ struct otp_header { encode(ids, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(ids, bl); DECODE_FINISH(bl); @@ -71,7 +71,7 @@ struct otp_instance { encode(last_success, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(otp, bl); decode(last_checks, bl); @@ -175,7 +175,7 @@ static int get_otp_instance(cls_method_context_t hctx, const string& id, otp_ins } try { - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); decode(*instance, it); } catch (const buffer::error &err) { CLS_ERR("ERROR: failed to decode %s", key.c_str()); @@ -233,7 +233,7 @@ static int read_header(cls_method_context_t hctx, otp_header *h) return 0; } - auto iter = bl.begin(); + auto iter = bl.cbegin(); try { decode(*h, iter); } catch (buffer::error& err) { @@ -297,7 +297,7 @@ static int otp_set_op(cls_method_context_t hctx, CLS_LOG(20, "%s", __func__); cls_otp_set_otp_op op; try { - auto iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error &err) { CLS_ERR("ERROR: %s(): failed to decode request", __func__); @@ -346,7 +346,7 @@ static int otp_remove_op(cls_method_context_t hctx, CLS_LOG(20, "%s", __func__); cls_otp_remove_otp_op op; try { - auto iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error &err) { CLS_ERR("ERROR: %s(): failed to decode request", __func__); @@ -392,7 +392,7 @@ static int otp_get_op(cls_method_context_t hctx, CLS_LOG(20, "%s", __func__); cls_otp_get_otp_op op; try { - auto iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error &err) { CLS_ERR("ERROR: %s(): failed to decode request", __func__); @@ -443,7 +443,7 @@ static int otp_check_op(cls_method_context_t hctx, CLS_LOG(20, "%s", __func__); cls_otp_check_otp_op op; try { - auto iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error &err) { CLS_ERR("ERROR: %s(): failed to decode request", __func__); @@ -479,7 +479,7 @@ static int otp_get_result(cls_method_context_t hctx, CLS_LOG(20, "%s", __func__); cls_otp_check_otp_op op; try { - auto iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error &err) { CLS_ERR("ERROR: %s(): failed to decode request", __func__); @@ -509,7 +509,7 @@ static int otp_get_current_time_op(cls_method_context_t hctx, CLS_LOG(20, "%s", __func__); cls_otp_get_current_time_op op; try { - auto iter = in->begin(); + auto iter = in->cbegin(); decode(op, iter); } catch (const buffer::error &err) { CLS_ERR("ERROR: %s(): failed to decode request", __func__); diff --git a/src/cls/otp/cls_otp_client.cc b/src/cls/otp/cls_otp_client.cc index 31f18a4991c8..f080de08347a 100644 --- a/src/cls/otp/cls_otp_client.cc +++ b/src/cls/otp/cls_otp_client.cc @@ -83,7 +83,7 @@ namespace rados { return r; } - auto iter = out.begin(); + auto iter = out.cbegin(); cls_otp_get_result_reply ret; try { decode(ret, iter); @@ -122,7 +122,7 @@ namespace rados { } cls_otp_get_otp_reply ret; - auto iter = out.begin(); + auto iter = out.cbegin(); try { decode(ret, iter); } catch (buffer::error& err) { @@ -175,7 +175,7 @@ namespace rados { } cls_otp_get_current_time_reply ret; - auto iter = out.begin(); + auto iter = out.cbegin(); try { decode(ret, iter); } catch (buffer::error& err) { diff --git a/src/cls/otp/cls_otp_ops.h b/src/cls/otp/cls_otp_ops.h index b5c931a48bcf..51cec3eb37bc 100644 --- a/src/cls/otp/cls_otp_ops.h +++ b/src/cls/otp/cls_otp_ops.h @@ -14,7 +14,7 @@ struct cls_otp_set_otp_op encode(entries, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(entries, bl); DECODE_FINISH(bl); @@ -35,7 +35,7 @@ struct cls_otp_check_otp_op encode(token, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(id, bl); decode(val, bl); @@ -54,7 +54,7 @@ struct cls_otp_get_result_op encode(token, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(token, bl); DECODE_FINISH(bl); @@ -71,7 +71,7 @@ struct cls_otp_get_result_reply encode(result, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(result, bl); DECODE_FINISH(bl); @@ -88,7 +88,7 @@ struct cls_otp_remove_otp_op encode(ids, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(ids, bl); DECODE_FINISH(bl); @@ -107,7 +107,7 @@ struct cls_otp_get_otp_op encode(ids, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(get_all, bl); decode(ids, bl); @@ -125,7 +125,7 @@ struct cls_otp_get_otp_reply encode(found_entries, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(found_entries, bl); DECODE_FINISH(bl); @@ -139,7 +139,7 @@ struct cls_otp_get_current_time_op ENCODE_START(1, 1, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); DECODE_FINISH(bl); } @@ -155,7 +155,7 @@ struct cls_otp_get_current_time_reply encode(time, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(time, bl); DECODE_FINISH(bl); diff --git a/src/cls/otp/cls_otp_types.h b/src/cls/otp/cls_otp_types.h index cc752d3e7fed..b542b5cbd878 100644 --- a/src/cls/otp/cls_otp_types.h +++ b/src/cls/otp/cls_otp_types.h @@ -53,7 +53,7 @@ namespace rados { encode(window, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); uint8_t t; decode(t, bl); @@ -92,7 +92,7 @@ namespace rados { encode((char)result, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(token, bl); decode(timestamp, bl); @@ -114,7 +114,7 @@ namespace rados { encode(entries, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(entries, bl); DECODE_FINISH(bl); diff --git a/src/cls/refcount/cls_refcount.cc b/src/cls/refcount/cls_refcount.cc index 335c712db95c..24798342eea1 100644 --- a/src/cls/refcount/cls_refcount.cc +++ b/src/cls/refcount/cls_refcount.cc @@ -26,7 +26,7 @@ struct chunk_obj_refcount { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(refs, bl); DECODE_FINISH(bl); @@ -47,7 +47,7 @@ struct obj_refcount { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(2, bl); decode(refs, bl); if (struct_v >= 2) { @@ -75,7 +75,7 @@ static int read_refcount(cls_method_context_t hctx, bool implicit_ref, obj_refco return ret; try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(*objr, iter); } catch (buffer::error& err) { CLS_LOG(0, "ERROR: read_refcount(): failed to decode refcount entry\n"); @@ -100,7 +100,7 @@ static int set_refcount(cls_method_context_t hctx, const struct obj_refcount& ob static int cls_rc_refcount_get(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_refcount_get_op op; try { @@ -128,7 +128,7 @@ static int cls_rc_refcount_get(cls_method_context_t hctx, bufferlist *in, buffer static int cls_rc_refcount_put(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_refcount_put_op op; try { @@ -181,7 +181,7 @@ static int cls_rc_refcount_put(cls_method_context_t hctx, bufferlist *in, buffer static int cls_rc_refcount_set(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_refcount_set_op op; try { @@ -210,7 +210,7 @@ static int cls_rc_refcount_set(cls_method_context_t hctx, bufferlist *in, buffer static int cls_rc_refcount_read(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_refcount_read_op op; try { @@ -249,7 +249,7 @@ static int chunk_read_refcount(cls_method_context_t hctx, chunk_obj_refcount *ob return ret; try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(*objr, iter); } catch (buffer::error& err) { CLS_LOG(0, "ERROR: chunk_read_refcount(): failed to decode refcount entry\n"); @@ -274,7 +274,7 @@ static int chunk_set_refcount(cls_method_context_t hctx, const struct chunk_obj_ static int cls_rc_chunk_refcount_get(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_chunk_refcount_get_op op; try { @@ -302,7 +302,7 @@ static int cls_rc_chunk_refcount_get(cls_method_context_t hctx, bufferlist *in, static int cls_rc_chunk_refcount_put(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_chunk_refcount_put_op op; try { @@ -352,7 +352,7 @@ static int cls_rc_chunk_refcount_put(cls_method_context_t hctx, bufferlist *in, static int cls_rc_chunk_refcount_set(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_chunk_refcount_set_op op; try { diff --git a/src/cls/refcount/cls_refcount_client.cc b/src/cls/refcount/cls_refcount_client.cc index d3e1aeecb470..ae2853f73e0b 100644 --- a/src/cls/refcount/cls_refcount_client.cc +++ b/src/cls/refcount/cls_refcount_client.cc @@ -48,7 +48,7 @@ int cls_refcount_read(librados::IoCtx& io_ctx, string& oid, list *refs, cls_refcount_read_ret ret; try { - bufferlist::iterator iter = out.begin(); + auto iter = out.cbegin(); decode(ret, iter); } catch (buffer::error& err) { return -EIO; @@ -95,7 +95,7 @@ int cls_chunk_refcount_read(librados::IoCtx& io_ctx, string& oid, set cls_chunk_refcount_read_ret ret; try { - bufferlist::iterator iter = out.begin(); + auto iter = out.cbegin(); decode(ret, iter); } catch (buffer::error& err) { return -EIO; diff --git a/src/cls/refcount/cls_refcount_ops.h b/src/cls/refcount/cls_refcount_ops.h index 93a213aa4aa3..6775d82cdaee 100644 --- a/src/cls/refcount/cls_refcount_ops.h +++ b/src/cls/refcount/cls_refcount_ops.h @@ -20,7 +20,7 @@ struct cls_refcount_get_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(tag, bl); decode(implicit_ref, bl); @@ -45,7 +45,7 @@ struct cls_refcount_put_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(tag, bl); decode(implicit_ref, bl); @@ -68,7 +68,7 @@ struct cls_refcount_set_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(refs, bl); DECODE_FINISH(bl); @@ -91,7 +91,7 @@ struct cls_refcount_read_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(implicit_ref, bl); DECODE_FINISH(bl); @@ -113,7 +113,7 @@ struct cls_refcount_read_ret { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(refs, bl); DECODE_FINISH(bl); @@ -135,7 +135,7 @@ struct cls_chunk_refcount_get_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(source, bl); DECODE_FINISH(bl); @@ -156,7 +156,7 @@ struct cls_chunk_refcount_put_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(source, bl); DECODE_FINISH(bl); @@ -178,7 +178,7 @@ struct cls_chunk_refcount_set_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(refs, bl); DECODE_FINISH(bl); @@ -200,7 +200,7 @@ struct cls_chunk_refcount_read_ret { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(refs, bl); DECODE_FINISH(bl); diff --git a/src/cls/statelog/cls_statelog.cc b/src/cls/statelog/cls_statelog.cc index 0a49ae79d407..199d22e0e7c2 100644 --- a/src/cls/statelog/cls_statelog.cc +++ b/src/cls/statelog/cls_statelog.cc @@ -74,7 +74,7 @@ static int get_existing_entry(cls_method_context_t hctx, const string& client_id return rc; } try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(entry, iter); } catch (buffer::error& err) { CLS_LOG(0, "ERROR: failed to decode entry %s", obj_index.c_str()); @@ -94,7 +94,7 @@ static int get_existing_entry(cls_method_context_t hctx, const string& client_id static int cls_statelog_add(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_statelog_add_op op; try { @@ -134,7 +134,7 @@ static int cls_statelog_add(cls_method_context_t hctx, bufferlist *in, bufferlis static int cls_statelog_list(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_statelog_list_op op; try { @@ -186,7 +186,7 @@ static int cls_statelog_list(cls_method_context_t hctx, bufferlist *in, bufferli marker = index; bufferlist& bl = iter->second; - bufferlist::iterator biter = bl.begin(); + auto biter = bl.cbegin(); try { cls_statelog_entry e; decode(e, biter); @@ -207,7 +207,7 @@ static int cls_statelog_list(cls_method_context_t hctx, bufferlist *in, bufferli static int cls_statelog_remove(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_statelog_remove_op op; try { @@ -246,7 +246,7 @@ static int cls_statelog_remove(cls_method_context_t hctx, bufferlist *in, buffer static int cls_statelog_check_state(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_statelog_check_state_op op; try { diff --git a/src/cls/statelog/cls_statelog_client.cc b/src/cls/statelog/cls_statelog_client.cc index 6a477a1b1876..c867f26c99b5 100644 --- a/src/cls/statelog/cls_statelog_client.cc +++ b/src/cls/statelog/cls_statelog_client.cc @@ -77,7 +77,7 @@ public: if (r >= 0) { cls_statelog_list_ret ret; try { - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); decode(ret, iter); if (entries) *entries = ret.entries; diff --git a/src/cls/statelog/cls_statelog_ops.h b/src/cls/statelog/cls_statelog_ops.h index 402999e7baf6..404ae463b50f 100644 --- a/src/cls/statelog/cls_statelog_ops.h +++ b/src/cls/statelog/cls_statelog_ops.h @@ -17,7 +17,7 @@ struct cls_statelog_add_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(entries, bl); DECODE_FINISH(bl); @@ -45,7 +45,7 @@ struct cls_statelog_list_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(object, bl); decode(client_id, bl); @@ -72,7 +72,7 @@ struct cls_statelog_list_ret { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(entries, bl); decode(marker, bl); @@ -102,7 +102,7 @@ struct cls_statelog_remove_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(client_id, bl); decode(op_id, bl); @@ -129,7 +129,7 @@ struct cls_statelog_check_state_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(client_id, bl); decode(op_id, bl); diff --git a/src/cls/statelog/cls_statelog_types.h b/src/cls/statelog/cls_statelog_types.h index 071b58930e21..939acd157a6c 100644 --- a/src/cls/statelog/cls_statelog_types.h +++ b/src/cls/statelog/cls_statelog_types.h @@ -29,7 +29,7 @@ struct cls_statelog_entry { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(client_id, bl); decode(op_id, bl); diff --git a/src/cls/timeindex/cls_timeindex.cc b/src/cls/timeindex/cls_timeindex.cc index 7a5060bc86e9..92ea15be5f82 100644 --- a/src/cls/timeindex/cls_timeindex.cc +++ b/src/cls/timeindex/cls_timeindex.cc @@ -56,7 +56,7 @@ static int cls_timeindex_add(cls_method_context_t hctx, bufferlist * const in, bufferlist * const out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_timeindex_add_op op; try { @@ -89,7 +89,7 @@ static int cls_timeindex_list(cls_method_context_t hctx, bufferlist * const in, bufferlist * const out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_timeindex_list_op op; try { @@ -170,7 +170,7 @@ static int cls_timeindex_trim(cls_method_context_t hctx, bufferlist * const in, bufferlist * const out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_timeindex_trim_op op; try { diff --git a/src/cls/timeindex/cls_timeindex_client.h b/src/cls/timeindex/cls_timeindex_client.h index 27ad929aa02e..275bfc659a5c 100644 --- a/src/cls/timeindex/cls_timeindex_client.h +++ b/src/cls/timeindex/cls_timeindex_client.h @@ -37,7 +37,7 @@ public: if (r >= 0) { cls_timeindex_list_ret ret; try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(ret, iter); if (entries) *entries = ret.entries; diff --git a/src/cls/timeindex/cls_timeindex_ops.h b/src/cls/timeindex/cls_timeindex_ops.h index 54cf4271d592..05aa8b19ba88 100644 --- a/src/cls/timeindex/cls_timeindex_ops.h +++ b/src/cls/timeindex/cls_timeindex_ops.h @@ -17,7 +17,7 @@ struct cls_timeindex_add_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(entries, bl); DECODE_FINISH(bl); @@ -43,7 +43,7 @@ struct cls_timeindex_list_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(from_time, bl); decode(marker, bl); @@ -69,7 +69,7 @@ struct cls_timeindex_list_ret { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(entries, bl); decode(marker, bl); @@ -101,7 +101,7 @@ struct cls_timeindex_trim_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(from_time, bl); decode(to_time, bl); diff --git a/src/cls/timeindex/cls_timeindex_types.h b/src/cls/timeindex/cls_timeindex_types.h index 59f953f06ed9..2b381767cf62 100644 --- a/src/cls/timeindex/cls_timeindex_types.h +++ b/src/cls/timeindex/cls_timeindex_types.h @@ -30,7 +30,7 @@ struct cls_timeindex_entry { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(key_ts, bl); decode(key_ext, bl); diff --git a/src/cls/user/cls_user.cc b/src/cls/user/cls_user.cc index d350a7a1292b..2f02219fffdb 100644 --- a/src/cls/user/cls_user.cc +++ b/src/cls/user/cls_user.cc @@ -54,7 +54,7 @@ static int get_existing_bucket_entry(cls_method_context_t hctx, const string& bu return rc; } try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(entry, iter); } catch (buffer::error& err) { CLS_LOG(0, "ERROR: failed to decode entry %s", key.c_str()); @@ -110,7 +110,7 @@ static void apply_entry_stats(const cls_user_bucket_entry& src_entry, cls_user_b static int cls_user_set_buckets_info(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_user_set_buckets_op op; try { @@ -190,7 +190,7 @@ static int cls_user_set_buckets_info(cls_method_context_t hctx, bufferlist *in, static int cls_user_complete_stats_sync(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_user_complete_stats_sync_op op; try { @@ -223,7 +223,7 @@ static int cls_user_complete_stats_sync(cls_method_context_t hctx, bufferlist *i static int cls_user_remove_bucket(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_user_remove_bucket_op op; try { @@ -269,7 +269,7 @@ static int cls_user_remove_bucket(cls_method_context_t hctx, bufferlist *in, buf static int cls_user_list_buckets(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_user_list_buckets_op op; try { @@ -317,7 +317,7 @@ static int cls_user_list_buckets(cls_method_context_t hctx, bufferlist *in, buff } bufferlist& bl = iter->second; - bufferlist::iterator biter = bl.begin(); + auto biter = bl.cbegin(); try { cls_user_bucket_entry e; decode(e, biter); @@ -338,7 +338,7 @@ static int cls_user_list_buckets(cls_method_context_t hctx, bufferlist *in, buff static int cls_user_get_header(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_user_get_header_op op; try { @@ -368,7 +368,7 @@ static int cls_user_reset_stats(cls_method_context_t hctx, bufferlist *in, buffe cls_user_reset_stats_op op; try { - auto bliter = in->begin(); + auto bliter = in->cbegin(); decode(op, bliter); } catch (buffer::error& err) { CLS_LOG(0, "ERROR: cls_user_reset_op(): failed to decode op"); @@ -388,7 +388,7 @@ static int cls_user_reset_stats(cls_method_context_t hctx, bufferlist *in, buffe cls_user_bucket_entry e; try { auto bl = kv.second; - auto bliter = bl.begin(); + auto bliter = bl.cbegin(); decode(e, bliter); } catch (buffer::error& err) { CLS_LOG(0, "ERROR: failed to decode bucket entry for %s", kv.first.c_str()); diff --git a/src/cls/user/cls_user_client.cc b/src/cls/user/cls_user_client.cc index 4cb7e3df1d78..c18be4a26492 100644 --- a/src/cls/user/cls_user_client.cc +++ b/src/cls/user/cls_user_client.cc @@ -51,7 +51,7 @@ public: if (r >= 0) { cls_user_list_buckets_ret ret; try { - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); decode(ret, iter); if (entries) *entries = ret.entries; @@ -104,7 +104,7 @@ public: if (r >= 0) { cls_user_get_header_ret ret; try { - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); decode(ret, iter); if (header) *header = ret.header; diff --git a/src/cls/user/cls_user_ops.h b/src/cls/user/cls_user_ops.h index 986f3eefd2de..fa4b1f31b67b 100644 --- a/src/cls/user/cls_user_ops.h +++ b/src/cls/user/cls_user_ops.h @@ -21,7 +21,7 @@ struct cls_user_set_buckets_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(entries, bl); decode(add, bl); @@ -45,7 +45,7 @@ struct cls_user_remove_bucket_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(bucket, bl); DECODE_FINISH(bl); @@ -73,7 +73,7 @@ struct cls_user_list_buckets_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(2, bl); decode(marker, bl); decode(max_entries, bl); @@ -103,7 +103,7 @@ struct cls_user_list_buckets_ret { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(entries, bl); decode(marker, bl); @@ -125,7 +125,7 @@ struct cls_user_get_header_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); DECODE_FINISH(bl); } @@ -145,7 +145,7 @@ struct cls_user_reset_stats_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(time, bl); DECODE_FINISH(bl); @@ -167,7 +167,7 @@ struct cls_user_get_header_ret { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(header, bl); DECODE_FINISH(bl); @@ -189,7 +189,7 @@ struct cls_user_complete_stats_sync_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(time, bl); DECODE_FINISH(bl); diff --git a/src/cls/user/cls_user_types.h b/src/cls/user/cls_user_types.h index 9d0338089470..8efd8bc5f6fe 100644 --- a/src/cls/user/cls_user_types.h +++ b/src/cls/user/cls_user_types.h @@ -47,7 +47,7 @@ struct cls_user_bucket { ENCODE_FINISH(bl); } } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(8, 3, 3, bl); decode(name, bl); if (struct_v < 8) { @@ -124,7 +124,7 @@ struct cls_user_bucket_entry { //::encode(placement_rule, bl); removed in v9 ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(9, 5, 5, bl); __u32 mt; uint64_t s; @@ -175,7 +175,7 @@ struct cls_user_stats { encode(total_bytes_rounded, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(total_entries, bl); decode(total_bytes, bl); @@ -203,7 +203,7 @@ struct cls_user_header { encode(last_stats_update, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(stats, bl); decode(last_stats_sync, bl); diff --git a/src/cls/version/cls_version.cc b/src/cls/version/cls_version.cc index d4ca638d91e5..aa10e2a898f5 100644 --- a/src/cls/version/cls_version.cc +++ b/src/cls/version/cls_version.cc @@ -64,7 +64,7 @@ static int read_version(cls_method_context_t hctx, obj_version *objv, bool impli return ret; try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(*objv, iter); } catch (buffer::error& err) { CLS_LOG(0, "ERROR: read_version(): failed to decode version entry\n"); @@ -76,7 +76,7 @@ static int read_version(cls_method_context_t hctx, obj_version *objv, bool impli static int cls_version_set(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_version_set_op op; try { @@ -142,7 +142,7 @@ static bool check_conds(list& conds, obj_version& objv) static int cls_version_inc(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_version_inc_op op; try { @@ -171,7 +171,7 @@ static int cls_version_inc(cls_method_context_t hctx, bufferlist *in, bufferlist static int cls_version_check(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { - bufferlist::iterator in_iter = in->begin(); + auto in_iter = in->cbegin(); cls_version_check_op op; try { diff --git a/src/cls/version/cls_version_client.cc b/src/cls/version/cls_version_client.cc index c26826e903c0..3c1792aaa8a5 100644 --- a/src/cls/version/cls_version_client.cc +++ b/src/cls/version/cls_version_client.cc @@ -64,7 +64,7 @@ public: if (r >= 0) { cls_version_read_ret ret; try { - bufferlist::iterator iter = outbl.begin(); + auto iter = outbl.cbegin(); decode(ret, iter); *objv = ret.objv; } catch (buffer::error& err) { @@ -89,7 +89,7 @@ int cls_version_read(librados::IoCtx& io_ctx, string& oid, obj_version *ver) cls_version_read_ret ret; try { - bufferlist::iterator iter = out.begin(); + auto iter = out.cbegin(); decode(ret, iter); } catch (buffer::error& err) { return -EIO; diff --git a/src/cls/version/cls_version_ops.h b/src/cls/version/cls_version_ops.h index 56e3f3577916..36592fa6ad00 100644 --- a/src/cls/version/cls_version_ops.h +++ b/src/cls/version/cls_version_ops.h @@ -17,7 +17,7 @@ struct cls_version_set_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(objv, bl); DECODE_FINISH(bl); @@ -38,7 +38,7 @@ struct cls_version_inc_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(objv, bl); decode(conds, bl); @@ -60,7 +60,7 @@ struct cls_version_check_op { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(objv, bl); decode(conds, bl); @@ -80,7 +80,7 @@ struct cls_version_read_ret { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(objv, bl); DECODE_FINISH(bl); diff --git a/src/cls/version/cls_version_types.h b/src/cls/version/cls_version_types.h index 440b6d65507f..15433b46fd11 100644 --- a/src/cls/version/cls_version_types.h +++ b/src/cls/version/cls_version_types.h @@ -20,7 +20,7 @@ struct obj_version { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(ver, bl); decode(tag, bl); @@ -73,7 +73,7 @@ struct obj_version_cond { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(ver, bl); uint32_t c; diff --git a/src/common/DecayCounter.cc b/src/common/DecayCounter.cc index 86562b3e99a1..398a4d3358e4 100644 --- a/src/common/DecayCounter.cc +++ b/src/common/DecayCounter.cc @@ -24,7 +24,7 @@ void DecayCounter::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void DecayCounter::decode(const utime_t &t, bufferlist::iterator &p) +void DecayCounter::decode(const utime_t &t, bufferlist::const_iterator &p) { DECODE_START_LEGACY_COMPAT_LEN(4, 4, 4, p); if (struct_v < 2) { diff --git a/src/common/DecayCounter.h b/src/common/DecayCounter.h index 5e0e0d3b52dc..9fc3a44cd9e5 100644 --- a/src/common/DecayCounter.h +++ b/src/common/DecayCounter.h @@ -51,7 +51,7 @@ public: DecayRate rate; void encode(bufferlist& bl) const; - void decode(const utime_t &t, bufferlist::iterator& p); + void decode(const utime_t &t, bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(list& ls); @@ -68,7 +68,7 @@ public: // these two functions are for the use of our dencoder testing infrastructure DecayCounter() : val(0), delta(0), vel(0), last_decay() {} - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { utime_t fake_time; decode(fake_time, p); } @@ -141,11 +141,11 @@ public: }; inline void encode(const DecayCounter &c, bufferlist &bl) { c.encode(bl); } -inline void decode(DecayCounter &c, const utime_t &t, bufferlist::iterator &p) { +inline void decode(DecayCounter &c, const utime_t &t, bufferlist::const_iterator &p) { c.decode(t, p); } // for dencoder -inline void decode(DecayCounter &c, bufferlist::iterator &p) { +inline void decode(DecayCounter &c, bufferlist::const_iterator &p) { utime_t t; c.decode(t, p); } diff --git a/src/common/LogEntry.cc b/src/common/LogEntry.cc index 2ad8a5411f96..f8659b7f1743 100644 --- a/src/common/LogEntry.cc +++ b/src/common/LogEntry.cc @@ -19,7 +19,7 @@ void LogEntryKey::encode(bufferlist& bl, uint64_t features) const encode(seq, bl); } -void LogEntryKey::decode(bufferlist::iterator& bl) +void LogEntryKey::decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(who, bl); @@ -220,7 +220,7 @@ void LogEntry::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void LogEntry::decode(bufferlist::iterator& bl) +void LogEntry::decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(4, 2, 2, bl); __u16 t; @@ -310,7 +310,7 @@ void LogSummary::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void LogSummary::decode(bufferlist::iterator& bl) +void LogSummary::decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(3, 2, 2, bl); decode(version, bl); diff --git a/src/common/LogEntry.h b/src/common/LogEntry.h index 1c405d89fecf..9808b0b18673 100644 --- a/src/common/LogEntry.h +++ b/src/common/LogEntry.h @@ -78,7 +78,7 @@ public: } void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); @@ -112,7 +112,7 @@ struct LogEntry { void log_to_syslog(string level, string facility); void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); static clog_type str_to_level(std::string const &str); @@ -147,7 +147,7 @@ struct LogSummary { } void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; diff --git a/src/common/SloppyCRCMap.cc b/src/common/SloppyCRCMap.cc index 0868325bb4af..58dd7800cbea 100644 --- a/src/common/SloppyCRCMap.cc +++ b/src/common/SloppyCRCMap.cc @@ -146,7 +146,7 @@ void SloppyCRCMap::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void SloppyCRCMap::decode(bufferlist::iterator& bl) +void SloppyCRCMap::decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); uint32_t bs; diff --git a/src/common/SloppyCRCMap.h b/src/common/SloppyCRCMap.h index d8d1561123e1..7802b6347dd8 100644 --- a/src/common/SloppyCRCMap.h +++ b/src/common/SloppyCRCMap.h @@ -64,7 +64,7 @@ public: int read(uint64_t offset, uint64_t len, const bufferlist& bl, std::ostream *err); void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(std::list& ls); }; diff --git a/src/common/bit_vector.hpp b/src/common/bit_vector.hpp index 88a81296bc5e..84fad5f916dc 100644 --- a/src/common/bit_vector.hpp +++ b/src/common/bit_vector.hpp @@ -187,21 +187,21 @@ public: ConstReference operator[](uint64_t offset) const; void encode_header(bufferlist& bl) const; - void decode_header(bufferlist::iterator& it); + void decode_header(bufferlist::const_iterator& it); uint64_t get_header_length() const; void encode_data(bufferlist& bl, uint64_t byte_offset, uint64_t byte_length) const; - void decode_data(bufferlist::iterator& it, uint64_t byte_offset); + void decode_data(bufferlist::const_iterator& it, uint64_t byte_offset); void get_data_extents(uint64_t offset, uint64_t length, uint64_t *byte_offset, uint64_t *byte_length) const; void encode_footer(bufferlist& bl) const; - void decode_footer(bufferlist::iterator& it); + void decode_footer(bufferlist::const_iterator& it); uint64_t get_footer_offset() const; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& it); + void decode(bufferlist::const_iterator& it); void dump(Formatter *f) const; bool operator==(const BitVector &b) const; @@ -280,12 +280,12 @@ void BitVector<_b>::encode_header(bufferlist& bl) const { } template -void BitVector<_b>::decode_header(bufferlist::iterator& it) { +void BitVector<_b>::decode_header(bufferlist::const_iterator& it) { using ceph::decode; bufferlist header_bl; decode(header_bl, it); - bufferlist::iterator header_it = header_bl.begin(); + auto header_it = header_bl.cbegin(); uint64_t size; DECODE_START(1, header_it); decode(size, header_it); @@ -322,7 +322,7 @@ void BitVector<_b>::encode_data(bufferlist& bl, uint64_t byte_offset, } template -void BitVector<_b>::decode_data(bufferlist::iterator& it, uint64_t byte_offset) { +void BitVector<_b>::decode_data(bufferlist::const_iterator& it, uint64_t byte_offset) { assert(byte_offset % BLOCK_SIZE == 0); if (it.end()) { return; @@ -396,14 +396,14 @@ void BitVector<_b>::encode_footer(bufferlist& bl) const { } template -void BitVector<_b>::decode_footer(bufferlist::iterator& it) { +void BitVector<_b>::decode_footer(bufferlist::const_iterator& it) { using ceph::decode; bufferlist footer_bl; decode(footer_bl, it); m_crc_enabled = (footer_bl.length() > 0); if (m_crc_enabled) { - bufferlist::iterator footer_it = footer_bl.begin(); + auto footer_it = footer_bl.cbegin(); __u32 header_crc; decode(header_crc, footer_it); @@ -432,7 +432,7 @@ void BitVector<_b>::encode(bufferlist& bl) const { } template -void BitVector<_b>::decode(bufferlist::iterator& it) { +void BitVector<_b>::decode(bufferlist::const_iterator& it) { decode_header(it); bufferlist data_bl; @@ -442,7 +442,7 @@ void BitVector<_b>::decode(bufferlist::iterator& it) { decode_footer(it); - bufferlist::iterator data_it = data_bl.begin(); + auto data_it = data_bl.cbegin(); decode_data(data_it, 0); } diff --git a/src/common/bloom_filter.cc b/src/common/bloom_filter.cc index d3484610d5c3..9c149361a565 100644 --- a/src/common/bloom_filter.cc +++ b/src/common/bloom_filter.cc @@ -17,7 +17,7 @@ void bloom_filter::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void bloom_filter::decode(bufferlist::iterator& p) +void bloom_filter::decode(bufferlist::const_iterator& p) { DECODE_START(2, p); uint64_t v; @@ -94,7 +94,7 @@ void compressible_bloom_filter::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void compressible_bloom_filter::decode(bufferlist::iterator& p) +void compressible_bloom_filter::decode(bufferlist::const_iterator& p) { DECODE_START(2, p); bloom_filter::decode(p); diff --git a/src/common/bloom_filter.hpp b/src/common/bloom_filter.hpp index a76109fc6bda..8b9e9a3b6f45 100644 --- a/src/common/bloom_filter.hpp +++ b/src/common/bloom_filter.hpp @@ -520,7 +520,7 @@ protected: public: void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(std::list& ls); }; @@ -617,7 +617,7 @@ private: std::vector size_list; public: void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(std::list& ls); }; diff --git a/src/common/ceph_json.h b/src/common/ceph_json.h index 076020bf71e4..d021f888b91b 100644 --- a/src/common/ceph_json.h +++ b/src/common/ceph_json.h @@ -504,7 +504,7 @@ struct JSONFormattable { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); uint8_t t; decode(t, bl); diff --git a/src/common/entity_name.h b/src/common/entity_name.h index 05f99145b484..be194ed7bdc1 100644 --- a/src/common/entity_name.h +++ b/src/common/entity_name.h @@ -31,7 +31,7 @@ struct EntityName encode(type, bl); encode(id, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; uint32_t type_; std::string id_; diff --git a/src/common/fs_types.cc b/src/common/fs_types.cc index 2a19ab85b1f9..b62d6b0c45a4 100644 --- a/src/common/fs_types.cc +++ b/src/common/fs_types.cc @@ -88,7 +88,7 @@ void file_layout_t::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void file_layout_t::decode(bufferlist::iterator& p) +void file_layout_t::decode(bufferlist::const_iterator& p) { using ceph::decode; if (*p == 0) { diff --git a/src/common/histogram.cc b/src/common/histogram.cc index 4959c4d58154..b8a71b67e1a3 100644 --- a/src/common/histogram.cc +++ b/src/common/histogram.cc @@ -32,7 +32,7 @@ void pow2_hist_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void pow2_hist_t::decode(bufferlist::iterator& p) +void pow2_hist_t::decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(h, p); diff --git a/src/common/histogram.h b/src/common/histogram.h index 5be69663714c..139450b74a1e 100644 --- a/src/common/histogram.h +++ b/src/common/histogram.h @@ -120,7 +120,7 @@ public: void dump(Formatter *f) const; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); static void generate_test_instances(std::list& o); }; WRITE_CLASS_ENCODER(pow2_hist_t) diff --git a/src/common/hobject.cc b/src/common/hobject.cc index 6a4cebf520a7..0474cc20a46a 100644 --- a/src/common/hobject.cc +++ b/src/common/hobject.cc @@ -115,7 +115,7 @@ void hobject_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void hobject_t::decode(bufferlist::iterator& bl) +void hobject_t::decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(4, 3, 3, bl); if (struct_v >= 1) @@ -417,7 +417,7 @@ size_t ghobject_t::encoded_size() const return r; } -void ghobject_t::decode(bufferlist::iterator& bl) +void ghobject_t::decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(6, 3, 3, bl); if (struct_v >= 1) diff --git a/src/common/hobject.h b/src/common/hobject.h index 9b3f38f44946..03abd4bd5517 100644 --- a/src/common/hobject.h +++ b/src/common/hobject.h @@ -274,7 +274,7 @@ public: bool parse(const string& s); void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void decode(json_spirit::Value& v); void dump(Formatter *f) const; static void generate_test_instances(list& o); @@ -446,7 +446,7 @@ public: } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void decode(json_spirit::Value& v); size_t encoded_size() const; void dump(Formatter *f) const; diff --git a/src/common/obj_bencher.cc b/src/common/obj_bencher.cc index bf817e439e08..09d6b806e8fc 100644 --- a/src/common/obj_bencher.cc +++ b/src/common/obj_bencher.cc @@ -348,7 +348,7 @@ int ObjBencher::fetch_bench_metadata(const std::string& metadata_file, } return r; } - bufferlist::iterator p = object_data.begin(); + auto p = object_data.cbegin(); decode(*object_size, p); decode(*num_objects, p); decode(*prevPid, p); diff --git a/src/common/scrub_types.cc b/src/common/scrub_types.cc index f86a8de75b4f..fa1f9a81049c 100644 --- a/src/common/scrub_types.cc +++ b/src/common/scrub_types.cc @@ -12,7 +12,7 @@ void object_id_wrapper::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void object_id_wrapper::decode(bufferlist::iterator& bp) +void object_id_wrapper::decode(bufferlist::const_iterator& bp) { DECODE_START(1, bp); decode(name, bp); @@ -37,7 +37,7 @@ void osd_shard_wrapper::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void osd_shard_wrapper::decode(bufferlist::iterator& bp) +void osd_shard_wrapper::decode(bufferlist::const_iterator& bp) { DECODE_START(1, bp); decode(osd, bp); @@ -87,7 +87,7 @@ void shard_info_wrapper::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void shard_info_wrapper::decode(bufferlist::iterator& bp) +void shard_info_wrapper::decode(bufferlist::const_iterator& bp) { DECODE_START(3, bp); decode(errors, bp); @@ -159,7 +159,7 @@ void inconsistent_obj_wrapper::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void inconsistent_obj_wrapper::decode(bufferlist::iterator& bp) +void inconsistent_obj_wrapper::decode(bufferlist::const_iterator& bp) { DECODE_START(2, bp); DECODE_OLDEST(2); @@ -238,7 +238,7 @@ void inconsistent_snapset_wrapper::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void inconsistent_snapset_wrapper::decode(bufferlist::iterator& bp) +void inconsistent_snapset_wrapper::decode(bufferlist::const_iterator& bp) { DECODE_START(2, bp); decode(errors, bp); @@ -263,7 +263,7 @@ void scrub_ls_arg_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void scrub_ls_arg_t::decode(bufferlist::iterator& bp) +void scrub_ls_arg_t::decode(bufferlist::const_iterator& bp) { DECODE_START(1, bp); decode(interval, bp); @@ -283,7 +283,7 @@ void scrub_ls_result_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void scrub_ls_result_t::decode(bufferlist::iterator& bp) +void scrub_ls_result_t::decode(bufferlist::const_iterator& bp) { DECODE_START(1, bp); decode(interval, bp); diff --git a/src/common/scrub_types.h b/src/common/scrub_types.h index 494bba324a96..173e020f3efb 100644 --- a/src/common/scrub_types.h +++ b/src/common/scrub_types.h @@ -13,26 +13,26 @@ struct object_id_wrapper : public librados::object_id_t { : object_id_t{hoid.oid.name, hoid.nspace, hoid.get_key(), hoid.snap} {} void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); }; WRITE_CLASS_ENCODER(object_id_wrapper) namespace librados { -inline void decode(object_id_t& obj, bufferlist::iterator& bp) { +inline void decode(object_id_t& obj, bufferlist::const_iterator& bp) { reinterpret_cast(obj).decode(bp); } } struct osd_shard_wrapper : public librados::osd_shard_t { void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bp); + void decode(bufferlist::const_iterator& bp); }; WRITE_CLASS_ENCODER(osd_shard_wrapper) namespace librados { - inline void decode(librados::osd_shard_t& shard, bufferlist::iterator& bp) { + inline void decode(librados::osd_shard_t& shard, bufferlist::const_iterator& bp) { reinterpret_cast(shard).decode(bp); } } @@ -90,14 +90,14 @@ public: errors |= err_t::HINFO_CORRUPTED; } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bp); + void decode(bufferlist::const_iterator& bp); }; WRITE_CLASS_ENCODER(shard_info_wrapper) namespace librados { inline void decode(librados::shard_info_t& shard, - bufferlist::iterator& bp) { + bufferlist::const_iterator& bp) { reinterpret_cast(shard).decode(bp); } } @@ -137,13 +137,13 @@ struct inconsistent_obj_wrapper : librados::inconsistent_obj_t { const pg_shard_t &primary); void set_version(uint64_t ver) { version = ver; } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bp); + void decode(bufferlist::const_iterator& bp); }; WRITE_CLASS_ENCODER(inconsistent_obj_wrapper) inline void decode(librados::inconsistent_obj_t& obj, - bufferlist::iterator& bp) { + bufferlist::const_iterator& bp) { reinterpret_cast(obj).decode(bp); } @@ -166,14 +166,14 @@ struct inconsistent_snapset_wrapper : public librados::inconsistent_snapset_t { void set_size_mismatch(); void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bp); + void decode(bufferlist::const_iterator& bp); }; WRITE_CLASS_ENCODER(inconsistent_snapset_wrapper) namespace librados { inline void decode(librados::inconsistent_snapset_t& snapset, - bufferlist::iterator& bp) { + bufferlist::const_iterator& bp) { reinterpret_cast(snapset).decode(bp); } } @@ -184,7 +184,7 @@ struct scrub_ls_arg_t { librados::object_id_t start_after; uint64_t max_return; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); }; WRITE_CLASS_ENCODER(scrub_ls_arg_t); @@ -193,7 +193,7 @@ struct scrub_ls_result_t { epoch_t interval; std::vector vals; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); }; WRITE_CLASS_ENCODER(scrub_ls_result_t); diff --git a/src/common/snap_types.cc b/src/common/snap_types.cc index 239376339616..3e33583db16f 100644 --- a/src/common/snap_types.cc +++ b/src/common/snap_types.cc @@ -12,7 +12,7 @@ void SnapRealmInfo::encode(bufferlist& bl) const encode_nohead(prior_parent_snaps, bl); } -void SnapRealmInfo::decode(bufferlist::iterator& bl) +void SnapRealmInfo::decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(h, bl); diff --git a/src/common/snap_types.h b/src/common/snap_types.h index 1bbb023103ea..bf7941fb1cf9 100644 --- a/src/common/snap_types.h +++ b/src/common/snap_types.h @@ -31,7 +31,7 @@ struct SnapRealmInfo { snapid_t created() const { return snapid_t(h.created); } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -58,7 +58,7 @@ struct SnapContext { encode(seq, bl); encode(snaps, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(seq, bl); decode(snaps, bl); diff --git a/src/common/sstring.hh b/src/common/sstring.hh index 3783cc1efac6..fe5409ecb009 100644 --- a/src/common/sstring.hh +++ b/src/common/sstring.hh @@ -666,7 +666,7 @@ public: } static void decode_nohead(size_t len, value_type& s, - buffer::ptr::iterator& p) + buffer::ptr::const_iterator& p) { s.reset(); if (len) { @@ -686,7 +686,7 @@ public: } static void decode(value_type& s, - buffer::ptr::iterator& p, + buffer::ptr::const_iterator& p, uint64_t f=0) { Size len; diff --git a/src/common/zipkin_trace.h b/src/common/zipkin_trace.h index 4ec615c2bf3a..46e44d3aac22 100644 --- a/src/common/zipkin_trace.h +++ b/src/common/zipkin_trace.h @@ -79,7 +79,7 @@ static inline void encode(const blkin_trace_info& b, bufferlist& bl) encode(b.parent_span_id, bl); } -static inline void decode(blkin_trace_info& b, bufferlist::iterator& p) +static inline void decode(blkin_trace_info& b, bufferlist::const_iterator& p) { decode(b.trace_id, p); decode(b.span_id, p); diff --git a/src/compressor/Compressor.h b/src/compressor/Compressor.h index 85899b8c9f9a..d09c916f377f 100644 --- a/src/compressor/Compressor.h +++ b/src/compressor/Compressor.h @@ -92,7 +92,7 @@ public: virtual int decompress(const ceph::bufferlist &in, ceph::bufferlist &out) = 0; // this is a bit weird but we need non-const iterator to be in // alignment with decode methods - virtual int decompress(ceph::bufferlist::iterator &p, size_t compressed_len, ceph::bufferlist &out) = 0; + virtual int decompress(ceph::bufferlist::const_iterator &p, size_t compressed_len, ceph::bufferlist &out) = 0; static CompressorRef create(CephContext *cct, const std::string &type); static CompressorRef create(CephContext *cct, int alg); diff --git a/src/compressor/brotli/BrotliCompressor.cc b/src/compressor/brotli/BrotliCompressor.cc index b9c1d1d52674..4c473cda427f 100644 --- a/src/compressor/brotli/BrotliCompressor.cc +++ b/src/compressor/brotli/BrotliCompressor.cc @@ -47,7 +47,7 @@ int BrotliCompressor::compress(const bufferlist &in, bufferlist &out) return 0; } -int BrotliCompressor::decompress(bufferlist::iterator &p, +int BrotliCompressor::decompress(bufferlist::const_iterator &p, size_t compressed_size, bufferlist &out) { diff --git a/src/compressor/brotli/BrotliCompressor.h b/src/compressor/brotli/BrotliCompressor.h index fcc4a809c851..482fe5e20eb8 100644 --- a/src/compressor/brotli/BrotliCompressor.h +++ b/src/compressor/brotli/BrotliCompressor.h @@ -24,7 +24,7 @@ class BrotliCompressor : public Compressor int compress(const bufferlist &in, bufferlist &out) override; int decompress(const bufferlist &in, bufferlist &out) override; - int decompress(bufferlist::iterator &p, size_t compressed_len, bufferlist &out) override; + int decompress(bufferlist::const_iterator &p, size_t compressed_len, bufferlist &out) override; }; #endif //CEPH_BROTLICOMPRESSOR_H diff --git a/src/compressor/lz4/LZ4Compressor.h b/src/compressor/lz4/LZ4Compressor.h index 5441c7cbf242..5ad5d31b7629 100644 --- a/src/compressor/lz4/LZ4Compressor.h +++ b/src/compressor/lz4/LZ4Compressor.h @@ -76,11 +76,11 @@ class LZ4Compressor : public Compressor { if (qat_enabled) return qat_accel.decompress(src, dst); #endif - bufferlist::iterator i = const_cast(src).begin(); + auto i = std::cbegin(src); return decompress(i, src.length(), dst); } - int decompress(bufferlist::iterator &p, + int decompress(bufferlist::const_iterator &p, size_t compressed_len, bufferlist &dst) override { #ifdef HAVE_QATZIP diff --git a/src/compressor/snappy/SnappyCompressor.h b/src/compressor/snappy/SnappyCompressor.h index 7c3d46a1481f..9a85cdc98f0c 100644 --- a/src/compressor/snappy/SnappyCompressor.h +++ b/src/compressor/snappy/SnappyCompressor.h @@ -22,11 +22,11 @@ #include "include/buffer.h" class CEPH_BUFFER_API BufferlistSource : public snappy::Source { - bufferlist::iterator pb; + bufferlist::const_iterator pb; size_t remaining; public: - explicit BufferlistSource(bufferlist::iterator _pb, size_t _input_len) + explicit BufferlistSource(bufferlist::const_iterator _pb, size_t _input_len) : pb(_pb), remaining(_input_len) { remaining = std::min(remaining, (size_t)pb.get_remaining()); @@ -50,7 +50,7 @@ class CEPH_BUFFER_API BufferlistSource : public snappy::Source { remaining -= n; } - bufferlist::iterator get_pos() const { + bufferlist::const_iterator get_pos() const { return pb; } }; @@ -85,11 +85,11 @@ class SnappyCompressor : public Compressor { if (qat_enabled) return qat_accel.decompress(src, dst); #endif - bufferlist::iterator i = const_cast(src).begin(); + auto i = src.begin(); return decompress(i, src.length(), dst); } - int decompress(bufferlist::iterator &p, + int decompress(bufferlist::const_iterator &p, size_t compressed_len, bufferlist &dst) override { #ifdef HAVE_QATZIP diff --git a/src/compressor/zlib/ZlibCompressor.cc b/src/compressor/zlib/ZlibCompressor.cc index e3553240f2ac..7d5239804862 100644 --- a/src/compressor/zlib/ZlibCompressor.cc +++ b/src/compressor/zlib/ZlibCompressor.cc @@ -177,7 +177,7 @@ int ZlibCompressor::compress(const bufferlist &in, bufferlist &out) #endif } -int ZlibCompressor::decompress(bufferlist::iterator &p, size_t compressed_size, bufferlist &out) +int ZlibCompressor::decompress(bufferlist::const_iterator &p, size_t compressed_size, bufferlist &out) { #ifdef HAVE_QATZIP if (qat_enabled) @@ -241,6 +241,6 @@ int ZlibCompressor::decompress(const bufferlist &in, bufferlist &out) if (qat_enabled) return qat_accel.decompress(in, out); #endif - bufferlist::iterator i = const_cast(in).begin(); + auto i = std::cbegin(in); return decompress(i, in.length(), out); } diff --git a/src/compressor/zlib/ZlibCompressor.h b/src/compressor/zlib/ZlibCompressor.h index f1e614d5f045..d770547a9465 100644 --- a/src/compressor/zlib/ZlibCompressor.h +++ b/src/compressor/zlib/ZlibCompressor.h @@ -36,7 +36,7 @@ public: int compress(const bufferlist &in, bufferlist &out) override; int decompress(const bufferlist &in, bufferlist &out) override; - int decompress(bufferlist::iterator &p, size_t compressed_len, bufferlist &out) override; + int decompress(bufferlist::const_iterator &p, size_t compressed_len, bufferlist &out) override; private: int zlib_compress(const bufferlist &in, bufferlist &out); int isal_compress(const bufferlist &in, bufferlist &out); diff --git a/src/compressor/zstd/ZstdCompressor.h b/src/compressor/zstd/ZstdCompressor.h index 82bb2f9d52f9..e98d14676046 100644 --- a/src/compressor/zstd/ZstdCompressor.h +++ b/src/compressor/zstd/ZstdCompressor.h @@ -64,11 +64,11 @@ class ZstdCompressor : public Compressor { } int decompress(const bufferlist &src, bufferlist &dst) override { - bufferlist::iterator i = const_cast(src).begin(); + auto i = std::cbegin(src); return decompress(i, src.length(), dst); } - int decompress(bufferlist::iterator &p, + int decompress(bufferlist::const_iterator &p, size_t compressed_len, bufferlist &dst) override { if (compressed_len < 4) { diff --git a/src/crush/CrushWrapper.cc b/src/crush/CrushWrapper.cc index 3b8199fe030a..1c7715338462 100644 --- a/src/crush/CrushWrapper.cc +++ b/src/crush/CrushWrapper.cc @@ -2406,7 +2406,7 @@ void CrushWrapper::encode(bufferlist& bl, uint64_t features) const } } -static void decode_32_or_64_string_map(map& m, bufferlist::iterator& blp) +static void decode_32_or_64_string_map(map& m, bufferlist::const_iterator& blp) { m.clear(); __u32 n; @@ -2425,7 +2425,7 @@ static void decode_32_or_64_string_map(map& m, bufferlist::itera } } -void CrushWrapper::decode(bufferlist::iterator& blp) +void CrushWrapper::decode(bufferlist::const_iterator& blp) { using ceph::decode; create(); @@ -2553,7 +2553,7 @@ void CrushWrapper::decode(bufferlist::iterator& blp) } } -void CrushWrapper::decode_crush_bucket(crush_bucket** bptr, bufferlist::iterator &blp) +void CrushWrapper::decode_crush_bucket(crush_bucket** bptr, bufferlist::const_iterator &blp) { using ceph::decode; __u32 alg; diff --git a/src/crush/CrushWrapper.h b/src/crush/CrushWrapper.h index 99f50980353c..4eef60e8a15e 100644 --- a/src/crush/CrushWrapper.h +++ b/src/crush/CrushWrapper.h @@ -46,7 +46,7 @@ inline void encode(const crush_rule_step &s, bufferlist &bl) encode(s.arg1, bl); encode(s.arg2, bl); } -inline void decode(crush_rule_step &s, bufferlist::iterator &p) +inline void decode(crush_rule_step &s, bufferlist::const_iterator &p) { using ceph::decode; decode(s.op, p); @@ -1563,8 +1563,8 @@ public: } void encode(bufferlist &bl, uint64_t features) const; - void decode(bufferlist::iterator &blp); - void decode_crush_bucket(crush_bucket** bptr, bufferlist::iterator &blp); + void decode(bufferlist::const_iterator &blp); + void decode_crush_bucket(crush_bucket** bptr, bufferlist::const_iterator &blp); void dump(Formatter *f) const; void dump_rules(Formatter *f) const; void dump_rule(int ruleset, Formatter *f) const; diff --git a/src/include/CompatSet.h b/src/include/CompatSet.h index b623447b9155..47f86a4e722f 100644 --- a/src/include/CompatSet.h +++ b/src/include/CompatSet.h @@ -85,7 +85,7 @@ struct CompatSet { encode(names, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(mask, bl); decode(names, bl); @@ -228,7 +228,7 @@ struct CompatSet { incompat.encode(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { compat.decode(bl); ro_compat.decode(bl); incompat.decode(bl); diff --git a/src/include/btree_map.h b/src/include/btree_map.h index 508aa3914e7e..28949849a89e 100644 --- a/src/include/btree_map.h +++ b/src/include/btree_map.h @@ -30,7 +30,7 @@ inline void encode(const btree::btree_map& m, bufferlist& bl, uint64_t feat } } template -inline void decode(btree::btree_map& m, bufferlist::iterator& p) +inline void decode(btree::btree_map& m, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -50,7 +50,7 @@ inline void encode_nohead(const btree::btree_map& m, bufferlist& bl) } } template -inline void decode_nohead(int n, btree::btree_map& m, bufferlist::iterator& p) +inline void decode_nohead(int n, btree::btree_map& m, bufferlist::const_iterator& p) { m.clear(); while (n--) { diff --git a/src/include/compact_map.h b/src/include/compact_map.h index 9ccf97c1139e..39a9ab4f40c7 100644 --- a/src/include/compact_map.h +++ b/src/include/compact_map.h @@ -311,7 +311,7 @@ public: else encode((uint32_t)0, bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { using ceph::decode; using ceph::decode_nohead; uint32_t n; @@ -334,7 +334,7 @@ inline void encode(const compact_map_base& m, bufferlist& bl, m.encode(bl, features); } template -inline void decode(compact_map_base& m, bufferlist::iterator& p) { +inline void decode(compact_map_base& m, bufferlist::const_iterator& p) { m.decode(p); } diff --git a/src/include/compact_set.h b/src/include/compact_set.h index e41ca95ed814..10510a8e3435 100644 --- a/src/include/compact_set.h +++ b/src/include/compact_set.h @@ -265,7 +265,7 @@ public: else encode((uint32_t)0, bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { using ceph::decode; uint32_t n; decode(n, p); @@ -282,7 +282,7 @@ inline void encode(const compact_set_base& m, bufferlist& bl) { m.encode(bl); } template -inline void decode(compact_set_base& m, bufferlist::iterator& p) { +inline void decode(compact_set_base& m, bufferlist::const_iterator& p) { m.decode(p); } diff --git a/src/include/encoding.h b/src/include/encoding.h index 45c8f66efeea..85ae2fe823af 100644 --- a/src/include/encoding.h +++ b/src/include/encoding.h @@ -74,14 +74,14 @@ inline void encode_raw(const T& t, bufferlist& bl) bl.append((char*)&t, sizeof(t)); } template -inline void decode_raw(T& t, bufferlist::iterator &p) +inline void decode_raw(T& t, bufferlist::const_iterator &p) { p.copy(sizeof(t), (char*)&t); } #define WRITE_RAW_ENCODER(type) \ inline void encode(const type &v, ::ceph::bufferlist& bl, uint64_t features=0) { ::ceph::encode_raw(v, bl); } \ - inline void decode(type &v, ::ceph::bufferlist::iterator& p) { __ASSERT_FUNCTION ::ceph::decode_raw(v, p); } + inline void decode(type &v, ::ceph::bufferlist::const_iterator& p) { __ASSERT_FUNCTION ::ceph::decode_raw(v, p); } WRITE_RAW_ENCODER(__u8) #ifndef _CHAR_IS_SIGNED @@ -100,7 +100,7 @@ inline void encode(const bool &v, bufferlist& bl) { __u8 vv = v; encode_raw(vv, bl); } -inline void decode(bool &v, bufferlist::iterator& p) { +inline void decode(bool &v, bufferlist::const_iterator& p) { __u8 vv; decode_raw(vv, p); v = vv; @@ -116,7 +116,7 @@ inline void decode(bool &v, bufferlist::iterator& p) { e = v; \ ::ceph::encode_raw(e, bl); \ } \ - inline void decode(type &v, ::ceph::bufferlist::iterator& p) { \ + inline void decode(type &v, ::ceph::bufferlist::const_iterator& p) { \ ceph_##etype e; \ ::ceph::decode_raw(e, p); \ v = e; \ @@ -161,22 +161,22 @@ WRITE_INTTYPE_ENCODER(int16_t, le16) #define WRITE_CLASS_ENCODER(cl) \ inline void encode(const cl &c, ::ceph::bufferlist &bl, uint64_t features=0) { \ ENCODE_DUMP_PRE(); c.encode(bl); ENCODE_DUMP_POST(cl); } \ - inline void decode(cl &c, ::ceph::bufferlist::iterator &p) { c.decode(p); } + inline void decode(cl &c, ::ceph::bufferlist::const_iterator &p) { c.decode(p); } #define WRITE_CLASS_MEMBER_ENCODER(cl) \ inline void encode(const cl &c, ::ceph::bufferlist &bl) const { \ ENCODE_DUMP_PRE(); c.encode(bl); ENCODE_DUMP_POST(cl); } \ - inline void decode(cl &c, ::ceph::bufferlist::iterator &p) { c.decode(p); } + inline void decode(cl &c, ::ceph::bufferlist::const_iterator &p) { c.decode(p); } #define WRITE_CLASS_ENCODER_FEATURES(cl) \ inline void encode(const cl &c, ::ceph::bufferlist &bl, uint64_t features) { \ ENCODE_DUMP_PRE(); c.encode(bl, features); ENCODE_DUMP_POST(cl); } \ - inline void decode(cl &c, ::ceph::bufferlist::iterator &p) { c.decode(p); } + inline void decode(cl &c, ::ceph::bufferlist::const_iterator &p) { c.decode(p); } #define WRITE_CLASS_ENCODER_OPTIONAL_FEATURES(cl) \ inline void encode(const cl &c, ::ceph::bufferlist &bl, uint64_t features = 0) { \ ENCODE_DUMP_PRE(); c.encode(bl, features); ENCODE_DUMP_POST(cl); } \ - inline void decode(cl &c, ::ceph::bufferlist::iterator &p) { c.decode(p); } + inline void decode(cl &c, ::ceph::bufferlist::const_iterator &p) { c.decode(p); } // string @@ -191,7 +191,7 @@ inline void encode(const std::string& s, bufferlist& bl, uint64_t features=0) { return encode(std::string_view(s), bl, features); } -inline void decode(std::string& s, bufferlist::iterator& p) +inline void decode(std::string& s, bufferlist::const_iterator& p) { __u32 len; decode(len, p); @@ -207,7 +207,7 @@ inline void encode_nohead(const std::string& s, bufferlist& bl) { encode_nohead(std::string_view(s), bl); } -inline void decode_nohead(int len, std::string& s, bufferlist::iterator& p) +inline void decode_nohead(int len, std::string& s, bufferlist::const_iterator& p) { s.clear(); p.copy(len, s); @@ -231,7 +231,7 @@ inline void encode(const buffer::ptr& bp, bufferlist& bl) if (len) bl.append(bp); } -inline void decode(buffer::ptr& bp, bufferlist::iterator& p) +inline void decode(buffer::ptr& bp, bufferlist::const_iterator& p) { __u32 len; decode(len, p); @@ -260,7 +260,7 @@ inline void encode_destructively(bufferlist& s, bufferlist& bl) encode(len, bl); bl.claim_append(s); } -inline void decode(bufferlist& s, bufferlist::iterator& p) +inline void decode(bufferlist& s, bufferlist::const_iterator& p) { __u32 len; decode(len, p); @@ -272,7 +272,7 @@ inline void encode_nohead(const bufferlist& s, bufferlist& bl) { bl.append(s); } -inline void decode_nohead(int len, bufferlist& s, bufferlist::iterator& p) +inline void decode_nohead(int len, bufferlist& s, bufferlist::const_iterator& p) { s.clear(); p.copy(len, s); @@ -295,7 +295,7 @@ void encode(const std::chrono::time_point& t, template>* = nullptr> void decode(std::chrono::time_point& t, - bufferlist::iterator& p) { + bufferlist::const_iterator& p) { uint32_t s; uint32_t ns; decode(s, p); @@ -321,7 +321,7 @@ void encode(const std::chrono::duration& d, template>* = nullptr> void decode(std::chrono::duration& d, - bufferlist::iterator& p) { + bufferlist::const_iterator& p) { uint32_t s; uint32_t ns; decode(s, p); @@ -335,11 +335,11 @@ void decode(std::chrono::duration& d, template inline void encode(const boost::optional &p, bufferlist &bl); template -inline void decode(boost::optional &p, bufferlist::iterator &bp); +inline void decode(boost::optional &p, bufferlist::const_iterator &bp); template inline void encode(const boost::tuple &t, bufferlist& bl); template -inline void decode(boost::tuple &t, bufferlist::iterator &bp); +inline void decode(boost::tuple &t, bufferlist::const_iterator &bp); template, typename b_traits=denc_traits> inline std::enable_if_t @@ -353,7 +353,7 @@ template, typename b_traits=denc_traits> inline std::enable_if_t -decode(std::pair &pa, bufferlist::iterator &p); +decode(std::pair &pa, bufferlist::const_iterator &p); template> inline std::enable_if_t encode(const std::list& ls, bufferlist& bl); @@ -362,7 +362,7 @@ inline std::enable_if_t encode(const std::list& ls, bufferlist& bl, uint64_t features); template> inline std::enable_if_t -decode(std::list& ls, bufferlist::iterator& p); +decode(std::list& ls, bufferlist::const_iterator& p); template inline void encode(const std::list, Alloc>& ls, bufferlist& bl); @@ -371,13 +371,13 @@ inline void encode(const std::list, Alloc>& ls, bufferlist& bl, uint64_t features); template inline void decode(std::list, Alloc>& ls, - bufferlist::iterator& p); + bufferlist::const_iterator& p); template> inline std::enable_if_t encode(const std::set& s, bufferlist& bl); template> inline std::enable_if_t -decode(std::set& s, bufferlist::iterator& p); +decode(std::set& s, bufferlist::const_iterator& p); template> inline std::enable_if_t encode_nohead(const std::set& s, bufferlist& bl); @@ -389,7 +389,7 @@ inline std::enable_if_t encode(const boost::container::flat_set& s, bufferlist& bl); template> inline std::enable_if_t -decode(boost::container::flat_set& s, bufferlist::iterator& p); +decode(boost::container::flat_set& s, bufferlist::const_iterator& p); template> inline std::enable_if_t encode_nohead(const boost::container::flat_set& s, @@ -401,7 +401,7 @@ decode_nohead(int len, boost::container::flat_set& s, template inline void encode(const std::multiset& s, bufferlist& bl); template -inline void decode(std::multiset& s, bufferlist::iterator& p); +inline void decode(std::multiset& s, bufferlist::const_iterator& p); template> inline std::enable_if_t encode(const std::vector& v, bufferlist& bl, uint64_t features); @@ -410,13 +410,13 @@ inline std::enable_if_t encode(const std::vector& v, bufferlist& bl); template> inline std::enable_if_t -decode(std::vector& v, bufferlist::iterator& p); +decode(std::vector& v, bufferlist::const_iterator& p); template> inline std::enable_if_t encode_nohead(const std::vector& v, bufferlist& bl); template> inline std::enable_if_t -decode_nohead(int len, std::vector& v, bufferlist::iterator& p); +decode_nohead(int len, std::vector& v, bufferlist::const_iterator& p); template inline void encode(const std::vector,Alloc>& v, bufferlist& bl, @@ -426,7 +426,7 @@ inline void encode(const std::vector,Alloc>& v, bufferlist& bl); template inline void decode(std::vector,Alloc>& v, - bufferlist::iterator& p); + bufferlist::const_iterator& p); template, typename u_traits=denc_traits> inline std::enable_if_t& m, bufferlist& bl, uint64_t features); template, typename u_traits=denc_traits> inline std::enable_if_t -decode(std::map& m, bufferlist::iterator& p); +decode(std::map& m, bufferlist::const_iterator& p); template -inline void decode_noclear(std::map& m, bufferlist::iterator& p); +inline void decode_noclear(std::map& m, bufferlist::const_iterator& p); template, typename u_traits=denc_traits> inline std::enable_if_t @@ -453,7 +453,7 @@ encode_nohead(const std::map& m, bufferlist& bl, uint64_t featur template, typename u_traits=denc_traits> inline std::enable_if_t -decode_nohead(int n, std::map& m, bufferlist::iterator& p); +decode_nohead(int n, std::map& m, bufferlist::const_iterator& p); template, typename u_traits=denc_traits> inline std::enable_if_t @@ -466,10 +466,10 @@ encode(const boost::container::flat_map& m, bufferlist& bl, template, typename u_traits=denc_traits> inline std::enable_if_t -decode(boost::container::flat_map& m, bufferlist::iterator& p); +decode(boost::container::flat_map& m, bufferlist::const_iterator& p); template inline void decode_noclear(boost::container::flat_map& m, - bufferlist::iterator& p); + bufferlist::const_iterator& p); template, typename u_traits=denc_traits> inline std::enable_if_t @@ -484,28 +484,28 @@ template, typename u_traits=denc_traits> inline std::enable_if_t decode_nohead(int n, boost::container::flat_map& m, - bufferlist::iterator& p); + bufferlist::const_iterator& p); template inline void encode(const std::multimap& m, bufferlist& bl); template -inline void decode(std::multimap& m, bufferlist::iterator& p); +inline void decode(std::multimap& m, bufferlist::const_iterator& p); template inline void encode(const unordered_map& m, bufferlist& bl, uint64_t features); template inline void encode(const unordered_map& m, bufferlist& bl); template -inline void decode(unordered_map& m, bufferlist::iterator& p); +inline void decode(unordered_map& m, bufferlist::const_iterator& p); template inline void encode(const ceph::unordered_set& m, bufferlist& bl); template -inline void decode(ceph::unordered_set& m, bufferlist::iterator& p); +inline void decode(ceph::unordered_set& m, bufferlist::const_iterator& p); template inline void encode(const std::deque& ls, bufferlist& bl, uint64_t features); template inline void encode(const std::deque& ls, bufferlist& bl); template -inline void decode(std::deque& ls, bufferlist::iterator& p); +inline void decode(std::deque& ls, bufferlist::const_iterator& p); template> inline std::enable_if_t encode(const std::array& v, bufferlist& bl, uint64_t features); @@ -514,13 +514,13 @@ inline std::enable_if_t encode(const std::array& v, bufferlist& bl); template> inline std::enable_if_t -decode(std::array& v, bufferlist::iterator& p); +decode(std::array& v, bufferlist::const_iterator& p); // full bl decoder template -inline void decode(T &o, bufferlist& bl) +inline void decode(T &o, const bufferlist& bl) { - bufferlist::iterator p = bl.begin(); + auto p = bl.begin(); decode(o, p); assert(p.end()); } @@ -539,7 +539,7 @@ inline void encode(const boost::optional &p, bufferlist &bl) #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wuninitialized" template -inline void decode(boost::optional &p, bufferlist::iterator &bp) +inline void decode(boost::optional &p, bufferlist::const_iterator &bp) { __u8 present; decode(present, bp); @@ -562,7 +562,7 @@ inline void encode(const std::tuple &t, bufferlist& bl) }); } template -inline void decode(std::tuple &t, bufferlist::iterator &bp) +inline void decode(std::tuple &t, bufferlist::const_iterator &bp) { ceph::for_each(t, [&bp](auto& e) { decode(e, bp); @@ -578,7 +578,7 @@ inline void encode(const boost::tuple &t, bufferlist& bl) encode(boost::get<2>(t), bl); } template -inline void decode(boost::tuple &t, bufferlist::iterator &bp) +inline void decode(boost::tuple &t, bufferlist::const_iterator &bp) { decode(boost::get<0>(t), bp); decode(boost::get<1>(t), bp); @@ -606,7 +606,7 @@ inline std::enable_if_t inline std::enable_if_t - decode(std::pair &pa, bufferlist::iterator &p) + decode(std::pair &pa, bufferlist::const_iterator &p) { decode(pa.first, p); decode(pa.second, p); @@ -647,7 +647,7 @@ inline std::enable_if_t } template inline std::enable_if_t - decode(std::list& ls, bufferlist::iterator& p) + decode(std::list& ls, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -680,7 +680,7 @@ inline void encode(const std::list, Alloc>& ls, } template inline void decode(std::list, Alloc>& ls, - bufferlist::iterator& p) + bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -704,7 +704,7 @@ inline std::enable_if_t } template inline std::enable_if_t - decode(std::set& s, bufferlist::iterator& p) + decode(std::set& s, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -725,7 +725,7 @@ inline typename std::enable_if::type } template inline std::enable_if_t - decode_nohead(int len, std::set& s, bufferlist::iterator& p) + decode_nohead(int len, std::set& s, bufferlist::const_iterator& p) { for (int i=0; i& s, bufferlist& bl) } template inline std::enable_if_t -decode(boost::container::flat_set& s, bufferlist::iterator& p) +decode(boost::container::flat_set& s, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -790,7 +790,7 @@ inline void encode(const std::multiset& s, bufferlist& bl) encode(*p, bl); } template -inline void decode(std::multiset& s, bufferlist::iterator& p) +inline void decode(std::multiset& s, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -822,7 +822,7 @@ inline std::enable_if_t } template inline std::enable_if_t - decode(std::vector& v, bufferlist::iterator& p) + decode(std::vector& v, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -840,7 +840,7 @@ inline std::enable_if_t } template inline std::enable_if_t - decode_nohead(int len, std::vector& v, bufferlist::iterator& p) + decode_nohead(int len, std::vector& v, bufferlist::const_iterator& p) { v.resize(len); for (__u32 i=0; i,Alloc>& v, } template inline void decode(std::vector,Alloc>& v, - bufferlist::iterator& p) + bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -915,7 +915,7 @@ inline std::enable_if_t template inline std::enable_if_t - decode(std::map& m, bufferlist::iterator& p) + decode(std::map& m, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -927,7 +927,7 @@ inline std::enable_if_t } } template -inline void decode_noclear(std::map& m, bufferlist::iterator& p) +inline void decode_noclear(std::map& m, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -960,7 +960,7 @@ inline std::enable_if_t template inline std::enable_if_t - decode_nohead(int n, std::map& m, bufferlist::iterator& p) + decode_nohead(int n, std::map& m, bufferlist::const_iterator& p) { m.clear(); while (n--) { @@ -1000,7 +1000,7 @@ template inline std::enable_if_t - decode(boost::container::flat_map& m, bufferlist::iterator& p) + decode(boost::container::flat_map& m, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -1014,7 +1014,7 @@ template inline void decode_noclear(boost::container::flat_map& m, - bufferlist::iterator& p) + bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -1051,7 +1051,7 @@ template inline std::enable_if_t decode_nohead(int n, boost::container::flat_map& m, - bufferlist::iterator& p) + bufferlist::const_iterator& p) { m.clear(); while (n--) { @@ -1073,7 +1073,7 @@ inline void encode(const std::multimap& m, bufferlist& bl) } } template -inline void decode(std::multimap& m, bufferlist::iterator& p) +inline void decode(std::multimap& m, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -1109,7 +1109,7 @@ inline void encode(const unordered_map& m, bufferlist& bl) } } template -inline void decode(unordered_map& m, bufferlist::iterator& p) +inline void decode(unordered_map& m, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -1131,7 +1131,7 @@ inline void encode(const ceph::unordered_set& m, bufferlist& encode(*p, bl); } template -inline void decode(ceph::unordered_set& m, bufferlist::iterator& p) +inline void decode(ceph::unordered_set& m, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -1161,7 +1161,7 @@ inline void encode(const std::deque& ls, bufferlist& bl) encode(*p, bl); } template -inline void decode(std::deque& ls, bufferlist::iterator& p) +inline void decode(std::deque& ls, bufferlist::const_iterator& p) { __u32 n; decode(n, p); @@ -1190,7 +1190,7 @@ encode(const std::array& v, bufferlist& bl) } template inline std::enable_if_t -decode(std::array& v, bufferlist::iterator& p) +decode(std::array& v, bufferlist::const_iterator& p) { for (auto& e : v) decode(e, p); @@ -1376,11 +1376,11 @@ inline ssize_t decode_file(int fd, bufferptr &bp) bufferlist bl; __u32 len = 0; bl.read_fd(fd, sizeof(len)); - decode(len, bl); + decode(len, bl); bl.read_fd(fd, len); - bufferlist::iterator bli = bl.begin(); + auto bli = std::cbegin(bl); - decode(bp, bli); + decode(bp, bli); return bl.length(); } } diff --git a/src/include/filepath.h b/src/include/filepath.h index 096e40388eaf..09821b6ed371 100644 --- a/src/include/filepath.h +++ b/src/include/filepath.h @@ -199,7 +199,7 @@ class filepath { encode(ino, bl); encode(path, bl); } - void decode(bufferlist::iterator& blp) { + void decode(bufferlist::const_iterator& blp) { using ceph::decode; bits.clear(); __u8 struct_v; diff --git a/src/include/frag.h b/src/include/frag.h index 4ca46cd03f59..23062d6ac6cf 100644 --- a/src/include/frag.h +++ b/src/include/frag.h @@ -164,7 +164,7 @@ inline std::ostream& operator<<(std::ostream& out, const frag_t& hb) } inline void encode(const frag_t &f, bufferlist& bl) { encode_raw(f._enc, bl); } -inline void decode(frag_t &f, bufferlist::iterator& p) { +inline void decode(frag_t &f, bufferlist::const_iterator& p) { __u32 v; decode_raw(v, p); f._enc = v; @@ -460,7 +460,7 @@ public: using ceph::encode; encode(_splits, bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { using ceph::decode; decode(_splits, p); } @@ -473,7 +473,7 @@ public: encode(p->second, bl); } } - void decode_nohead(int n, bufferlist::iterator& p) { + void decode_nohead(int n, bufferlist::const_iterator& p) { using ceph::decode; _splits.clear(); while (n-- > 0) { diff --git a/src/include/fs_types.h b/src/include/fs_types.h index 0a958e3179fe..2132db9aac73 100644 --- a/src/include/fs_types.h +++ b/src/include/fs_types.h @@ -22,7 +22,7 @@ struct inodeno_t { using ceph::encode; encode(val, bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { using ceph::decode; decode(val, p); } @@ -41,7 +41,7 @@ struct denc_traits { static void encode(const inodeno_t &o, buffer::list::contiguous_appender& p) { denc(o.val, p); } - static void decode(inodeno_t& o, buffer::ptr::iterator &p) { + static void decode(inodeno_t& o, buffer::ptr::const_iterator &p) { denc(o.val, p); } }; @@ -113,7 +113,7 @@ struct file_layout_t { bool is_valid() const; void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; diff --git a/src/include/health.h b/src/include/health.h index 3cf7442adde1..5c00225ee938 100644 --- a/src/include/health.h +++ b/src/include/health.h @@ -20,7 +20,7 @@ inline void encode(health_status_t hs, bufferlist& bl) { uint8_t v = hs; encode(v, bl); } -inline void decode(health_status_t& hs, bufferlist::iterator& p) { +inline void decode(health_status_t& hs, bufferlist::const_iterator& p) { using ceph::decode; uint8_t v; decode(v, p); @@ -40,13 +40,13 @@ struct denc_traits { uint64_t f=0) { ::denc((uint8_t)v, p); } - static void decode(health_status_t& v, buffer::ptr::iterator& p, + static void decode(health_status_t& v, buffer::ptr::const_iterator& p, uint64_t f=0) { uint8_t tmp; ::denc(tmp, p); v = health_status_t(tmp); } - static void decode(health_status_t& v, buffer::list::iterator& p, + static void decode(health_status_t& v, buffer::list::const_iterator& p, uint64_t f=0) { uint8_t tmp; ::denc(tmp, p); diff --git a/src/include/interval_set.h b/src/include/interval_set.h index 33ab2681ebe0..575ac5ef2f4d 100644 --- a/src/include/interval_set.h +++ b/src/include/interval_set.h @@ -340,7 +340,7 @@ class interval_set { void encode(bufferlist::contiguous_appender& p) const { denc(m, p); } - void decode(bufferptr::iterator& p) { + void decode(bufferptr::const_iterator& p) { denc(m, p); _size = 0; for (const auto& i : m) { @@ -358,7 +358,7 @@ class interval_set { void encode_nohead(bufferlist::contiguous_appender& p) const { denc_traits::encode_nohead(m, p); } - void decode_nohead(int n, bufferptr::iterator& p) { + void decode_nohead(int n, bufferptr::const_iterator& p) { denc_traits::decode_nohead(n, m, p); _size = 0; for (const auto& i : m) { @@ -744,7 +744,7 @@ struct denc_traits> { bufferlist::contiguous_appender& p) { v.encode(p); } - static void decode(interval_set& v, bufferptr::iterator& p) { + static void decode(interval_set& v, bufferptr::const_iterator& p) { v.decode(p); } template @@ -757,7 +757,7 @@ struct denc_traits> { v.encode_nohead(p); } static void decode_nohead(size_t n, interval_set& v, - bufferptr::iterator& p) { + bufferptr::const_iterator& p) { v.decode_nohead(n, p); } }; diff --git a/src/include/object.h b/src/include/object.h index 849b698c4aba..99ca58f92244 100644 --- a/src/include/object.h +++ b/src/include/object.h @@ -51,7 +51,7 @@ struct object_t { using ceph::encode; encode(name, bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { using ceph::decode; decode(name, bl); } @@ -124,7 +124,7 @@ struct snapid_t { }; inline void encode(snapid_t i, bufferlist &bl) { encode(i.val, bl); } -inline void decode(snapid_t &i, bufferlist::iterator &p) { decode(i.val, p); } +inline void decode(snapid_t &i, bufferlist::const_iterator &p) { decode(i.val, p); } template<> struct denc_traits { @@ -138,7 +138,7 @@ struct denc_traits { static void encode(const snapid_t &o, buffer::list::contiguous_appender& p) { denc(o.val, p); } - static void decode(snapid_t& o, buffer::ptr::iterator &p) { + static void decode(snapid_t& o, buffer::ptr::const_iterator &p) { denc(o.val, p); } }; @@ -172,7 +172,7 @@ struct sobject_t { encode(oid, bl); encode(snap, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(oid, bl); decode(snap, bl); diff --git a/src/include/types.h b/src/include/types.h index 5169f6b32cde..8ef0b9ec04f4 100644 --- a/src/include/types.h +++ b/src/include/types.h @@ -331,7 +331,7 @@ struct client_t { using ceph::encode; encode(v, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(v, bl); } @@ -477,7 +477,7 @@ struct shard_id_t { using ceph::encode; encode(id, bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { using ceph::decode; decode(id, bl); } @@ -515,7 +515,7 @@ struct errorcode32_t { __s32 newcode = hostos_to_ceph_errno(code); encode(newcode, bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { using ceph::decode; decode(code, bl); code = ceph_to_hostos_errno(code); diff --git a/src/include/util.h b/src/include/util.h index 88eab27ad322..caccaa9ca317 100644 --- a/src/include/util.h +++ b/src/include/util.h @@ -50,7 +50,7 @@ struct ceph_data_stats ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(byte_total, p); decode(byte_used, p); diff --git a/src/include/utime.h b/src/include/utime.h index 92783bb94176..bc2db0b99e15 100644 --- a/src/include/utime.h +++ b/src/include/utime.h @@ -139,7 +139,7 @@ public: encode(tv.tv_nsec, bl); #endif } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { #if defined(CEPH_LITTLE_ENDIAN) p.copy(sizeof(__u32) + sizeof(__u32), (char *)(this)); #else diff --git a/src/include/uuid.h b/src/include/uuid.h index 98ee4b70be1f..219def4b8aed 100644 --- a/src/include/uuid.h +++ b/src/include/uuid.h @@ -56,7 +56,7 @@ struct uuid_d { ::encode_raw(uuid, bl); } - void decode(bufferlist::iterator& p) const { + void decode(bufferlist::const_iterator& p) const { ::decode_raw(uuid, p); } }; diff --git a/src/journal/Entry.cc b/src/journal/Entry.cc index 988faf43eda0..16a5af113eb4 100644 --- a/src/journal/Entry.cc +++ b/src/journal/Entry.cc @@ -40,7 +40,7 @@ void Entry::encode(bufferlist &bl) const { assert(get_fixed_size() + m_data.length() + bl_offset == bl.length()); } -void Entry::decode(bufferlist::iterator &iter) { +void Entry::decode(bufferlist::const_iterator &iter) { using ceph::decode; uint32_t start_offset = iter.get_off(); uint64_t bl_preamble; @@ -82,7 +82,7 @@ void Entry::dump(Formatter *f) const { f->dump_string("data", data.str()); } -bool Entry::is_readable(bufferlist::iterator iter, uint32_t *bytes_needed) { +bool Entry::is_readable(bufferlist::const_iterator iter, uint32_t *bytes_needed) { using ceph::decode; uint32_t start_off = iter.get_off(); if (iter.get_remaining() < HEADER_FIXED_SIZE) { diff --git a/src/journal/Entry.h b/src/journal/Entry.h index 01b4833bc03f..52d9e67b45a6 100644 --- a/src/journal/Entry.h +++ b/src/journal/Entry.h @@ -37,12 +37,12 @@ public: } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &iter); + void decode(bufferlist::const_iterator &iter); void dump(ceph::Formatter *f) const; bool operator==(const Entry& rhs) const; - static bool is_readable(bufferlist::iterator iter, uint32_t *bytes_needed); + static bool is_readable(bufferlist::const_iterator iter, uint32_t *bytes_needed); static void generate_test_instances(std::list &o); private: diff --git a/src/journal/JournalMetadata.cc b/src/journal/JournalMetadata.cc index f9c856c185c7..2f53e3da5fec 100644 --- a/src/journal/JournalMetadata.cc +++ b/src/journal/JournalMetadata.cc @@ -64,7 +64,7 @@ struct C_GetClient : public Context { ldout(cct, 20) << "C_GetClient: " << __func__ << ": r=" << r << dendl; if (r == 0) { - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); r = client::get_client_finish(&it, client); } complete(r); @@ -123,7 +123,7 @@ struct C_AllocateTag : public Context { ldout(cct, 20) << "C_AllocateTag: " << __func__ << ": r=" << r << dendl; if (r == 0) { - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); r = client::get_next_tag_tid_finish(&iter, &tag->tid); } if (r < 0) { @@ -182,7 +182,7 @@ struct C_AllocateTag : public Context { ldout(cct, 20) << "C_AllocateTag: " << __func__ << ": r=" << r << dendl; if (r == 0) { - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); cls::journal::Tag journal_tag; r = client::get_tag_finish(&iter, &journal_tag); @@ -239,7 +239,7 @@ struct C_GetTag : public Context { void handle_get_tag(int r) { if (r == 0) { - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); r = client::get_tag_finish(&iter, tag); } complete(r); @@ -301,7 +301,7 @@ struct C_GetTags : public Context { void handle_tag_list(int r) { if (r == 0) { std::set journal_tags; - bufferlist::iterator iter = out_bl.begin(); + auto iter = out_bl.cbegin(); r = client::tag_list_finish(&iter, &journal_tags); if (r == 0) { for (auto &journal_tag : journal_tags) { @@ -381,7 +381,7 @@ struct C_AssertActiveTag : public Context { std::set tags; if (r == 0) { - bufferlist::iterator it = out_bl.begin(); + auto it = out_bl.cbegin(); r = client::tag_list_finish(&it, &tags); } diff --git a/src/journal/ObjectPlayer.cc b/src/journal/ObjectPlayer.cc index d5a8b0d6078e..84fa2bfca7f6 100644 --- a/src/journal/ObjectPlayer.cc +++ b/src/journal/ObjectPlayer.cc @@ -130,7 +130,7 @@ int ObjectPlayer::handle_fetch_complete(int r, const bufferlist &bl, uint32_t invalid_start_off = 0; clear_invalid_range(m_read_bl_off, m_read_bl.length()); - bufferlist::iterator iter(&m_read_bl, 0); + bufferlist::const_iterator iter{&m_read_bl, 0}; while (!iter.end()) { uint32_t bytes_needed; uint32_t bl_off = iter.get_off(); diff --git a/src/key_value_store/cls_kvs.cc b/src/key_value_store/cls_kvs.cc index 42613a1041a1..9bbcb212bb50 100644 --- a/src/key_value_store/cls_kvs.cc +++ b/src/key_value_store/cls_kvs.cc @@ -41,18 +41,18 @@ static int get_idata_from_key(cls_method_context_t hctx, const string &key, r = cls_cxx_map_get_val(hctx, key_data(key).encoded(), &raw_val); if (r == 0){ CLS_LOG(20, "%s is already in the index: %d", key.c_str(), r); - bufferlist::iterator b = raw_val.begin(); + auto b = raw_val.cbegin(); idata.decode(b); if (!kvmap.empty()) { - bufferlist::iterator b = kvmap.begin()->second.begin(); + auto b = kvmap.begin()->second.cbegin(); next_idata.decode(b); } return r; } else if (r == -ENOENT || r == -ENODATA) { - bufferlist::iterator b = kvmap.begin()->second.begin(); + auto b = kvmap.begin()->second.cbegin(); idata.decode(b); if (idata.kdata.prefix != "1") { - bufferlist::iterator nb = (++kvmap.begin())->second.begin(); + auto nb = (++kvmap.begin())->second.cbegin(); next_idata.decode(nb); } r = 0; @@ -70,7 +70,7 @@ static int get_idata_from_key_op(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { CLS_LOG(20, "get_idata_from_key_op"); idata_from_key_args op; - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); try { decode(op, it); } catch (buffer::error& err) { @@ -110,7 +110,7 @@ static int get_next_idata(cls_method_context_t hctx, const index_data &idata, if (!kvs.empty()) { out_data.kdata.parse(kvs.begin()->first); - bufferlist::iterator b = kvs.begin()->second.begin(); + auto b = kvs.begin()->second.cbegin(); out_data.decode(b); } else { r = -EOVERFLOW; @@ -123,7 +123,7 @@ static int get_next_idata_op(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { CLS_LOG(20, "get_next_idata_op"); idata_from_idata_args op; - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); try { decode(op, it); } catch (buffer::error& err) { @@ -175,7 +175,7 @@ static int get_prev_idata(cls_method_context_t hctx, const index_data &idata, --it; } out_data.kdata.parse(it->first); - bufferlist::iterator b = it->second.begin(); + auto b = it->second.cbegin(); out_data.decode(b); return 0; @@ -185,7 +185,7 @@ static int get_prev_idata_op(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { CLS_LOG(20, "get_next_idata_op"); idata_from_idata_args op; - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); try { decode(op, it); } catch (buffer::error& err) { @@ -229,7 +229,7 @@ static int read_many_op(cls_method_context_t hctx, bufferlist *in, CLS_LOG(20, "read_many_op"); set op; map outmap; - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); try { decode(op, it); } catch (buffer::error & err) { @@ -316,7 +316,7 @@ static int assert_size_in_bound_op(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { CLS_LOG(20, "assert_size_in_bound_op"); assert_size_args op; - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); try { decode(op, it); } catch (buffer::error& err) { @@ -412,7 +412,7 @@ static int omap_insert_op(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { CLS_LOG(20, "omap_insert"); omap_set_args op; - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); try { decode(op, it); } catch (buffer::error& err) { @@ -466,7 +466,7 @@ static int create_with_omap_op(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { CLS_LOG(20, "omap_insert"); map omap; - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); try { decode(omap, it); } catch (buffer::error& err) { @@ -557,7 +557,7 @@ static int omap_remove_op(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { CLS_LOG(20, "omap_remove"); omap_rm_args op; - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); try { decode(op, it); } catch (buffer::error& err) { @@ -621,7 +621,7 @@ static int maybe_read_for_balance_op(cls_method_context_t hctx, bufferlist *in, bufferlist *out) { CLS_LOG(20, "maybe_read_for_balance"); rebalance_args op; - bufferlist::iterator it = in->begin(); + auto it = in->cbegin(); try { decode(op, it); } catch (buffer::error& err) { diff --git a/src/key_value_store/kv_flat_btree_async.cc b/src/key_value_store/kv_flat_btree_async.cc index 34839aa20b97..1f3e830e7fdd 100644 --- a/src/key_value_store/kv_flat_btree_async.cc +++ b/src/key_value_store/kv_flat_btree_async.cc @@ -186,7 +186,7 @@ int KvFlatBtreeAsync::next(const index_data &idata, index_data * out_data) } if (!kvs.empty()) { out_data->kdata.parse(kvs.begin()->first); - bufferlist::iterator b = kvs.begin()->second.begin(); + auto b = kvs.begin()->second.cbegin(); out_data->decode(b); if (idata.is_timed_out(ceph_clock_now(), timeout)) { if (verbose) cout << client_name << " THINKS THE OTHER CLIENT DIED." @@ -228,7 +228,7 @@ int KvFlatBtreeAsync::prev(const index_data &idata, index_data * out_data) } return err; } - bufferlist::iterator it = outbl.begin(); + auto it = outbl.cbegin(); in_args.decode(it); *out_data = in_args.next_idata; if (verbose) cout << "\t\t" << client_name << "-prev: prev is " @@ -287,7 +287,7 @@ int KvFlatBtreeAsync::read_index(const string &key, index_data * idata, it != kvmap.end(); ++it) { bufferlist bl = it->second; - bufferlist::iterator blit = bl.begin(); + auto blit = bl.cbegin(); index_data this_idata; this_idata.decode(blit); if (this_idata.is_timed_out(mytime, timeout)) { @@ -308,7 +308,7 @@ int KvFlatBtreeAsync::read_index(const string &key, index_data * idata, icache.push(this_idata); icache_lock.Unlock(); } - bufferlist::iterator b = kvmap.begin()->second.begin(); + auto b = kvmap.begin()->second.cbegin(); idata->decode(b); idata->kdata.parse(kvmap.begin()->first); if (verbose) cout << "\t" << client_name << "-read_index: kvmap_size is " @@ -322,7 +322,7 @@ int KvFlatBtreeAsync::read_index(const string &key, index_data * idata, if (next_idata != NULL && idata->kdata.prefix != "1") { next_idata->kdata.parse((++kvmap.begin())->first); - bufferlist::iterator nb = (++kvmap.begin())->second.begin(); + auto nb = (++kvmap.begin())->second.cbegin(); next_idata->decode(nb); icache_lock.Lock(); icache.push(*next_idata); @@ -692,7 +692,7 @@ int KvFlatBtreeAsync::read_object(const string &obj, rebalance_args * args) { a->release(); return err; } - bufferlist::iterator it = outbl.begin(); + auto it = outbl.cbegin(); args->decode(it); args->odata.name = obj; args->odata.version = a->get_version64(); @@ -1838,7 +1838,7 @@ int KvFlatBtreeAsync::set_many(const map &in_map) { } map imap;//read from the index - bufferlist::iterator blit = outbl.begin(); + auto blit = outbl.cbegin(); decode(imap, blit); if (verbose) cout << "finished reading index for objects. there are " @@ -1979,7 +1979,7 @@ int KvFlatBtreeAsync::remove_all() { sub.remove(); } index_data idata; - bufferlist::iterator b = it->second.begin(); + auto b = it->second.cbegin(); idata.decode(b); io_ctx.operate(idata.obj, &sub); } @@ -2007,7 +2007,7 @@ int KvFlatBtreeAsync::get_all_keys(std::set *keys) { std::set ret; sub.omap_get_keys2("",LONG_MAX,&ret, nullptr, &err); index_data idata; - bufferlist::iterator b = it->second.begin(); + auto b = it->second.cbegin(); idata.decode(b); io_ctx.operate(idata.obj, &sub, NULL); keys->insert(ret.begin(), ret.end()); @@ -2067,7 +2067,7 @@ bool KvFlatBtreeAsync::is_consistent() { it != index.end(); ++it) { if (it->first != "") { index_data idata; - bufferlist::iterator b = it->second.begin(); + auto b = it->second.cbegin(); idata.decode(b); if (idata.prefix != "") { for(vector::iterator dit = idata.to_delete.begin(); @@ -2216,7 +2216,7 @@ string KvFlatBtreeAsync::str() { for (map::iterator it = index.begin(); it != index.end(); ++it){ index_data idata; - bufferlist::iterator b = it->second.begin(); + auto b = it->second.cbegin(); idata.decode(b); string s = idata.str(); ret << "|" << string((148 - diff --git a/src/key_value_store/kv_flat_btree_async.h b/src/key_value_store/kv_flat_btree_async.h index be356b9f120b..92c4d3b6ae9b 100644 --- a/src/key_value_store/kv_flat_btree_async.h +++ b/src/key_value_store/kv_flat_btree_async.h @@ -108,7 +108,7 @@ struct key_data { encode(prefix, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(raw_key, p); decode(prefix, p); @@ -184,7 +184,7 @@ struct object_data { encode(size, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(min_kdata, p); decode(max_kdata, p); @@ -236,7 +236,7 @@ struct create_data { encode(obj, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(min, p); decode(max, p); @@ -284,7 +284,7 @@ struct delete_data { encode(version, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(min, p); decode(max, p); @@ -363,7 +363,7 @@ struct index_data { encode(obj, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(prefix, p); decode(min_kdata, p); diff --git a/src/key_value_store/kvs_arg_types.h b/src/key_value_store/kvs_arg_types.h index 1306f87fed70..9798aec77dde 100644 --- a/src/key_value_store/kvs_arg_types.h +++ b/src/key_value_store/kvs_arg_types.h @@ -27,7 +27,7 @@ struct assert_size_args { encode(comparator, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(bound, p); decode(comparator, p); @@ -48,7 +48,7 @@ struct idata_from_key_args { encode(next_idata, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(key, p); decode(idata, p); @@ -68,7 +68,7 @@ struct idata_from_idata_args { encode(next_idata, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(idata, p); decode(next_idata, p); @@ -89,7 +89,7 @@ struct omap_set_args { encode(exclusive, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(omap, p); decode(bound, p); @@ -109,7 +109,7 @@ struct omap_rm_args { encode(bound, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(omap, p); decode(bound, p); @@ -130,7 +130,7 @@ struct rebalance_args { encode(comparator, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(odata,p); decode(bound, p); diff --git a/src/kv/KeyValueDB.h b/src/kv/KeyValueDB.h index 50714d247136..769287139c62 100644 --- a/src/kv/KeyValueDB.h +++ b/src/kv/KeyValueDB.h @@ -52,7 +52,7 @@ public: const std::string &prefix, ///< [in] prefix, or CF name bufferlist& to_set_bl ///< [in] encoded key/values to set ) { - bufferlist::iterator p = to_set_bl.begin(); + auto p = std::cbegin(to_set_bl); uint32_t num; decode(num, p); while (num--) { @@ -83,7 +83,7 @@ public: const std::string &prefix, ///< [in] Prefix or CF to search for bufferlist &keys_bl ///< [in] Keys to remove ) { - bufferlist::iterator p = keys_bl.begin(); + auto p = std::cbegin(keys_bl); uint32_t num; decode(num, p); while (num--) { diff --git a/src/librados/IoCtxImpl.cc b/src/librados/IoCtxImpl.cc index cc8d7a27ead3..2a27c49f99ee 100644 --- a/src/librados/IoCtxImpl.cc +++ b/src/librados/IoCtxImpl.cc @@ -1488,7 +1488,7 @@ int librados::IoCtxImpl::mapext(const object_t& oid, if (r < 0) return r; - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(m, iter); return m.size(); diff --git a/src/messages/MAuth.h b/src/messages/MAuth.h index 79e90b3aa410..62b0ba749777 100644 --- a/src/messages/MAuth.h +++ b/src/messages/MAuth.h @@ -37,7 +37,7 @@ public: void decode_payload() override { using ceph::encode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(protocol, p); decode(auth_payload, p); diff --git a/src/messages/MAuthReply.h b/src/messages/MAuthReply.h index c147430c631a..d81ddbf29ddc 100644 --- a/src/messages/MAuthReply.h +++ b/src/messages/MAuthReply.h @@ -46,7 +46,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(protocol, p); decode(result, p); decode(global_id, p); diff --git a/src/messages/MBackfillReserve.h b/src/messages/MBackfillReserve.h index f5268d5208f4..6d8ea9eb6861 100644 --- a/src/messages/MBackfillReserve.h +++ b/src/messages/MBackfillReserve.h @@ -128,7 +128,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid.pgid, p); decode(query_epoch, p); decode(type, p); diff --git a/src/messages/MCacheExpire.h b/src/messages/MCacheExpire.h index d2b6ca579c8b..e82e2e5adca0 100644 --- a/src/messages/MCacheExpire.h +++ b/src/messages/MCacheExpire.h @@ -51,7 +51,7 @@ public: encode(dirs, bl); encode(dentries, bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { using ceph::decode; decode(inodes, bl); decode(dirs, bl); @@ -93,7 +93,7 @@ public: void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(from, p); decode(realms, p); } diff --git a/src/messages/MClientCapRelease.h b/src/messages/MClientCapRelease.h index 579e242bc27b..275e2d08cc9f 100644 --- a/src/messages/MClientCapRelease.h +++ b/src/messages/MClientCapRelease.h @@ -45,7 +45,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(head, p); decode_nohead(head.num, caps, p); if (header.version >= 2) { diff --git a/src/messages/MClientCaps.h b/src/messages/MClientCaps.h index 33218f740f74..cc93dbbf00fb 100644 --- a/src/messages/MClientCaps.h +++ b/src/messages/MClientCaps.h @@ -198,7 +198,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(head, p); ceph_mds_caps_body_legacy body; decode(body, p); diff --git a/src/messages/MClientLease.h b/src/messages/MClientLease.h index 15b95024c941..2b6487e7e2fc 100644 --- a/src/messages/MClientLease.h +++ b/src/messages/MClientLease.h @@ -71,7 +71,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(h, p); decode(dname, p); } diff --git a/src/messages/MClientQuota.h b/src/messages/MClientQuota.h index cc632459f5ab..8121b8b720ab 100644 --- a/src/messages/MClientQuota.h +++ b/src/messages/MClientQuota.h @@ -34,7 +34,7 @@ public: encode(quota, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(ino, p); decode(rstat.rctime, p); decode(rstat.rbytes, p); diff --git a/src/messages/MClientReconnect.h b/src/messages/MClientReconnect.h index 18ce1fd9ace1..6c888b89e690 100644 --- a/src/messages/MClientReconnect.h +++ b/src/messages/MClientReconnect.h @@ -78,7 +78,7 @@ public: encode_nohead(realms, data); } void decode_payload() override { - bufferlist::iterator p = data.begin(); + auto p = data.cbegin(); if (header.version >= 3) { // new protocol decode(caps, p); diff --git a/src/messages/MClientReply.h b/src/messages/MClientReply.h index 1562c58385b0..558e43e54482 100644 --- a/src/messages/MClientReply.h +++ b/src/messages/MClientReply.h @@ -59,7 +59,7 @@ struct LeaseStat { encode(duration_ms, bl); encode(seq, bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { using ceph::decode; decode(mask, bl); decode(duration_ms, bl); @@ -79,7 +79,7 @@ struct DirStat { set<__s32> dist; DirStat() : auth(CDIR_AUTH_PARENT) {} - DirStat(bufferlist::iterator& p) { + DirStat(bufferlist::const_iterator& p) { decode(p); } @@ -89,7 +89,7 @@ struct DirStat { encode(auth, bl); encode(dist, bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { using ceph::decode; decode(frag, p); decode(auth, p); @@ -130,11 +130,11 @@ struct InodeStat { public: InodeStat() {} - InodeStat(bufferlist::iterator& p, uint64_t features) { + InodeStat(bufferlist::const_iterator& p, uint64_t features) { decode(p, features); } - void decode(bufferlist::iterator &p, uint64_t features) { + void decode(bufferlist::const_iterator &p, uint64_t features) { using ceph::decode; decode(vino.ino, p); decode(vino.snapid, p); @@ -259,7 +259,7 @@ public: // serialization void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(head, p); decode(trace_bl, p); decode(extra_bl, p); diff --git a/src/messages/MClientRequest.h b/src/messages/MClientRequest.h index ff03d61e142d..edb33e1acdf8 100644 --- a/src/messages/MClientRequest.h +++ b/src/messages/MClientRequest.h @@ -70,7 +70,7 @@ public: encode(item, bl); encode_nohead(dname, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(item, bl); decode_nohead(item.dname_len, dname, bl); @@ -175,7 +175,7 @@ public: bool is_queued_for_replay() { return queued_for_replay; } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); if (header.version >= 4) { decode(head, p); diff --git a/src/messages/MClientRequestForward.h b/src/messages/MClientRequestForward.h index 32650d74056c..9a4403f4a7c9 100644 --- a/src/messages/MClientRequestForward.h +++ b/src/messages/MClientRequestForward.h @@ -58,7 +58,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(dest_mds, p); decode(num_fwd, p); decode(client_must_resend, p); diff --git a/src/messages/MClientSession.h b/src/messages/MClientSession.h index c1126e679a8c..f4ce68334e41 100644 --- a/src/messages/MClientSession.h +++ b/src/messages/MClientSession.h @@ -61,7 +61,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(head, p); if (header.version >= 2) { decode(client_meta, p); diff --git a/src/messages/MClientSnap.h b/src/messages/MClientSnap.h index e1fda989c04c..8ef9970650d8 100644 --- a/src/messages/MClientSnap.h +++ b/src/messages/MClientSnap.h @@ -54,7 +54,7 @@ public: encode_nohead(bl, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(head, p); decode_nohead(head.num_split_inos, split_inos, p); decode_nohead(head.num_split_realms, split_realms, p); diff --git a/src/messages/MCommand.h b/src/messages/MCommand.h index 3b0ffb7cd5e3..1b7cfd6da737 100644 --- a/src/messages/MCommand.h +++ b/src/messages/MCommand.h @@ -50,7 +50,7 @@ public: encode(cmd, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(fsid, p); decode(cmd, p); } diff --git a/src/messages/MCommandReply.h b/src/messages/MCommandReply.h index 63e45c8a356e..cba70cc834bf 100644 --- a/src/messages/MCommandReply.h +++ b/src/messages/MCommandReply.h @@ -49,7 +49,7 @@ public: encode(rs, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(r, p); decode(rs, p); } diff --git a/src/messages/MConfig.h b/src/messages/MConfig.h index 465d9612b305..683a433bcb38 100644 --- a/src/messages/MConfig.h +++ b/src/messages/MConfig.h @@ -25,7 +25,7 @@ struct MConfig : public Message { void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(config, p); } diff --git a/src/messages/MDataPing.h b/src/messages/MDataPing.h index 7e2944cec19c..f1bc8e423b5d 100644 --- a/src/messages/MDataPing.h +++ b/src/messages/MDataPing.h @@ -74,7 +74,7 @@ private: public: void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(tag, p); decode(counter, p); } diff --git a/src/messages/MDentryLink.h b/src/messages/MDentryLink.h index fe686d1daa7b..4819421fd6b3 100644 --- a/src/messages/MDentryLink.h +++ b/src/messages/MDentryLink.h @@ -50,7 +50,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(subtree, p); decode(dirfrag, p); decode(dn, p); diff --git a/src/messages/MDentryUnlink.h b/src/messages/MDentryUnlink.h index da580cae3fb8..af86c5e92ff4 100644 --- a/src/messages/MDentryUnlink.h +++ b/src/messages/MDentryUnlink.h @@ -45,7 +45,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(dirfrag, p); decode(dn, p); decode(straybl, p); diff --git a/src/messages/MDirUpdate.h b/src/messages/MDirUpdate.h index 892912a5aca7..e73351bff9e4 100644 --- a/src/messages/MDirUpdate.h +++ b/src/messages/MDirUpdate.h @@ -48,7 +48,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(from_mds, p); decode(dirfrag, p); decode(dir_rep, p); diff --git a/src/messages/MDiscover.h b/src/messages/MDiscover.h index 3f86cbf46a13..b891fa27c116 100644 --- a/src/messages/MDiscover.h +++ b/src/messages/MDiscover.h @@ -70,7 +70,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(base_ino, p); decode(base_dir_frag, p); decode(snapid, p); diff --git a/src/messages/MDiscoverReply.h b/src/messages/MDiscoverReply.h index 54784ba81af6..d6e0d8967cd9 100644 --- a/src/messages/MDiscoverReply.h +++ b/src/messages/MDiscoverReply.h @@ -175,7 +175,7 @@ public: // ... void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(base_ino, p); decode(base_dir_frag, p); decode(wanted_base_dir, p); diff --git a/src/messages/MExportCaps.h b/src/messages/MExportCaps.h index 4a373cc092b3..5fc1b74bb2ef 100644 --- a/src/messages/MExportCaps.h +++ b/src/messages/MExportCaps.h @@ -43,7 +43,7 @@ public: encode(client_map, payload, features); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(ino, p); decode(cap_bl, p); decode(client_map, p); diff --git a/src/messages/MExportCapsAck.h b/src/messages/MExportCapsAck.h index c11178f58fbd..65891a9a1711 100644 --- a/src/messages/MExportCapsAck.h +++ b/src/messages/MExportCapsAck.h @@ -41,7 +41,7 @@ public: encode(ino, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(ino, p); } diff --git a/src/messages/MExportDir.h b/src/messages/MExportDir.h index e2c987c5b7af..fc43720d81b4 100644 --- a/src/messages/MExportDir.h +++ b/src/messages/MExportDir.h @@ -52,7 +52,7 @@ public: encode(client_map, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(dirfrag, p); decode(bounds, p); decode(export_data, p); diff --git a/src/messages/MExportDirAck.h b/src/messages/MExportDirAck.h index b52ac3b552c6..dcf1c7d3a5c2 100644 --- a/src/messages/MExportDirAck.h +++ b/src/messages/MExportDirAck.h @@ -39,7 +39,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(dirfrag, p); decode(imported_caps, p); } diff --git a/src/messages/MExportDirCancel.h b/src/messages/MExportDirCancel.h index a66524516603..195aa316d43a 100644 --- a/src/messages/MExportDirCancel.h +++ b/src/messages/MExportDirCancel.h @@ -43,7 +43,7 @@ public: encode(dirfrag, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(dirfrag, p); } }; diff --git a/src/messages/MExportDirDiscover.h b/src/messages/MExportDirDiscover.h index c3b4acddfb87..c616939d7600 100644 --- a/src/messages/MExportDirDiscover.h +++ b/src/messages/MExportDirDiscover.h @@ -49,7 +49,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(from, p); decode(dirfrag, p); decode(path, p); diff --git a/src/messages/MExportDirDiscoverAck.h b/src/messages/MExportDirDiscoverAck.h index 8e5c4255dd87..118d5f8c8e1f 100644 --- a/src/messages/MExportDirDiscoverAck.h +++ b/src/messages/MExportDirDiscoverAck.h @@ -47,7 +47,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(dirfrag, p); decode(success, p); } diff --git a/src/messages/MExportDirFinish.h b/src/messages/MExportDirFinish.h index d020d58c17db..38f4f0b51fe5 100644 --- a/src/messages/MExportDirFinish.h +++ b/src/messages/MExportDirFinish.h @@ -45,7 +45,7 @@ public: encode(last, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(dirfrag, p); decode(last, p); } diff --git a/src/messages/MExportDirNotify.h b/src/messages/MExportDirNotify.h index 2c40c5989378..48190173fd1d 100644 --- a/src/messages/MExportDirNotify.h +++ b/src/messages/MExportDirNotify.h @@ -68,7 +68,7 @@ public: encode(bounds, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(base, p); decode(ack, p); decode(old_auth, p); diff --git a/src/messages/MExportDirNotifyAck.h b/src/messages/MExportDirNotifyAck.h index c03d1b2b9838..9248a376ddcc 100644 --- a/src/messages/MExportDirNotifyAck.h +++ b/src/messages/MExportDirNotifyAck.h @@ -46,7 +46,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(dirfrag, p); decode(new_auth, p); } diff --git a/src/messages/MExportDirPrep.h b/src/messages/MExportDirPrep.h index aa024f122485..bb6540b04fc8 100644 --- a/src/messages/MExportDirPrep.h +++ b/src/messages/MExportDirPrep.h @@ -66,7 +66,7 @@ public: void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(dirfrag, p); decode(basedir, p); decode(bounds, p); diff --git a/src/messages/MExportDirPrepAck.h b/src/messages/MExportDirPrepAck.h index f4a174a3e445..b9155e2dc156 100644 --- a/src/messages/MExportDirPrepAck.h +++ b/src/messages/MExportDirPrepAck.h @@ -42,7 +42,7 @@ public: void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(dirfrag, p); decode(success, p); } diff --git a/src/messages/MFSMap.h b/src/messages/MFSMap.h index 71166e2929b2..101958247299 100644 --- a/src/messages/MFSMap.h +++ b/src/messages/MFSMap.h @@ -48,7 +48,7 @@ public: // marshalling void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(epoch, p); decode(fsmap, p); } diff --git a/src/messages/MFSMapUser.h b/src/messages/MFSMapUser.h index 498cf1836e78..347976a62e0a 100644 --- a/src/messages/MFSMapUser.h +++ b/src/messages/MFSMapUser.h @@ -46,7 +46,7 @@ public: // marshalling void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(epoch, p); decode(fsmap, p); } diff --git a/src/messages/MForward.h b/src/messages/MForward.h index 8954a10fa36b..8243a3fe4ae3 100644 --- a/src/messages/MForward.h +++ b/src/messages/MForward.h @@ -87,7 +87,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(tid, p); decode(client, p); decode(client_caps, p); diff --git a/src/messages/MGatherCaps.h b/src/messages/MGatherCaps.h index b3f0147919aa..28737df212c9 100644 --- a/src/messages/MGatherCaps.h +++ b/src/messages/MGatherCaps.h @@ -25,7 +25,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(ino, p); } diff --git a/src/messages/MGetConfig.h b/src/messages/MGetConfig.h index 00d7ca3fcdcb..e489276be399 100644 --- a/src/messages/MGetConfig.h +++ b/src/messages/MGetConfig.h @@ -32,7 +32,7 @@ struct MGetConfig : public Message { void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(name, p); decode(host, p); decode(device_class, p); diff --git a/src/messages/MGetPoolStats.h b/src/messages/MGetPoolStats.h index 27758a12fad3..73f0121ba77d 100644 --- a/src/messages/MGetPoolStats.h +++ b/src/messages/MGetPoolStats.h @@ -47,7 +47,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); decode(pools, p); diff --git a/src/messages/MGetPoolStatsReply.h b/src/messages/MGetPoolStatsReply.h index 258660aac856..829ed197e8bf 100644 --- a/src/messages/MGetPoolStatsReply.h +++ b/src/messages/MGetPoolStatsReply.h @@ -45,7 +45,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); decode(pool_stats, p); diff --git a/src/messages/MHeartbeat.h b/src/messages/MHeartbeat.h index 30650e5ee5cb..ab9f6e3905ff 100644 --- a/src/messages/MHeartbeat.h +++ b/src/messages/MHeartbeat.h @@ -52,7 +52,7 @@ public: encode(import_map, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); utime_t now(ceph_clock_now()); decode(load, now, p); decode(beat, p); diff --git a/src/messages/MInodeFileCaps.h b/src/messages/MInodeFileCaps.h index eb4239ce0585..de7d1fb276fa 100644 --- a/src/messages/MInodeFileCaps.h +++ b/src/messages/MInodeFileCaps.h @@ -46,7 +46,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(ino, p); decode(caps, p); } diff --git a/src/messages/MLock.h b/src/messages/MLock.h index d367a408d087..45086214d4ed 100644 --- a/src/messages/MLock.h +++ b/src/messages/MLock.h @@ -74,7 +74,7 @@ public: void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(asker, p); decode(action, p); decode(reqid, p); diff --git a/src/messages/MLog.h b/src/messages/MLog.h index c790529ca61f..1d24c66be6ab 100644 --- a/src/messages/MLog.h +++ b/src/messages/MLog.h @@ -49,7 +49,7 @@ public: encode(entries, payload, features); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); decode(entries, p); diff --git a/src/messages/MLogAck.h b/src/messages/MLogAck.h index a2578fdced28..24db185dbc1e 100644 --- a/src/messages/MLogAck.h +++ b/src/messages/MLogAck.h @@ -40,7 +40,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(fsid, p); decode(last, p); if (!p.end()) diff --git a/src/messages/MMDSBeacon.h b/src/messages/MMDSBeacon.h index 44a3eb9c63cb..32bb21cd3b39 100644 --- a/src/messages/MMDSBeacon.h +++ b/src/messages/MMDSBeacon.h @@ -124,7 +124,7 @@ struct MDSHealthMetric ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode((uint16_t&)type, bl); assert(type != MDS_HEALTH_NULL); @@ -160,7 +160,7 @@ struct MDSHealth ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(metrics, bl); DECODE_FINISH(bl); @@ -270,7 +270,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); decode(global_id, p); diff --git a/src/messages/MMDSCacheRejoin.h b/src/messages/MMDSCacheRejoin.h index a3d12eca2231..53e5dd91caba 100644 --- a/src/messages/MMDSCacheRejoin.h +++ b/src/messages/MMDSCacheRejoin.h @@ -62,7 +62,7 @@ class MMDSCacheRejoin : public Message { encode(nestlock, bl); encode(dftlock, bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { using ceph::decode; decode(nonce, bl); decode(caps_wanted, bl); @@ -83,7 +83,7 @@ class MMDSCacheRejoin : public Message { encode(nonce, bl); encode(dir_rep, bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { using ceph::decode; decode(nonce, bl); decode(dir_rep, bl); @@ -114,7 +114,7 @@ class MMDSCacheRejoin : public Message { encode(nonce, bl); encode(lock, bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { using ceph::decode; decode(first, bl); decode(ino, bl); @@ -136,7 +136,7 @@ class MMDSCacheRejoin : public Message { encode(first, bl); encode(ino, bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { using ceph::decode; decode(first, bl); decode(ino, bl); @@ -155,7 +155,7 @@ class MMDSCacheRejoin : public Message { encode(nest, bl); encode(dft, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(file, bl); decode(nest, bl); @@ -197,7 +197,7 @@ class MMDSCacheRejoin : public Message { encode(reqid, bl); encode(attempt, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(reqid, bl); decode(attempt, bl); @@ -325,7 +325,7 @@ public: encode(xlocked_dentries, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); using ceph::decode; decode(op, p); decode(strong_inodes, p); diff --git a/src/messages/MMDSFindIno.h b/src/messages/MMDSFindIno.h index 3ea3683a25c8..06db79141387 100644 --- a/src/messages/MMDSFindIno.h +++ b/src/messages/MMDSFindIno.h @@ -36,7 +36,7 @@ struct MMDSFindIno : public Message { encode(ino, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(tid, p); decode(ino, p); } diff --git a/src/messages/MMDSFindInoReply.h b/src/messages/MMDSFindInoReply.h index 7560fd5de49f..46eef3f77754 100644 --- a/src/messages/MMDSFindInoReply.h +++ b/src/messages/MMDSFindInoReply.h @@ -36,7 +36,7 @@ struct MMDSFindInoReply : public Message { encode(path, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(tid, p); decode(path, p); } diff --git a/src/messages/MMDSFragmentNotify.h b/src/messages/MMDSFragmentNotify.h index 450bf29e91d5..f60909649bdd 100644 --- a/src/messages/MMDSFragmentNotify.h +++ b/src/messages/MMDSFragmentNotify.h @@ -51,7 +51,7 @@ public: encode(basebl, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(ino, p); decode(basefrag, p); decode(bits, p); diff --git a/src/messages/MMDSLoadTargets.h b/src/messages/MMDSLoadTargets.h index 212e09a585b0..6432ce791f04 100644 --- a/src/messages/MMDSLoadTargets.h +++ b/src/messages/MMDSLoadTargets.h @@ -44,7 +44,7 @@ public: void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(global_id, p); decode(targets, p); diff --git a/src/messages/MMDSMap.h b/src/messages/MMDSMap.h index b34c7719dc42..8729d4fb7066 100644 --- a/src/messages/MMDSMap.h +++ b/src/messages/MMDSMap.h @@ -51,7 +51,7 @@ public: // marshalling void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(fsid, p); decode(epoch, p); decode(encoded, p); diff --git a/src/messages/MMDSOpenIno.h b/src/messages/MMDSOpenIno.h index 8e8f1e1e2c21..ea9d67cd8f3c 100644 --- a/src/messages/MMDSOpenIno.h +++ b/src/messages/MMDSOpenIno.h @@ -40,7 +40,7 @@ struct MMDSOpenIno : public Message { encode(ancestors, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(ino, p); decode(ancestors, p); } diff --git a/src/messages/MMDSOpenInoReply.h b/src/messages/MMDSOpenInoReply.h index 331eb537d75c..b52e33e341df 100644 --- a/src/messages/MMDSOpenInoReply.h +++ b/src/messages/MMDSOpenInoReply.h @@ -43,7 +43,7 @@ struct MMDSOpenInoReply : public Message { encode(error, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(ino, p); decode(ancestors, p); decode(hint, p); diff --git a/src/messages/MMDSResolve.h b/src/messages/MMDSResolve.h index dc072c640b29..a158a0c83db3 100644 --- a/src/messages/MMDSResolve.h +++ b/src/messages/MMDSResolve.h @@ -33,7 +33,7 @@ public: encode(inode_caps, bl); encode(committing, bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { using ceph::decode; decode(inode_caps, bl); decode(committing, bl); @@ -56,7 +56,7 @@ public: encode(type, bl); encode(pending_commits, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(type, bl); decode(pending_commits, bl); @@ -110,7 +110,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(subtrees, p); decode(ambiguous_imports, p); decode(slave_requests, p); diff --git a/src/messages/MMDSResolveAck.h b/src/messages/MMDSResolveAck.h index 2f3a655450b3..38b288523bd6 100644 --- a/src/messages/MMDSResolveAck.h +++ b/src/messages/MMDSResolveAck.h @@ -52,7 +52,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(commit, p); decode(abort, p); } diff --git a/src/messages/MMDSSlaveRequest.h b/src/messages/MMDSSlaveRequest.h index 1f7d656d8e30..78ef3c871207 100644 --- a/src/messages/MMDSSlaveRequest.h +++ b/src/messages/MMDSSlaveRequest.h @@ -183,7 +183,7 @@ public: encode(desti_snapbl, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(reqid, p); decode(attempt, p); decode(op, p); diff --git a/src/messages/MMDSSnapUpdate.h b/src/messages/MMDSSnapUpdate.h index 230e58a3fa2f..2e132c1e362d 100644 --- a/src/messages/MMDSSnapUpdate.h +++ b/src/messages/MMDSSnapUpdate.h @@ -49,7 +49,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(ino, p); decode(snap_op, p); decode(snap_blob, p); diff --git a/src/messages/MMDSTableRequest.h b/src/messages/MMDSTableRequest.h index cf451cb5f8ef..13355bdccf60 100644 --- a/src/messages/MMDSTableRequest.h +++ b/src/messages/MMDSTableRequest.h @@ -47,7 +47,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(table, p); decode(op, p); decode(reqid, p); diff --git a/src/messages/MMgrBeacon.h b/src/messages/MMgrBeacon.h index efc8773d6212..3d9dc9f05e9b 100644 --- a/src/messages/MMgrBeacon.h +++ b/src/messages/MMgrBeacon.h @@ -135,7 +135,7 @@ public: encode(modules, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(server_addr, p); decode(gid, p); diff --git a/src/messages/MMgrClose.h b/src/messages/MMgrClose.h index 3692b3bb9e71..83946e7b43f4 100644 --- a/src/messages/MMgrClose.h +++ b/src/messages/MMgrClose.h @@ -16,7 +16,7 @@ public: void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(daemon_name, p); decode(service_name, p); } diff --git a/src/messages/MMgrConfigure.h b/src/messages/MMgrConfigure.h index 399cc5d2550d..c65d2ba55004 100644 --- a/src/messages/MMgrConfigure.h +++ b/src/messages/MMgrConfigure.h @@ -34,7 +34,7 @@ public: void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(stats_period, p); if (header.version >= 2) { decode(stats_threshold, p); diff --git a/src/messages/MMgrDigest.h b/src/messages/MMgrDigest.h index c661519b1856..31fff83fa09f 100644 --- a/src/messages/MMgrDigest.h +++ b/src/messages/MMgrDigest.h @@ -36,7 +36,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(mon_status_json, p); decode(health_json, p); } diff --git a/src/messages/MMgrMap.h b/src/messages/MMgrMap.h index 965e9e57326f..1fbfdcca6a89 100644 --- a/src/messages/MMgrMap.h +++ b/src/messages/MMgrMap.h @@ -43,7 +43,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(map, p); } void encode_payload(uint64_t features) override { diff --git a/src/messages/MMgrOpen.h b/src/messages/MMgrOpen.h index 6875be9474bc..af60a9127611 100644 --- a/src/messages/MMgrOpen.h +++ b/src/messages/MMgrOpen.h @@ -39,7 +39,7 @@ public: void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(daemon_name, p); if (header.version >= 2) { decode(service_name, p); diff --git a/src/messages/MMgrReport.h b/src/messages/MMgrReport.h index 14bf89b0a01f..86c9170249b3 100644 --- a/src/messages/MMgrReport.h +++ b/src/messages/MMgrReport.h @@ -52,7 +52,7 @@ public: ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) + void decode(bufferlist::const_iterator &p) { DECODE_START(3, p); decode(path, p); @@ -105,7 +105,7 @@ public: void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(daemon_name, p); decode(declare_types, p); decode(packed, p); diff --git a/src/messages/MMonCommand.h b/src/messages/MMonCommand.h index 2f58343107fe..c9a2e10b9e78 100644 --- a/src/messages/MMonCommand.h +++ b/src/messages/MMonCommand.h @@ -52,7 +52,7 @@ public: encode(cmd, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); decode(cmd, p); diff --git a/src/messages/MMonCommandAck.h b/src/messages/MMonCommandAck.h index 405f81d5f901..b98f28fd89e9 100644 --- a/src/messages/MMonCommandAck.h +++ b/src/messages/MMonCommandAck.h @@ -44,7 +44,7 @@ public: encode(cmd, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(r, p); decode(rs, p); diff --git a/src/messages/MMonElection.h b/src/messages/MMonElection.h index 530e13f60f6e..c932e9ed68cc 100644 --- a/src/messages/MMonElection.h +++ b/src/messages/MMonElection.h @@ -98,7 +98,7 @@ public: encode(metadata, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(fsid, p); decode(op, p); decode(epoch, p); diff --git a/src/messages/MMonGetOSDMap.h b/src/messages/MMonGetOSDMap.h index 532a37776d15..79546193969c 100644 --- a/src/messages/MMonGetOSDMap.h +++ b/src/messages/MMonGetOSDMap.h @@ -77,7 +77,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(full_first, p); decode(full_last, p); diff --git a/src/messages/MMonGetVersion.h b/src/messages/MMonGetVersion.h index 5ee28d6053ac..39c197145d51 100644 --- a/src/messages/MMonGetVersion.h +++ b/src/messages/MMonGetVersion.h @@ -44,7 +44,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(handle, p); decode(what, p); } diff --git a/src/messages/MMonGetVersionReply.h b/src/messages/MMonGetVersionReply.h index cc9fac0e1808..b392fc186abc 100644 --- a/src/messages/MMonGetVersionReply.h +++ b/src/messages/MMonGetVersionReply.h @@ -47,7 +47,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(handle, p); decode(version, p); if (header.version >= 2) diff --git a/src/messages/MMonGlobalID.h b/src/messages/MMonGlobalID.h index c92ea1d985e0..d7f126778b39 100644 --- a/src/messages/MMonGlobalID.h +++ b/src/messages/MMonGlobalID.h @@ -30,7 +30,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(old_max_id, p); } diff --git a/src/messages/MMonHealth.h b/src/messages/MMonHealth.h index 31550b21b84c..b3b734b5b691 100644 --- a/src/messages/MMonHealth.h +++ b/src/messages/MMonHealth.h @@ -43,7 +43,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); service_decode(p); decode(service_type, p); decode(service_op, p); diff --git a/src/messages/MMonHealthChecks.h b/src/messages/MMonHealthChecks.h index cef94294be0f..c7d606d91bd4 100644 --- a/src/messages/MMonHealthChecks.h +++ b/src/messages/MMonHealthChecks.h @@ -32,7 +32,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(health_checks, p); } diff --git a/src/messages/MMonJoin.h b/src/messages/MMonJoin.h index ebb407c0af3f..76bf487707ef 100644 --- a/src/messages/MMonJoin.h +++ b/src/messages/MMonJoin.h @@ -49,7 +49,7 @@ public: encode(addr, payload, features); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); decode(name, p); diff --git a/src/messages/MMonMap.h b/src/messages/MMonMap.h index 102429a44a97..e44e1eb936e8 100644 --- a/src/messages/MMonMap.h +++ b/src/messages/MMonMap.h @@ -48,7 +48,7 @@ public: encode(monmapbl, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(monmapbl, p); } }; diff --git a/src/messages/MMonMetadata.h b/src/messages/MMonMetadata.h index 68acb26e6316..9caad8661c60 100644 --- a/src/messages/MMonMetadata.h +++ b/src/messages/MMonMetadata.h @@ -45,7 +45,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(data, p); } }; diff --git a/src/messages/MMonMgrReport.h b/src/messages/MMonMgrReport.h index 72bbfe0a72ab..72ae62270779 100644 --- a/src/messages/MMonMgrReport.h +++ b/src/messages/MMonMgrReport.h @@ -50,7 +50,7 @@ public: encode(service_map_bl, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(health_checks, p); decode(service_map_bl, p); diff --git a/src/messages/MMonPaxos.h b/src/messages/MMonPaxos.h index 36bb3b086b25..ff0a6ee5975f 100644 --- a/src/messages/MMonPaxos.h +++ b/src/messages/MMonPaxos.h @@ -109,7 +109,7 @@ public: encode(feature_map, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(epoch, p); decode(op, p); decode(first_committed, p); diff --git a/src/messages/MMonProbe.h b/src/messages/MMonProbe.h index d372501ff9aa..b5380d788344 100644 --- a/src/messages/MMonProbe.h +++ b/src/messages/MMonProbe.h @@ -112,7 +112,7 @@ public: encode(required_features, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(fsid, p); decode(op, p); decode(name, p); diff --git a/src/messages/MMonQuorumService.h b/src/messages/MMonQuorumService.h index 6810707dfc9f..4b82f83b3350 100644 --- a/src/messages/MMonQuorumService.h +++ b/src/messages/MMonQuorumService.h @@ -54,7 +54,7 @@ public: encode(round, payload); } - void service_decode(bufferlist::iterator &p) { + void service_decode(bufferlist::const_iterator &p) { decode(epoch, p); decode(round, p); } diff --git a/src/messages/MMonScrub.h b/src/messages/MMonScrub.h index 883047ef02f8..345fbabf17ed 100644 --- a/src/messages/MMonScrub.h +++ b/src/messages/MMonScrub.h @@ -74,7 +74,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); uint8_t o; decode(o, p); op = (op_type_t)o; diff --git a/src/messages/MMonSubscribe.h b/src/messages/MMonSubscribe.h index cc198c112f77..6ccfe46e21e5 100644 --- a/src/messages/MMonSubscribe.h +++ b/src/messages/MMonSubscribe.h @@ -53,7 +53,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); if (header.version < 2) { map oldwhat; decode(oldwhat, p); diff --git a/src/messages/MMonSubscribeAck.h b/src/messages/MMonSubscribeAck.h index 3174517cde24..3753ee297706 100644 --- a/src/messages/MMonSubscribeAck.h +++ b/src/messages/MMonSubscribeAck.h @@ -36,7 +36,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(interval, p); decode(fsid, p); } diff --git a/src/messages/MMonSync.h b/src/messages/MMonSync.h index 0c9accaa60e6..5b9c9e2c4d18 100644 --- a/src/messages/MMonSync.h +++ b/src/messages/MMonSync.h @@ -98,7 +98,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(op, p); decode(cookie, p); decode(last_committed, p); diff --git a/src/messages/MNop.h b/src/messages/MNop.h index 9c28104b13cf..61fd5c6edb6b 100644 --- a/src/messages/MNop.h +++ b/src/messages/MNop.h @@ -41,7 +41,7 @@ public: } void decode_payload() { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(tag, p); } diff --git a/src/messages/MOSDAlive.h b/src/messages/MOSDAlive.h index 7a77e7f38680..5d84b8cd528b 100644 --- a/src/messages/MOSDAlive.h +++ b/src/messages/MOSDAlive.h @@ -35,7 +35,7 @@ public: encode(want, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(want, p); } diff --git a/src/messages/MOSDBackoff.h b/src/messages/MOSDBackoff.h index c502fdccf8a3..a24da3914636 100644 --- a/src/messages/MOSDBackoff.h +++ b/src/messages/MOSDBackoff.h @@ -60,7 +60,7 @@ public: } void decode_payload() override { - auto p = payload.begin(); + auto p = payload.cbegin(); decode(pgid, p); decode(map_epoch, p); decode(op, p); diff --git a/src/messages/MOSDBeacon.h b/src/messages/MOSDBeacon.h index be0209b9bd97..5c9e6762b65f 100644 --- a/src/messages/MOSDBeacon.h +++ b/src/messages/MOSDBeacon.h @@ -22,7 +22,7 @@ public: encode(min_last_epoch_clean, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(pgs, p); decode(min_last_epoch_clean, p); diff --git a/src/messages/MOSDBoot.h b/src/messages/MOSDBoot.h index ec25692f77e2..2f06412859e1 100644 --- a/src/messages/MOSDBoot.h +++ b/src/messages/MOSDBoot.h @@ -74,7 +74,7 @@ public: encode(osd_features, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(sb, p); decode(hb_back_addr, p); diff --git a/src/messages/MOSDECSubOpRead.h b/src/messages/MOSDECSubOpRead.h index b5879dc510dd..bfb038087bf9 100644 --- a/src/messages/MOSDECSubOpRead.h +++ b/src/messages/MOSDECSubOpRead.h @@ -45,7 +45,7 @@ public: {} void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid, p); decode(map_epoch, p); decode(op, p); diff --git a/src/messages/MOSDECSubOpReadReply.h b/src/messages/MOSDECSubOpReadReply.h index c013ba14cec9..e78f324e3594 100644 --- a/src/messages/MOSDECSubOpReadReply.h +++ b/src/messages/MOSDECSubOpReadReply.h @@ -45,7 +45,7 @@ public: {} void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid, p); decode(map_epoch, p); decode(op, p); diff --git a/src/messages/MOSDECSubOpWrite.h b/src/messages/MOSDECSubOpWrite.h index e5207d00589d..923c45ff1246 100644 --- a/src/messages/MOSDECSubOpWrite.h +++ b/src/messages/MOSDECSubOpWrite.h @@ -49,7 +49,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid, p); decode(map_epoch, p); decode(op, p); diff --git a/src/messages/MOSDECSubOpWriteReply.h b/src/messages/MOSDECSubOpWriteReply.h index 97ade07199b4..76d4fca4df9d 100644 --- a/src/messages/MOSDECSubOpWriteReply.h +++ b/src/messages/MOSDECSubOpWriteReply.h @@ -45,7 +45,7 @@ public: {} void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid, p); decode(map_epoch, p); decode(op, p); diff --git a/src/messages/MOSDFailure.h b/src/messages/MOSDFailure.h index dceee4055f55..1d364654f035 100644 --- a/src/messages/MOSDFailure.h +++ b/src/messages/MOSDFailure.h @@ -63,7 +63,7 @@ public: epoch_t get_epoch() const { return epoch; } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); decode(target_osd, p); diff --git a/src/messages/MOSDForceRecovery.h b/src/messages/MOSDForceRecovery.h index e2917d9ec323..684d2a5875a2 100644 --- a/src/messages/MOSDForceRecovery.h +++ b/src/messages/MOSDForceRecovery.h @@ -88,7 +88,7 @@ public: encode(options, payload); } void decode_payload() { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); if (header.version == 1) { vector pgs; decode(fsid, p); diff --git a/src/messages/MOSDFull.h b/src/messages/MOSDFull.h index 19eb535c6f17..f84a976d602c 100644 --- a/src/messages/MOSDFull.h +++ b/src/messages/MOSDFull.h @@ -33,7 +33,7 @@ public: encode(state, payload); } void decode_payload() { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(map_epoch, p); decode(state, p); diff --git a/src/messages/MOSDMap.h b/src/messages/MOSDMap.h index 537c9dd6f632..fc07660c9c26 100644 --- a/src/messages/MOSDMap.h +++ b/src/messages/MOSDMap.h @@ -73,7 +73,7 @@ private: public: // marshalling void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(fsid, p); decode(incremental_maps, p); decode(maps, p); @@ -113,7 +113,7 @@ public: p != incremental_maps.end(); ++p) { OSDMap::Incremental inc; - bufferlist::iterator q = p->second.begin(); + auto q = p->second.cbegin(); inc.decode(q); // always encode with subset of osdmaps canonical features uint64_t f = inc.encode_features & features; @@ -128,7 +128,7 @@ public: if (inc.crush.length()) { // embedded crush map CrushWrapper c; - auto p = inc.crush.begin(); + auto p = inc.crush.cbegin(); c.decode(p); inc.crush.clear(); c.encode(inc.crush, f); diff --git a/src/messages/MOSDMarkMeDown.h b/src/messages/MOSDMarkMeDown.h index ce8e42f5e177..1a422d6abbb0 100644 --- a/src/messages/MOSDMarkMeDown.h +++ b/src/messages/MOSDMarkMeDown.h @@ -44,7 +44,7 @@ public: epoch_t get_epoch() const { return epoch; } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); decode(target_osd, p); diff --git a/src/messages/MOSDOp.h b/src/messages/MOSDOp.h index f84c4529726a..a1ec292c4173 100644 --- a/src/messages/MOSDOp.h +++ b/src/messages/MOSDOp.h @@ -45,7 +45,7 @@ private: hobject_t hobj; spg_t pgid; - bufferlist::iterator p; + bufferlist::const_iterator p; // Decoding flags. Decoding is only needed for messages catched by pipe reader. // Transition from true -> false without locks being held // Can never see final_decode_needed == false and partial_decode_needed == true @@ -392,7 +392,7 @@ struct ceph_osd_request_head { void decode_payload() override { assert(partial_decode_needed && final_decode_needed); - p = payload.begin(); + p = std::cbegin(payload); // Always keep here the newest version of decoding order/rule if (header.version == HEAD_VERSION) { diff --git a/src/messages/MOSDOpReply.h b/src/messages/MOSDOpReply.h index a042eeb6be3a..d6f38d8f47db 100644 --- a/src/messages/MOSDOpReply.h +++ b/src/messages/MOSDOpReply.h @@ -216,7 +216,7 @@ public: } void decode_payload() override { using ceph::decode; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); // Always keep here the newest version of decoding order/rule if (header.version == HEAD_VERSION) { diff --git a/src/messages/MOSDPGBackfill.h b/src/messages/MOSDPGBackfill.h index bb11d23b9f14..108d72caf555 100644 --- a/src/messages/MOSDPGBackfill.h +++ b/src/messages/MOSDPGBackfill.h @@ -52,7 +52,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(op, p); decode(map_epoch, p); decode(query_epoch, p); diff --git a/src/messages/MOSDPGBackfillRemove.h b/src/messages/MOSDPGBackfillRemove.h index 02c81e6099ed..49e9db590067 100644 --- a/src/messages/MOSDPGBackfillRemove.h +++ b/src/messages/MOSDPGBackfillRemove.h @@ -64,7 +64,7 @@ public: encode(ls, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid, p); decode(map_epoch, p); decode(ls, p); diff --git a/src/messages/MOSDPGCreate.h b/src/messages/MOSDPGCreate.h index 67ca3f01a055..9e69b0637e53 100644 --- a/src/messages/MOSDPGCreate.h +++ b/src/messages/MOSDPGCreate.h @@ -50,7 +50,7 @@ public: encode(ctimes, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(epoch, p); decode(mkpg, p); decode(ctimes, p); diff --git a/src/messages/MOSDPGCreate2.h b/src/messages/MOSDPGCreate2.h index 14613b811061..867a5775f5e3 100644 --- a/src/messages/MOSDPGCreate2.h +++ b/src/messages/MOSDPGCreate2.h @@ -39,7 +39,7 @@ public: encode(pgs, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); using ceph::decode; decode(epoch, p); decode(pgs, p); diff --git a/src/messages/MOSDPGCreated.h b/src/messages/MOSDPGCreated.h index 4a28dcf8adcd..30110cd5baf6 100644 --- a/src/messages/MOSDPGCreated.h +++ b/src/messages/MOSDPGCreated.h @@ -26,7 +26,7 @@ public: encode(pgid, payload); } void decode_payload() override { - auto p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(pgid, p); } diff --git a/src/messages/MOSDPGInfo.h b/src/messages/MOSDPGInfo.h index e51bf4a04760..860a5a474424 100644 --- a/src/messages/MOSDPGInfo.h +++ b/src/messages/MOSDPGInfo.h @@ -63,7 +63,7 @@ public: encode(pg_list, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(epoch, p); decode(pg_list, p); } diff --git a/src/messages/MOSDPGLog.h b/src/messages/MOSDPGLog.h index 892faf72289d..e590cdd30ab5 100644 --- a/src/messages/MOSDPGLog.h +++ b/src/messages/MOSDPGLog.h @@ -109,7 +109,7 @@ public: encode(from, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(epoch, p); decode(info, p); log.decode(p, info.pgid.pool()); diff --git a/src/messages/MOSDPGNotify.h b/src/messages/MOSDPGNotify.h index 358e258b34ef..936829b1f779 100644 --- a/src/messages/MOSDPGNotify.h +++ b/src/messages/MOSDPGNotify.h @@ -64,7 +64,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(epoch, p); decode(pg_list, p); } diff --git a/src/messages/MOSDPGPull.h b/src/messages/MOSDPGPull.h index 542bb613369d..82bf8c6eb9d7 100644 --- a/src/messages/MOSDPGPull.h +++ b/src/messages/MOSDPGPull.h @@ -65,7 +65,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid.pgid, p); decode(map_epoch, p); decode(pulls, p); diff --git a/src/messages/MOSDPGPush.h b/src/messages/MOSDPGPush.h index 4c8cada013c6..f4a751364819 100644 --- a/src/messages/MOSDPGPush.h +++ b/src/messages/MOSDPGPush.h @@ -64,7 +64,7 @@ public: {} void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid.pgid, p); decode(map_epoch, p); decode(pushes, p); diff --git a/src/messages/MOSDPGPushReply.h b/src/messages/MOSDPGPushReply.h index 7ada9e6a63be..a56783c4baf7 100644 --- a/src/messages/MOSDPGPushReply.h +++ b/src/messages/MOSDPGPushReply.h @@ -57,7 +57,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid.pgid, p); decode(map_epoch, p); decode(replies, p); diff --git a/src/messages/MOSDPGQuery.h b/src/messages/MOSDPGQuery.h index c2768d0c33f3..13e5610f833f 100644 --- a/src/messages/MOSDPGQuery.h +++ b/src/messages/MOSDPGQuery.h @@ -68,7 +68,7 @@ public: encode(pg_list, payload, features); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(epoch, p); decode(pg_list, p); } diff --git a/src/messages/MOSDPGRecoveryDelete.h b/src/messages/MOSDPGRecoveryDelete.h index 3fd90c8236bd..85bd464cdf10 100644 --- a/src/messages/MOSDPGRecoveryDelete.h +++ b/src/messages/MOSDPGRecoveryDelete.h @@ -76,7 +76,7 @@ public: encode(objects, payload); } void decode_payload() { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(from, p); decode(pgid, p); decode(map_epoch, p); diff --git a/src/messages/MOSDPGRecoveryDeleteReply.h b/src/messages/MOSDPGRecoveryDeleteReply.h index 5324c1714c41..eb9624866eaf 100644 --- a/src/messages/MOSDPGRecoveryDeleteReply.h +++ b/src/messages/MOSDPGRecoveryDeleteReply.h @@ -31,7 +31,7 @@ struct MOSDPGRecoveryDeleteReply : public MOSDFastDispatchOp { {} void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid.pgid, p); decode(map_epoch, p); decode(min_epoch, p); diff --git a/src/messages/MOSDPGRemove.h b/src/messages/MOSDPGRemove.h index fc406391041d..979dd27c47b0 100644 --- a/src/messages/MOSDPGRemove.h +++ b/src/messages/MOSDPGRemove.h @@ -51,7 +51,7 @@ public: encode(pg_list, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(epoch, p); decode(pg_list, p); } diff --git a/src/messages/MOSDPGScan.h b/src/messages/MOSDPGScan.h index e76572471f66..cccd547b9401 100644 --- a/src/messages/MOSDPGScan.h +++ b/src/messages/MOSDPGScan.h @@ -52,7 +52,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(op, p); decode(map_epoch, p); decode(query_epoch, p); diff --git a/src/messages/MOSDPGTemp.h b/src/messages/MOSDPGTemp.h index 6017dd25a263..80f465e5b62f 100644 --- a/src/messages/MOSDPGTemp.h +++ b/src/messages/MOSDPGTemp.h @@ -44,7 +44,7 @@ public: encode(forced, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(map_epoch, p); decode(pg_temp, p); diff --git a/src/messages/MOSDPGTrim.h b/src/messages/MOSDPGTrim.h index 1f263226bf59..ad03c1e57281 100644 --- a/src/messages/MOSDPGTrim.h +++ b/src/messages/MOSDPGTrim.h @@ -66,7 +66,7 @@ public: encode(pgid.shard, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(epoch, p); decode(pgid.pgid, p); decode(trim_to, p); diff --git a/src/messages/MOSDPGUpdateLogMissing.h b/src/messages/MOSDPGUpdateLogMissing.h index 18ff5423664d..871ec98607da 100644 --- a/src/messages/MOSDPGUpdateLogMissing.h +++ b/src/messages/MOSDPGUpdateLogMissing.h @@ -100,7 +100,7 @@ public: encode(pg_roll_forward_to, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(map_epoch, p); decode(pgid, p); decode(from, p); diff --git a/src/messages/MOSDPGUpdateLogMissingReply.h b/src/messages/MOSDPGUpdateLogMissingReply.h index 3e5b5e3b7c23..5c139137b4ae 100644 --- a/src/messages/MOSDPGUpdateLogMissingReply.h +++ b/src/messages/MOSDPGUpdateLogMissingReply.h @@ -96,7 +96,7 @@ public: encode(last_complete_ondisk, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(map_epoch, p); decode(pgid, p); decode(from, p); diff --git a/src/messages/MOSDPing.h b/src/messages/MOSDPing.h index 5cf554e95f7c..93670beaaa7f 100644 --- a/src/messages/MOSDPing.h +++ b/src/messages/MOSDPing.h @@ -76,7 +76,7 @@ private: public: void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(fsid, p); decode(map_epoch, p); decode(op, p); diff --git a/src/messages/MOSDRepOp.h b/src/messages/MOSDRepOp.h index 677c4623a9ff..70ba7a5b479e 100644 --- a/src/messages/MOSDRepOp.h +++ b/src/messages/MOSDRepOp.h @@ -35,7 +35,7 @@ public: spg_t pgid; - bufferlist::iterator p; + bufferlist::const_iterator p; // Decoding flags. Decoding is only needed for messages catched by pipe reader. bool final_decode_needed; @@ -78,7 +78,7 @@ public: } void decode_payload() override { - p = payload.begin(); + p = payload.cbegin(); // splitted to partial and final decode(map_epoch, p); if (header.version >= 2) { diff --git a/src/messages/MOSDRepOpReply.h b/src/messages/MOSDRepOpReply.h index 97ca483f4aa0..13fedb174fed 100644 --- a/src/messages/MOSDRepOpReply.h +++ b/src/messages/MOSDRepOpReply.h @@ -46,7 +46,7 @@ public: // piggybacked osd state eversion_t last_complete_ondisk; - bufferlist::iterator p; + bufferlist::const_iterator p; // Decoding flags. Decoding is only needed for messages catched by pipe reader. bool final_decode_needed; @@ -61,7 +61,7 @@ public: } void decode_payload() override { - p = payload.begin(); + p = payload.cbegin(); decode(map_epoch, p); if (header.version >= 2) { decode(min_epoch, p); diff --git a/src/messages/MOSDRepScrub.h b/src/messages/MOSDRepScrub.h index 8e1933528afd..877f0185ed0a 100644 --- a/src/messages/MOSDRepScrub.h +++ b/src/messages/MOSDRepScrub.h @@ -109,7 +109,7 @@ public: encode(high_priority, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid.pgid, p); decode(scrub_from, p); decode(scrub_to, p); diff --git a/src/messages/MOSDRepScrubMap.h b/src/messages/MOSDRepScrubMap.h index 04ed9fa09ec4..522f01e38915 100644 --- a/src/messages/MOSDRepScrubMap.h +++ b/src/messages/MOSDRepScrubMap.h @@ -67,7 +67,7 @@ public: encode(preempted, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid, p); decode(map_epoch, p); decode(from, p); diff --git a/src/messages/MOSDScrub.h b/src/messages/MOSDScrub.h index fbf3c424e0ae..bee348f3903a 100644 --- a/src/messages/MOSDScrub.h +++ b/src/messages/MOSDScrub.h @@ -65,7 +65,7 @@ public: encode(deep, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(fsid, p); decode(scrub_pgs, p); decode(repair, p); diff --git a/src/messages/MOSDScrub2.h b/src/messages/MOSDScrub2.h index 82a229236894..20b54a83baae 100644 --- a/src/messages/MOSDScrub2.h +++ b/src/messages/MOSDScrub2.h @@ -47,7 +47,7 @@ public: encode(deep, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(fsid, p); decode(epoch, p); decode(scrub_pgs, p); diff --git a/src/messages/MOSDScrubReserve.h b/src/messages/MOSDScrubReserve.h index 08c77e66df16..8293141333a6 100644 --- a/src/messages/MOSDScrubReserve.h +++ b/src/messages/MOSDScrubReserve.h @@ -75,7 +75,7 @@ public: } void decode_payload() { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid, p); decode(map_epoch, p); decode(type, p); diff --git a/src/messages/MPGStats.h b/src/messages/MPGStats.h index d1f097bfd808..723d764c263d 100644 --- a/src/messages/MPGStats.h +++ b/src/messages/MPGStats.h @@ -53,7 +53,7 @@ public: encode(had_map_for, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); decode(osd_stat, p); diff --git a/src/messages/MPGStatsAck.h b/src/messages/MPGStatsAck.h index d9b9d8e3b7b7..d7336c307434 100644 --- a/src/messages/MPGStatsAck.h +++ b/src/messages/MPGStatsAck.h @@ -37,7 +37,7 @@ public: encode(pg_stat, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pg_stat, p); } }; diff --git a/src/messages/MPoolOp.h b/src/messages/MPoolOp.h index bdc4d5f443ad..508218de665b 100644 --- a/src/messages/MPoolOp.h +++ b/src/messages/MPoolOp.h @@ -75,7 +75,7 @@ public: encode(crush_rule, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); decode(pool, p); diff --git a/src/messages/MPoolOpReply.h b/src/messages/MPoolOpReply.h index ce652aa2fa93..c5fe917627a5 100644 --- a/src/messages/MPoolOpReply.h +++ b/src/messages/MPoolOpReply.h @@ -65,7 +65,7 @@ public: encode(false, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); decode(replyCode, p); diff --git a/src/messages/MRecoveryReserve.h b/src/messages/MRecoveryReserve.h index 37d9696ac392..9803094357b7 100644 --- a/src/messages/MRecoveryReserve.h +++ b/src/messages/MRecoveryReserve.h @@ -104,7 +104,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(pgid.pgid, p); decode(query_epoch, p); decode(type, p); diff --git a/src/messages/MRemoveSnaps.h b/src/messages/MRemoveSnaps.h index 77829a319e19..8ecc8d940ddf 100644 --- a/src/messages/MRemoveSnaps.h +++ b/src/messages/MRemoveSnaps.h @@ -41,7 +41,7 @@ public: encode(snaps, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(snaps, p); assert(p.end()); diff --git a/src/messages/MRoute.h b/src/messages/MRoute.h index 25a66cec6525..c97c2eded417 100644 --- a/src/messages/MRoute.h +++ b/src/messages/MRoute.h @@ -44,7 +44,7 @@ struct MRoute : public Message { session_mon_tid(0), dest(i), send_osdmap_first(0) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); msg = decode_message(NULL, 0, p); } private: @@ -55,7 +55,7 @@ private: public: void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(session_mon_tid, p); decode(dest, p); bool m; diff --git a/src/messages/MServiceMap.h b/src/messages/MServiceMap.h index f21601ac503c..b1022b4a3c39 100644 --- a/src/messages/MServiceMap.h +++ b/src/messages/MServiceMap.h @@ -29,7 +29,7 @@ public: encode(service_map, payload, features); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(service_map, p); } }; diff --git a/src/messages/MStatfs.h b/src/messages/MStatfs.h index e17bb1047693..edb9a11d7ab1 100644 --- a/src/messages/MStatfs.h +++ b/src/messages/MStatfs.h @@ -53,7 +53,7 @@ public: encode(data_pool, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); decode(fsid, p); if (header.version >= 2) { diff --git a/src/messages/MStatfsReply.h b/src/messages/MStatfsReply.h index 07aa583e2e68..a5b3ac0a4b05 100644 --- a/src/messages/MStatfsReply.h +++ b/src/messages/MStatfsReply.h @@ -37,7 +37,7 @@ public: encode(h, payload); } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(h, p); } }; diff --git a/src/messages/MTimeCheck.h b/src/messages/MTimeCheck.h index a5d9556eecbb..911aba0d9b5d 100644 --- a/src/messages/MTimeCheck.h +++ b/src/messages/MTimeCheck.h @@ -65,7 +65,7 @@ public: } void decode_payload() override { - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(op, p); decode(epoch, p); decode(round, p); diff --git a/src/messages/MWatchNotify.h b/src/messages/MWatchNotify.h index 07e443bb72a9..cd01177a5f04 100644 --- a/src/messages/MWatchNotify.h +++ b/src/messages/MWatchNotify.h @@ -49,7 +49,7 @@ private: public: void decode_payload() override { uint8_t msg_ver; - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); decode(msg_ver, p); decode(opcode, p); decode(cookie, p); diff --git a/src/messages/PaxosServiceMessage.h b/src/messages/PaxosServiceMessage.h index 2dfc0ff1bb44..daaf74745f9c 100644 --- a/src/messages/PaxosServiceMessage.h +++ b/src/messages/PaxosServiceMessage.h @@ -33,7 +33,7 @@ class PaxosServiceMessage : public Message { encode(deprecated_session_mon_tid, payload); } - void paxos_decode( bufferlist::iterator& p ) { + void paxos_decode(bufferlist::const_iterator& p ) { decode(version, p); decode(deprecated_session_mon, p); decode(deprecated_session_mon_tid, p); @@ -46,7 +46,7 @@ class PaxosServiceMessage : public Message { void decode_payload() override { ceph_abort(); - bufferlist::iterator p = payload.begin(); + auto p = payload.cbegin(); paxos_decode(p); } diff --git a/src/mgr/DaemonServer.cc b/src/mgr/DaemonServer.cc index bacb485a2109..b4582aabcc6b 100644 --- a/src/mgr/DaemonServer.cc +++ b/src/mgr/DaemonServer.cc @@ -191,7 +191,7 @@ bool DaemonServer::ms_verify_authorizer(Connection *con, s->caps.set_allow_all(); } if (caps_info.caps.length() > 0) { - bufferlist::iterator p = caps_info.caps.begin(); + auto p = caps_info.caps.cbegin(); string str; try { decode(str, p); @@ -400,7 +400,7 @@ bool DaemonServer::handle_open(MMgrOpen *m) } } - auto p = m->config_bl.begin(); + auto p = m->config_bl.cbegin(); if (p != m->config_bl.end()) { decode(daemon->config, p); decode(daemon->ignored_mon_config, p); @@ -540,7 +540,7 @@ bool DaemonServer::handle_report(MMgrReport *m) auto &daemon_counters = daemon->perf_counters; daemon_counters.update(m); - auto p = m->config_bl.begin(); + auto p = m->config_bl.cbegin(); if (p != m->config_bl.end()) { decode(daemon->config, p); decode(daemon->ignored_mon_config, p); diff --git a/src/mgr/DaemonState.cc b/src/mgr/DaemonState.cc index e9b722741919..57c3cf64a647 100644 --- a/src/mgr/DaemonState.cc +++ b/src/mgr/DaemonState.cc @@ -150,7 +150,7 @@ void DaemonPerfCounters::update(MMgrReport *report) const auto now = ceph_clock_now(); // Parse packed data according to declared set of types - bufferlist::iterator p = report->packed.begin(); + auto p = report->packed.cbegin(); DECODE_START(1, p); for (const auto &t_path : session->declared_types) { const auto &t = types.at(t_path); diff --git a/src/mgr/DaemonState.h b/src/mgr/DaemonState.h index 764a3a9a450c..7124965264d2 100644 --- a/src/mgr/DaemonState.h +++ b/src/mgr/DaemonState.h @@ -127,7 +127,7 @@ class DaemonState const std::map& get_config_defaults() { if (config_defaults.empty() && config_defaults_bl.length()) { - auto p = config_defaults_bl.begin(); + auto p = config_defaults_bl.cbegin(); try { decode(config_defaults, p); } catch (buffer::error& e) { diff --git a/src/mgr/PyOSDMap.cc b/src/mgr/PyOSDMap.cc index e4fdd8f5a152..f49f170df612 100644 --- a/src/mgr/PyOSDMap.cc +++ b/src/mgr/PyOSDMap.cc @@ -377,7 +377,7 @@ static PyObject *osdmap_inc_set_compat_weight_set_weights( CrushWrapper crush; assert(self->inc->crush.length()); // see new_incremental - auto p = self->inc->crush.begin(); + auto p = self->inc->crush.cbegin(); decode(crush, p); crush.create_choose_args(CrushWrapper::DEFAULT_CHOOSE_ARGS, 1); for (auto i : wm) { diff --git a/src/mgr/ServiceMap.cc b/src/mgr/ServiceMap.cc index cde279efc5c6..e873aa7eee29 100644 --- a/src/mgr/ServiceMap.cc +++ b/src/mgr/ServiceMap.cc @@ -18,7 +18,7 @@ void ServiceMap::Daemon::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void ServiceMap::Daemon::decode(bufferlist::iterator& p) +void ServiceMap::Daemon::decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(gid, p); @@ -60,7 +60,7 @@ void ServiceMap::Service::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void ServiceMap::Service::decode(bufferlist::iterator& p) +void ServiceMap::Service::decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(daemons, p); @@ -97,7 +97,7 @@ void ServiceMap::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void ServiceMap::decode(bufferlist::iterator& p) +void ServiceMap::decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(epoch, p); diff --git a/src/mgr/ServiceMap.h b/src/mgr/ServiceMap.h index 99165112731f..7c877baa8f0e 100644 --- a/src/mgr/ServiceMap.h +++ b/src/mgr/ServiceMap.h @@ -25,7 +25,7 @@ struct ServiceMap { std::map metadata; ///< static metadata void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(std::list& ls); }; @@ -35,7 +35,7 @@ struct ServiceMap { std::string summary; ///< summary status string for 'ceph -s' void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(std::list& ls); @@ -71,7 +71,7 @@ struct ServiceMap { map services; void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(std::list& ls); diff --git a/src/mon/AuthMonitor.cc b/src/mon/AuthMonitor.cc index dfb166cfb2cd..2d34a9b3b313 100644 --- a/src/mon/AuthMonitor.cc +++ b/src/mon/AuthMonitor.cc @@ -106,7 +106,7 @@ void AuthMonitor::get_initial_keyring(KeyRing *keyring) // fail hard only if there's an error we're not expecting to see assert(ret == 0); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(*keyring, p); } @@ -216,7 +216,7 @@ void AuthMonitor::update_from_paxos(bool *need_bootstrap) assert(latest_bl.length() != 0); dout(7) << __func__ << " loading summary e " << latest_full << dendl; dout(7) << __func__ << " latest length " << latest_bl.length() << dendl; - bufferlist::iterator p = latest_bl.begin(); + auto p = latest_bl.cbegin(); __u8 struct_v; decode(struct_v, p); decode(max_global_id, p); @@ -243,7 +243,7 @@ void AuthMonitor::update_from_paxos(bool *need_bootstrap) dout(20) << __func__ << " walking through version " << (keys_ver+1) << " len " << bl.length() << dendl; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); __u8 v; decode(v, p); while (!p.end()) { @@ -257,7 +257,7 @@ void AuthMonitor::update_from_paxos(bool *need_bootstrap) case AUTH_DATA: { KeyServerData::Incremental auth_inc; - bufferlist::iterator iter = inc.auth_data.begin(); + auto iter = inc.auth_data.cbegin(); decode(auth_inc, iter); mon->key_server.apply_data_incremental(auth_inc); break; @@ -448,7 +448,7 @@ bool AuthMonitor::prep_auth(MonOpRequestRef op, bool paxos_writable) AuthCapsInfo caps_info; MAuthReply *reply; bufferlist response_bl; - bufferlist::iterator indata = m->auth_payload.begin(); + auto indata = m->auth_payload.cbegin(); __u32 proto = m->protocol; bool start = false; bool finished = false; @@ -574,7 +574,7 @@ bool AuthMonitor::prep_auth(MonOpRequestRef op, bool paxos_writable) goto done; } if (caps_info.caps.length()) { - bufferlist::iterator p = caps_info.caps.begin(); + auto p = caps_info.caps.cbegin(); string str; try { decode(str, p); @@ -775,7 +775,7 @@ bool AuthMonitor::entity_is_pending(EntityName& entity) for (auto& p : pending_auth) { if (p.inc_type == AUTH_DATA) { KeyServerData::Incremental inc; - bufferlist::iterator q = p.auth_data.begin(); + auto q = p.auth_data.cbegin(); decode(inc, q); if (inc.op == KeyServerData::AUTH_INC_ADD && inc.name == entity) { @@ -1182,7 +1182,7 @@ bool AuthMonitor::prepare_command(MonOpRequestRef op) mon->reply_command(op, -EINVAL, rs, get_last_committed()); return true; } - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); KeyRing keyring; try { decode(keyring, iter); @@ -1218,7 +1218,7 @@ bool AuthMonitor::prepare_command(MonOpRequestRef op) KeyRing new_keyring; if (has_keyring) { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); try { decode(new_keyring, iter); } catch (const buffer::error &ex) { @@ -1360,7 +1360,7 @@ bool AuthMonitor::prepare_command(MonOpRequestRef op) ++p) { if (p->inc_type == AUTH_DATA) { KeyServerData::Incremental auth_inc; - bufferlist::iterator q = p->auth_data.begin(); + auto q = p->auth_data.cbegin(); decode(auth_inc, q); if (auth_inc.op == KeyServerData::AUTH_INC_ADD && auth_inc.name == entity) { @@ -1579,7 +1579,7 @@ bool AuthMonitor::_upgrade_format_to_dumpling() if (p->second.caps.count("mon") == 0) continue; try { - bufferlist::iterator it = p->second.caps["mon"].begin(); + auto it = p->second.caps["mon"].cbegin(); decode(mon_caps, it); } catch (const buffer::error&) { @@ -1666,7 +1666,7 @@ bool AuthMonitor::_upgrade_format_to_luminous() if (n.find("mgr.") == 0 && p->second.caps.count("mon")) { // the kraken ceph-mgr@.service set the mon cap to 'allow *'. - auto blp = p->second.caps["mon"].begin(); + auto blp = p->second.caps["mon"].cbegin(); string oldcaps; decode(oldcaps, blp); if (oldcaps == "allow *") { diff --git a/src/mon/AuthMonitor.h b/src/mon/AuthMonitor.h index 825ed7ee33a5..2378ce6c3905 100644 --- a/src/mon/AuthMonitor.h +++ b/src/mon/AuthMonitor.h @@ -72,7 +72,7 @@ public: } ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl); __u32 _type; decode(_type, bl); diff --git a/src/mon/ConfigMonitor.cc b/src/mon/ConfigMonitor.cc index 820b961b035b..74ed0ad1ceee 100644 --- a/src/mon/ConfigMonitor.cc +++ b/src/mon/ConfigMonitor.cc @@ -715,7 +715,7 @@ void ConfigMonitor::load_changeset(version_t v, ConfigChangeSet *ch) while (it->valid() && it->key().find(prefix) == 0) { if (it->key() == prefix) { bufferlist bl = it->value(); - auto p = bl.begin(); + auto p = bl.cbegin(); try { decode(ch->stamp, p); decode(ch->name, p); diff --git a/src/mon/CreatingPGs.h b/src/mon/CreatingPGs.h index fae7e6f2ce5a..cc2d4f0da001 100644 --- a/src/mon/CreatingPGs.h +++ b/src/mon/CreatingPGs.h @@ -32,7 +32,7 @@ struct creating_pgs_t { encode(start, bl); encode(end, bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { using ceph::decode; decode(created, p); decode(modified, p); @@ -77,7 +77,7 @@ struct creating_pgs_t { encode(queue, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(2, bl); decode(last_scan_epoch, bl); decode(pgs, bl); diff --git a/src/mon/Elector.cc b/src/mon/Elector.cc index 0e5bdb4aa10d..da1664aa30d5 100644 --- a/src/mon/Elector.cc +++ b/src/mon/Elector.cc @@ -396,7 +396,7 @@ void Elector::handle_victory(MonOpRequestRef op) // stash leader's commands assert(m->sharing_bl.length()); vector new_cmds; - bufferlist::iterator bi = m->sharing_bl.begin(); + auto bi = m->sharing_bl.cbegin(); MonCommand::decode_vector(new_cmds, bi); mon->set_leader_commands(new_cmds); } @@ -433,7 +433,7 @@ void Elector::handle_nak(MonOpRequestRef op) << dendl; CompatSet other; - bufferlist::iterator bi = m->sharing_bl.begin(); + auto bi = m->sharing_bl.cbegin(); other.decode(bi); CompatSet diff = Monitor::get_supported_features().unsupported(other); diff --git a/src/mon/HealthMonitor.cc b/src/mon/HealthMonitor.cc index 92d71dd71039..e4fcdb8327db 100644 --- a/src/mon/HealthMonitor.cc +++ b/src/mon/HealthMonitor.cc @@ -59,7 +59,7 @@ void HealthMonitor::update_from_paxos(bool *need_bootstrap) bufferlist qbl; mon->store->get(service_name, "quorum", qbl); if (qbl.length()) { - auto p = qbl.begin(); + auto p = qbl.cbegin(); decode(quorum_checks, p); } else { quorum_checks.clear(); @@ -68,7 +68,7 @@ void HealthMonitor::update_from_paxos(bool *need_bootstrap) bufferlist lbl; mon->store->get(service_name, "leader", lbl); if (lbl.length()) { - auto p = lbl.begin(); + auto p = lbl.cbegin(); decode(leader_checks, p); } else { leader_checks.clear(); diff --git a/src/mon/LogMonitor.cc b/src/mon/LogMonitor.cc index 881b3102e585..1edd0e14036e 100644 --- a/src/mon/LogMonitor.cc +++ b/src/mon/LogMonitor.cc @@ -91,7 +91,7 @@ void LogMonitor::update_from_paxos(bool *need_bootstrap) get_version_full(latest_full, latest_bl); assert(latest_bl.length() != 0); dout(7) << __func__ << " loading summary e" << latest_full << dendl; - bufferlist::iterator p = latest_bl.begin(); + auto p = latest_bl.cbegin(); decode(summary, p); dout(7) << __func__ << " loaded summary e" << summary.version << dendl; } @@ -103,7 +103,7 @@ void LogMonitor::update_from_paxos(bool *need_bootstrap) assert(err == 0); assert(bl.length()); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); __u8 v; decode(v, p); while (!p.end()) { @@ -643,7 +643,7 @@ void LogMonitor::_create_sub_incremental(MLog *mlog, int level, version_t sv) int err = get_version(sv, bl); assert(err == 0); assert(bl.length()); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); __u8 v; decode(v,p); while (!p.end()) { diff --git a/src/mon/MDSMonitor.cc b/src/mon/MDSMonitor.cc index 5cc4104f26ab..f3d468db0cf6 100644 --- a/src/mon/MDSMonitor.cc +++ b/src/mon/MDSMonitor.cc @@ -210,7 +210,7 @@ void MDSMonitor::encode_pending(MonitorDBStore::TransactionRef t) derr << "Missing health data for MDS " << gid << dendl; continue; } - bufferlist::iterator bl_i = bl.begin(); + auto bl_i = bl.cbegin(); health.decode(bl_i); } for (const auto &metric : health.metrics) { @@ -1646,7 +1646,7 @@ int MDSMonitor::load_metadata(map& m) return r; } - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); ceph::decode(m, it); return 0; } diff --git a/src/mon/MgrMap.h b/src/mon/MgrMap.h index 865e6a5841d1..29fccd66485a 100644 --- a/src/mon/MgrMap.h +++ b/src/mon/MgrMap.h @@ -41,7 +41,7 @@ public: ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(name, bl); decode(can_run, bl); @@ -93,7 +93,7 @@ public: ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& p) + void decode(bufferlist::const_iterator& p) { DECODE_START(3, p); decode(gid, p); @@ -257,7 +257,7 @@ public: ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& p) + void decode(bufferlist::const_iterator& p) { DECODE_START(4, p); decode(epoch, p); diff --git a/src/mon/MgrMonitor.cc b/src/mon/MgrMonitor.cc index 084f0a9dad54..0d554286e864 100644 --- a/src/mon/MgrMonitor.cc +++ b/src/mon/MgrMonitor.cc @@ -83,7 +83,7 @@ void MgrMonitor::update_from_paxos(bool *need_bootstrap) bool old_available = map.get_available(); uint64_t old_gid = map.get_active_gid(); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); map.decode(p); dout(4) << "active server: " << map.active_addr @@ -112,7 +112,7 @@ void MgrMonitor::update_from_paxos(bool *need_bootstrap) if (r < 0) { derr << "Failed to load mgr commands: " << cpp_strerror(r) << dendl; } else { - auto p = loaded_commands.begin(); + auto p = loaded_commands.cbegin(); decode(command_descs, p); } } @@ -703,7 +703,7 @@ bool MgrMonitor::preprocess_command(MonOpRequestRef op) goto reply; } MgrMap m; - auto p = bl.begin(); + auto p = bl.cbegin(); m.decode(p); f->dump_object("mgrmap", m); } @@ -962,7 +962,7 @@ int MgrMonitor::load_metadata(const string& name, std::map& m, if (r < 0) return r; try { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(m, p); } catch (buffer::error& e) { diff --git a/src/mon/MgrStatMonitor.cc b/src/mon/MgrStatMonitor.cc index 9db8ac4e8699..cac4adbf0560 100644 --- a/src/mon/MgrStatMonitor.cc +++ b/src/mon/MgrStatMonitor.cc @@ -47,7 +47,7 @@ void MgrStatMonitor::update_from_paxos(bool *need_bootstrap) if (version) { assert(bl.length()); try { - auto p = bl.begin(); + auto p = bl.cbegin(); decode(digest, p); decode(service_map, p); dout(10) << __func__ << " v" << version @@ -183,7 +183,7 @@ bool MgrStatMonitor::prepare_report(MonOpRequestRef op) { auto m = static_cast(op->get_req()); bufferlist bl = m->get_data(); - auto p = bl.begin(); + auto p = bl.cbegin(); decode(pending_digest, p); pending_health_checks.swap(m->health_checks); if (m->service_map_bl.length()) { diff --git a/src/mon/MonCap.cc b/src/mon/MonCap.cc index 73f4a07ad03d..d5f18419a3c3 100644 --- a/src/mon/MonCap.cc +++ b/src/mon/MonCap.cc @@ -424,7 +424,7 @@ void MonCap::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void MonCap::decode(bufferlist::iterator& bl) +void MonCap::decode(bufferlist::const_iterator& bl) { string s; DECODE_START(4, bl); diff --git a/src/mon/MonCap.h b/src/mon/MonCap.h index 4ef57206e89d..de3581f313c2 100644 --- a/src/mon/MonCap.h +++ b/src/mon/MonCap.h @@ -166,7 +166,7 @@ struct MonCap { bool op_may_read, bool op_may_write, bool op_may_exec) const; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& ls); }; diff --git a/src/mon/MonClient.cc b/src/mon/MonClient.cc index 5f31182a7614..bb09763b899e 100644 --- a/src/mon/MonClient.cc +++ b/src/mon/MonClient.cc @@ -349,7 +349,7 @@ void MonClient::handle_monmap(MMonMap *m) auto peer = m->get_source_addr(); string cur_mon = monmap.get_name(peer); - bufferlist::iterator p = m->monmapbl.begin(); + auto p = m->monmapbl.cbegin(); decode(monmap, p); ldout(cct, 10) << " got monmap " << monmap.epoch @@ -1316,7 +1316,7 @@ int MonConnection::authenticate(MAuthReply *m) auth->set_global_id(global_id); ldout(cct, 10) << "my global_id is " << m->global_id << dendl; } - auto p = m->result_bl.begin(); + auto p = m->result_bl.cbegin(); int ret = auth->handle_response(m->result, p); if (ret == -EAGAIN) { auto ma = new MAuth; diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h index eb8268838b94..688f13c91ce0 100644 --- a/src/mon/MonClient.h +++ b/src/mon/MonClient.h @@ -73,7 +73,7 @@ struct MonClientPinger : public Dispatcher { bufferlist &payload = m->get_payload(); if (result && payload.length() > 0) { - bufferlist::iterator p = payload.begin(); + auto p = std::cbegin(payload); decode(*result, p); } done = true; diff --git a/src/mon/MonCommand.h b/src/mon/MonCommand.h index f60a5ddee762..d4869c56201c 100644 --- a/src/mon/MonCommand.h +++ b/src/mon/MonCommand.h @@ -43,7 +43,7 @@ struct MonCommand { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode_bare(bl); decode(flags, bl); @@ -61,7 +61,7 @@ struct MonCommand { encode(req_perms, bl); encode(availability, bl); } - void decode_bare(bufferlist::iterator &bl) { + void decode_bare(bufferlist::const_iterator &bl) { using ceph::decode; decode(cmdstring, bl); decode(helpstring, bl); @@ -104,7 +104,7 @@ struct MonCommand { ENCODE_FINISH(bl); } static void decode_array(MonCommand **cmds, int *size, - bufferlist::iterator &bl) { + bufferlist::const_iterator &bl) { DECODE_START(2, bl); uint16_t s = 0; decode(s, bl); @@ -138,7 +138,7 @@ struct MonCommand { ENCODE_FINISH(bl); } static void decode_vector(std::vector &cmds, - bufferlist::iterator &bl) { + bufferlist::const_iterator &bl) { DECODE_START(2, bl); uint16_t s = 0; decode(s, bl); diff --git a/src/mon/MonMap.cc b/src/mon/MonMap.cc index 3a32a07d5934..f09ec68e2578 100644 --- a/src/mon/MonMap.cc +++ b/src/mon/MonMap.cc @@ -27,7 +27,7 @@ void mon_info_t::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void mon_info_t::decode(bufferlist::iterator& p) +void mon_info_t::decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(name, p); @@ -189,7 +189,7 @@ void MonMap::encode(bufferlist& blist, uint64_t con_features) const ENCODE_FINISH(blist); } -void MonMap::decode(bufferlist::iterator &p) +void MonMap::decode(bufferlist::const_iterator& p) { map mon_addr; DECODE_START_LEGACY_COMPAT_LEN_16(5, 3, 3, p); diff --git a/src/mon/MonMap.h b/src/mon/MonMap.h index 5c50cee8bcba..4d0860867038 100644 --- a/src/mon/MonMap.h +++ b/src/mon/MonMap.h @@ -55,7 +55,7 @@ struct mon_info_t { void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void print(ostream& out) const; }; WRITE_CLASS_ENCODER_FEATURES(mon_info_t) @@ -279,10 +279,10 @@ public: void encode(bufferlist& blist, uint64_t con_features) const; void decode(bufferlist& blist) { - bufferlist::iterator p = blist.begin(); + auto p = std::cbegin(blist); decode(p); } - void decode(bufferlist::iterator &p); + void decode(bufferlist::const_iterator& p); void generate_fsid() { fsid.generate_random(); diff --git a/src/mon/Monitor.cc b/src/mon/Monitor.cc index 1c737f880b2b..d1c84eaf2b57 100644 --- a/src/mon/Monitor.cc +++ b/src/mon/Monitor.cc @@ -434,7 +434,7 @@ void Monitor::read_features_off_disk(MonitorDBStore *store, CompatSet *features) t->put(MONITOR_NAME, COMPAT_SET_LOC, featuresbl); store->apply_transaction(t); } else { - bufferlist::iterator it = featuresbl.begin(); + auto it = featuresbl.cbegin(); features->decode(it); } } @@ -725,7 +725,7 @@ int Monitor::preinit() if (err == 0 && bl.length() > 0) { // Attempt to decode and extract keyring only if it is found. KeyRing keyring; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(keyring, p); extract_save_mon_key(keyring); } @@ -864,7 +864,7 @@ void Monitor::refresh_from_paxos(bool *need_bootstrap) int r = store->get(MONITOR_NAME, "cluster_fingerprint", bl); if (r >= 0) { try { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(fingerprint, p); } catch (buffer::error& e) { @@ -3890,7 +3890,7 @@ void Monitor::resend_routed_requests() } delete rr; } else { - bufferlist::iterator q = rr->request_bl.begin(); + auto q = rr->request_bl.cbegin(); PaxosServiceMessage *req = (PaxosServiceMessage *)decode_message(cct, 0, q); rr->op->mark_event("resend forwarded message to leader"); dout(10) << " resend to mon." << mon << " tid " << rr->tid << " " << *req << dendl; @@ -4997,7 +4997,7 @@ int Monitor::load_metadata() int r = store->get(MONITOR_STORE_PREFIX, "last_metadata", bl); if (r) return r; - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); decode(mon_metadata, it); pending_metadata = mon_metadata; @@ -5617,7 +5617,7 @@ int Monitor::mkfs(bufferlist& osdmapbl) bufferlist bl; bl.append(keyring_plaintext); try { - bufferlist::iterator i = bl.begin(); + auto i = bl.cbegin(); keyring.decode_plaintext(i); } catch (const buffer::error& e) { @@ -5764,7 +5764,7 @@ bool Monitor::ms_get_authorizer(int service_id, AuthAuthorizer **authorizer, bufferlist ticket_data; encode(blob, ticket_data); - bufferlist::iterator iter = ticket_data.begin(); + auto iter = ticket_data.cbegin(); CephXTicketHandler handler(g_ceph_context, service_id); decode(handler.ticket, iter); @@ -5792,7 +5792,7 @@ bool Monitor::ms_verify_authorizer(Connection *con, int peer_type, // monitor, and cephx is enabled isvalid = false; if (protocol == CEPH_AUTH_CEPHX) { - bufferlist::iterator iter = authorizer_data.begin(); + auto iter = authorizer_data.cbegin(); CephXServiceTicketInfo auth_ticket_info; if (authorizer_data.length()) { diff --git a/src/mon/MonitorDBStore.h b/src/mon/MonitorDBStore.h index f1e0efd7da87..13c767e34680 100644 --- a/src/mon/MonitorDBStore.h +++ b/src/mon/MonitorDBStore.h @@ -73,7 +73,7 @@ class MonitorDBStore ENCODE_FINISH(encode_bl); } - void decode(bufferlist::iterator& decode_bl) { + void decode(bufferlist::const_iterator& decode_bl) { DECODE_START(2, decode_bl); decode(type, decode_bl); decode(prefix, decode_bl); @@ -159,7 +159,7 @@ class MonitorDBStore ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(2, bl); decode(ops, bl); if (struct_v >= 2) { @@ -188,7 +188,7 @@ class MonitorDBStore void append_from_encoded(bufferlist& bl) { auto other(std::make_shared()); - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); other->decode(it); append(other); } @@ -538,7 +538,7 @@ class MonitorDBStore assert(bl.length()); version_t ver; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(ver, p); return ver; } diff --git a/src/mon/OSDMonitor.cc b/src/mon/OSDMonitor.cc index 244c8dbf1b21..01730126abad 100644 --- a/src/mon/OSDMonitor.cc +++ b/src/mon/OSDMonitor.cc @@ -212,7 +212,7 @@ void OSDMonitor::_get_pending_crush(CrushWrapper& newcrush) else osdmap.crush->encode(bl, CEPH_FEATURES_SUPPORTED_DEFAULT); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); newcrush.decode(p); } @@ -359,7 +359,7 @@ void OSDMonitor::update_from_paxos(bool *need_bootstrap) bufferlist bl; if (!mon->store->get(OSD_PG_CREATING_PREFIX, "creating", bl)) { - auto p = bl.begin(); + auto p = bl.cbegin(); std::lock_guard l(creating_pgs_lock); creating_pgs.decode(p); dout(7) << __func__ << " loading creating_pgs last_scan_epoch " @@ -1372,7 +1372,7 @@ int OSDMonitor::load_metadata(int osd, map& m, ostream *err) if (r < 0) return r; try { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(m, p); } catch (buffer::error& e) { @@ -3505,7 +3505,7 @@ void OSDMonitor::get_removed_snaps_range( bufferlist v; mon->store->get(OSD_SNAP_PREFIX, k, v); if (v.length()) { - auto q = v.begin(); + auto q = v.cbegin(); OSDMap::snap_interval_set_t snaps; decode(snaps, q); t.union_of(snaps); @@ -3523,7 +3523,7 @@ int OSDMonitor::get_version(version_t ver, bufferlist& bl) void OSDMonitor::reencode_incremental_map(bufferlist& bl, uint64_t features) { OSDMap::Incremental inc; - bufferlist::iterator q = bl.begin(); + auto q = bl.cbegin(); inc.decode(q); // always encode with subset of osdmap's canonical features uint64_t f = features & inc.encode_features; @@ -3540,7 +3540,7 @@ void OSDMonitor::reencode_incremental_map(bufferlist& bl, uint64_t features) if (inc.crush.length()) { // embedded crush map CrushWrapper c; - auto p = inc.crush.begin(); + auto p = inc.crush.cbegin(); c.decode(p); inc.crush.clear(); c.encode(inc.crush, f); @@ -3551,7 +3551,7 @@ void OSDMonitor::reencode_incremental_map(bufferlist& bl, uint64_t features) void OSDMonitor::reencode_full_map(bufferlist& bl, uint64_t features) { OSDMap m; - bufferlist::iterator q = bl.begin(); + auto q = bl.cbegin(); m.decode(q); // always encode with subset of osdmap's canonical features uint64_t f = features & m.get_encoding_features(); @@ -3590,7 +3590,7 @@ int OSDMonitor::get_inc(version_t ver, OSDMap::Incremental& inc) ceph_assert(err == 0); ceph_assert(inc_bl.length()); - bufferlist::iterator p = inc_bl.begin(); + auto p = inc_bl.cbegin(); inc.decode(p); dout(10) << __func__ << " " << " epoch " << inc.epoch @@ -5691,7 +5691,7 @@ int OSDMonitor::lookup_pruned_snap(int64_t pool, snapid_t snap, return -ENOENT; } bufferlist v = it->value(); - auto p = v.begin(); + auto p = v.cbegin(); decode(*begin, p); decode(*end, p); if (snap < *begin || snap >= *end) { @@ -8003,7 +8003,7 @@ bool OSDMonitor::prepare_command_impl(MonOpRequestRef op, bufferlist data(m->get_data()); CrushWrapper crush; try { - bufferlist::iterator bl(data.begin()); + auto bl = data.cbegin(); crush.decode(bl); } catch (const std::exception &e) { diff --git a/src/mon/OSDMonitor.h b/src/mon/OSDMonitor.h index 92f83ea475ab..c75dec137edf 100644 --- a/src/mon/OSDMonitor.h +++ b/src/mon/OSDMonitor.h @@ -183,7 +183,7 @@ struct osdmap_manifest_t { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(pinned, bl); @@ -191,7 +191,7 @@ struct osdmap_manifest_t { } void decode(bufferlist& bl) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(p); } diff --git a/src/mon/PGMap.cc b/src/mon/PGMap.cc index 6cc8f8644377..9b06ba0fee6a 100644 --- a/src/mon/PGMap.cc +++ b/src/mon/PGMap.cc @@ -63,7 +63,7 @@ void PGMapDigest::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void PGMapDigest::decode(bufferlist::iterator& p) +void PGMapDigest::decode(bufferlist::const_iterator& p) { DECODE_START(3, p); decode(num_pg, p); @@ -1351,7 +1351,7 @@ void PGMap::encode(bufferlist &bl, uint64_t features) const ENCODE_FINISH(bl); } -void PGMap::decode(bufferlist::iterator &bl) +void PGMap::decode(bufferlist::const_iterator &bl) { DECODE_START(7, bl); decode(version, bl); diff --git a/src/mon/PGMap.h b/src/mon/PGMap.h index 95af7c800e3d..89b8eb6b4029 100644 --- a/src/mon/PGMap.h +++ b/src/mon/PGMap.h @@ -59,7 +59,7 @@ public: encode(up, bl); encode(primary, bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { using ceph::decode; decode(acting, p); decode(up, p); @@ -207,7 +207,7 @@ public: } void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(list& ls); }; @@ -387,7 +387,7 @@ public: void stat_osd_sub(int osd, const osd_stat_t &s); void encode(bufferlist &bl, uint64_t features=-1) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); /// encode subset of our data to a PGMapDigest void encode_digest(const OSDMap& osdmap, diff --git a/src/mon/Paxos.cc b/src/mon/Paxos.cc index 008642bfa307..c90732458dbf 100644 --- a/src/mon/Paxos.cc +++ b/src/mon/Paxos.cc @@ -650,7 +650,7 @@ void Paxos::begin(bufferlist& v) t->dump(&f); f.flush(*_dout); auto debug_tx(std::make_shared()); - bufferlist::iterator new_value_it = new_value.begin(); + auto new_value_it = new_value.cbegin(); debug_tx->decode(new_value_it); debug_tx->dump(&f); *_dout << "\nbl dump:\n"; @@ -1153,7 +1153,7 @@ void Paxos::handle_lease_ack(MonOpRequestRef op) } else if (acked_lease.count(from) == 0) { acked_lease.insert(from); if (ack->feature_map.length()) { - auto p = ack->feature_map.begin(); + auto p = ack->feature_map.cbegin(); FeatureMap& t = mon->quorum_feature_map[from]; decode(t, p); } diff --git a/src/mon/Paxos.h b/src/mon/Paxos.h index f0db10064777..1bccbc7c5c42 100644 --- a/src/mon/Paxos.h +++ b/src/mon/Paxos.h @@ -1149,7 +1149,7 @@ public: static void decode_append_transaction(MonitorDBStore::TransactionRef t, bufferlist& bl) { auto vt(std::make_shared()); - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); vt->decode(it); t->append(vt); } @@ -1368,7 +1368,7 @@ inline ostream& operator<<(ostream& out, Paxos::C_Proposal& p) << " queued " << (ceph_clock_now() - p.proposal_time) << " tx dump:\n"; auto t(std::make_shared()); - bufferlist::iterator p_it = p.bl.begin(); + auto p_it = p.bl.cbegin(); t->decode(p_it); JSONFormatter f(true); t->dump(&f); diff --git a/src/mon/PaxosService.cc b/src/mon/PaxosService.cc index 06075f97ccb7..0ebc51f81c76 100644 --- a/src/mon/PaxosService.cc +++ b/src/mon/PaxosService.cc @@ -435,7 +435,7 @@ void PaxosService::load_health() bufferlist bl; mon->store->get("health", service_name, bl); if (bl.length()) { - auto p = bl.begin(); + auto p = bl.cbegin(); decode(health_checks, p); } } diff --git a/src/mon/mon_types.h b/src/mon/mon_types.h index cdd660312ce5..84e715343b49 100644 --- a/src/mon/mon_types.h +++ b/src/mon/mon_types.h @@ -100,7 +100,7 @@ struct FeatureMap { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(m, p); DECODE_FINISH(p); @@ -166,7 +166,7 @@ struct LevelDBStoreStats { ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); decode(bytes_total, p); decode(bytes_sst, p); @@ -218,7 +218,7 @@ struct DataStats { encode(store_stats, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { DECODE_START(1, p); // we moved from having fields in kb to fields in byte if (struct_v > 2) { @@ -258,7 +258,7 @@ struct ScrubResult { encode(prefix_keys, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(prefix_crc, p); decode(prefix_keys, p); @@ -479,7 +479,7 @@ public: encode(features, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { DECODE_START(COMPAT_VERSION, p); decode(features, p); DECODE_FINISH(p); diff --git a/src/msg/Message.cc b/src/msg/Message.cc index 13c314d4b471..16201febb05e 100644 --- a/src/msg/Message.cc +++ b/src/msg/Message.cc @@ -898,7 +898,7 @@ void Message::encode_trace(bufferlist &bl, uint64_t features) const encode(*p, bl); } -void Message::decode_trace(bufferlist::iterator &p, bool create) +void Message::decode_trace(bufferlist::const_iterator &p, bool create) { blkin_trace_info info = {}; decode(info, p); @@ -958,7 +958,7 @@ void encode_message(Message *msg, uint64_t features, bufferlist& payload) // We've slipped in a 0 signature at this point, so any signature checking after this will // fail. PLR -Message *decode_message(CephContext *cct, int crcflags, bufferlist::iterator& p) +Message *decode_message(CephContext *cct, int crcflags, bufferlist::const_iterator& p) { ceph_msg_header h; ceph_msg_footer_old fo; diff --git a/src/msg/Message.h b/src/msg/Message.h index d3be1efb988f..d74590efaae7 100644 --- a/src/msg/Message.h +++ b/src/msg/Message.h @@ -261,7 +261,7 @@ public: // zipkin tracing ZTracer::Trace trace; void encode_trace(bufferlist &bl, uint64_t features) const; - void decode_trace(bufferlist::iterator &p, bool create = false); + void decode_trace(bufferlist::const_iterator &p, bool create = false); class CompletionHook : public Context { protected: @@ -506,6 +506,6 @@ inline ostream& operator<<(ostream& out, const Message& m) { extern void encode_message(Message *m, uint64_t features, bufferlist& bl); extern Message *decode_message(CephContext *cct, int crcflags, - bufferlist::iterator& bl); + bufferlist::const_iterator& bl); #endif diff --git a/src/msg/async/AsyncConnection.cc b/src/msg/async/AsyncConnection.cc index f2f07e3a08d0..5a6c0b621e30 100644 --- a/src/msg/async/AsyncConnection.cc +++ b/src/msg/async/AsyncConnection.cc @@ -944,7 +944,7 @@ ssize_t AsyncConnection::_process_connection() bufferlist bl; bl.append(state_buffer+banner_len, sizeof(ceph_entity_addr)*2); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { decode(paddr, p); decode(peer_addr_for_me, p); @@ -1091,7 +1091,7 @@ ssize_t AsyncConnection::_process_connection() } authorizer_reply.append(state_buffer, connect_reply.authorizer_len); - bufferlist::iterator iter = authorizer_reply.begin(); + auto iter = authorizer_reply.cbegin(); if (authorizer && !authorizer->verify_reply(iter)) { ldout(async_msgr->cct, 0) << __func__ << " failed verifying authorize reply" << dendl; goto fail; @@ -1247,7 +1247,7 @@ ssize_t AsyncConnection::_process_connection() addr_bl.append(state_buffer+strlen(CEPH_BANNER), sizeof(ceph_entity_addr)); try { - bufferlist::iterator ti = addr_bl.begin(); + auto ti = addr_bl.cbegin(); decode(peer_addr, ti); } catch (const buffer::error& e) { lderr(async_msgr->cct) << __func__ << " decode peer_addr failed " << dendl; diff --git a/src/msg/msg_types.cc b/src/msg/msg_types.cc index da0eb0f31861..cc706822284a 100644 --- a/src/msg/msg_types.cc +++ b/src/msg/msg_types.cc @@ -243,7 +243,7 @@ void entity_addrvec_t::encode(bufferlist& bl, uint64_t features) const encode(v, bl, features); } -void entity_addrvec_t::decode(bufferlist::iterator& bl) +void entity_addrvec_t::decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 marker; diff --git a/src/msg/msg_types.h b/src/msg/msg_types.h index 66ca945a56c4..8b115affb661 100644 --- a/src/msg/msg_types.h +++ b/src/msg/msg_types.h @@ -161,7 +161,7 @@ struct ceph_sockaddr_storage { ::encode_raw(ss, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { struct ceph_sockaddr_storage ss; ::decode_raw(ss, bl); ss.ss_family = ntohs(ss.ss_family); @@ -197,7 +197,7 @@ static inline void encode(const sockaddr_storage& a, bufferlist& bl) { encode(ss, bl); #endif } -static inline void decode(sockaddr_storage& a, bufferlist::iterator& bl) { +static inline void decode(sockaddr_storage& a, bufferlist::const_iterator& bl) { #if defined(__linux__) ::decode_raw(a, bl); a.ss_family = ntohs(a.ss_family); @@ -414,7 +414,7 @@ struct entity_addr_t { bool parse(const char *s, const char **end = 0); - void decode_legacy_addr_after_marker(bufferlist::iterator& bl) + void decode_legacy_addr_after_marker(bufferlist::const_iterator& bl) { using ceph::decode; __u8 marker; @@ -459,7 +459,7 @@ struct entity_addr_t { } ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 marker; decode(marker, bl); @@ -536,7 +536,7 @@ struct entity_addrvec_t { bool empty() const { return v.empty(); } void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& ls); }; @@ -563,7 +563,7 @@ struct entity_inst_t { encode(name, bl); encode(addr, bl, features); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(name, bl); decode(addr, bl); diff --git a/src/msg/simple/Pipe.cc b/src/msg/simple/Pipe.cc index 26f562f1e451..f452258369cb 100644 --- a/src/msg/simple/Pipe.cc +++ b/src/msg/simple/Pipe.cc @@ -405,7 +405,7 @@ int Pipe::accept() goto fail_unlocked; } try { - bufferlist::iterator ti = addrbl.begin(); + auto ti = addrbl.cbegin(); decode(peer_addr, ti); } catch (const buffer::error& e) { ldout(msgr->cct,2) << __func__ << " decode peer_addr failed: " << e.what() @@ -1071,7 +1071,7 @@ int Pipe::connect() goto fail; } try { - bufferlist::iterator p = addrbl.begin(); + auto p = addrbl.cbegin(); decode(paddr, p); decode(peer_addr_for_me, p); } @@ -1186,7 +1186,7 @@ int Pipe::connect() } if (authorizer) { - bufferlist::iterator iter = authorizer_reply.begin(); + auto iter = authorizer_reply.cbegin(); if (!authorizer->verify_reply(iter)) { ldout(msgr->cct,0) << "failed verifying authorize reply" << dendl; goto fail; diff --git a/src/objclass/class_api.cc b/src/objclass/class_api.cc index 8894cb89fd78..fd45c813f5bd 100644 --- a/src/objclass/class_api.cc +++ b/src/objclass/class_api.cc @@ -230,7 +230,7 @@ int cls_cxx_stat(cls_method_context_t hctx, uint64_t *size, time_t *mtime) ret = (*pctx)->pg->do_osd_ops(*pctx, ops); if (ret < 0) return ret; - bufferlist::iterator iter = ops[0].outdata.begin(); + auto iter = ops[0].outdata.cbegin(); utime_t ut; uint64_t s; try { @@ -255,7 +255,7 @@ int cls_cxx_stat2(cls_method_context_t hctx, uint64_t *size, ceph::real_time *mt ret = (*pctx)->pg->do_osd_ops(*pctx, ops); if (ret < 0) return ret; - bufferlist::iterator iter = ops[0].outdata.begin(); + auto iter = ops[0].outdata.cbegin(); real_time ut; uint64_t s; try { @@ -368,7 +368,7 @@ int cls_cxx_getxattrs(cls_method_context_t hctx, map *attrse if (r < 0) return r; - bufferlist::iterator iter = op.outdata.begin(); + auto iter = op.outdata.cbegin(); try { decode(*attrset, iter); } catch (buffer::error& err) { @@ -427,7 +427,7 @@ int cls_cxx_map_get_all_vals(cls_method_context_t hctx, map* if (ret < 0) return ret; - bufferlist::iterator iter = op.outdata.begin(); + auto iter = op.outdata.cbegin(); try { decode(*vals, iter); decode(*more, iter); @@ -455,7 +455,7 @@ int cls_cxx_map_get_keys(cls_method_context_t hctx, const string &start_obj, if (ret < 0) return ret; - bufferlist::iterator iter = op.outdata.begin(); + auto iter = op.outdata.cbegin(); try { decode(*keys, iter); decode(*more, iter); @@ -484,7 +484,7 @@ int cls_cxx_map_get_vals(cls_method_context_t hctx, const string &start_obj, if (ret < 0) return ret; - bufferlist::iterator iter = op.outdata.begin(); + auto iter = op.outdata.cbegin(); try { decode(*vals, iter); decode(*more, iter); @@ -527,7 +527,7 @@ int cls_cxx_map_get_val(cls_method_context_t hctx, const string &key, if (ret < 0) return ret; - bufferlist::iterator iter = op.outdata.begin(); + auto iter = op.outdata.cbegin(); try { map m; @@ -625,7 +625,7 @@ int cls_cxx_list_watchers(cls_method_context_t hctx, if (r < 0) return r; - bufferlist::iterator iter = op.outdata.begin(); + auto iter = op.outdata.cbegin(); try { decode(*watchers, iter); } catch (buffer::error& err) { diff --git a/src/objclass/objclass.h b/src/objclass/objclass.h index f20bf49ae0e5..d36867de5488 100644 --- a/src/objclass/objclass.h +++ b/src/objclass/objclass.h @@ -89,7 +89,7 @@ public: * handle any encoding errors, and return an appropriate error code, * or 0 on valid input. */ - virtual int init(bufferlist::iterator ¶ms) = 0; + virtual int init(bufferlist::const_iterator ¶ms) = 0; /** * xattr key, or empty string. If non-empty, this xattr will be fetched diff --git a/src/os/ObjectStore.cc b/src/os/ObjectStore.cc index 0f08a351bfac..be6248c1f219 100644 --- a/src/os/ObjectStore.cc +++ b/src/os/ObjectStore.cc @@ -25,10 +25,10 @@ #endif #include "kstore/KStore.h" -void decode_str_str_map_to_bl(bufferlist::iterator& p, +void decode_str_str_map_to_bl(bufferlist::const_iterator& p, bufferlist *out) { - bufferlist::iterator start = p; + auto start = p; __u32 n; decode(n, p); unsigned len = 4; @@ -44,10 +44,10 @@ void decode_str_str_map_to_bl(bufferlist::iterator& p, start.copy(len, *out); } -void decode_str_set_to_bl(bufferlist::iterator& p, +void decode_str_set_to_bl(bufferlist::const_iterator& p, bufferlist *out) { - bufferlist::iterator start = p; + auto start = p; __u32 n; decode(n, p); unsigned len = 4; diff --git a/src/os/ObjectStore.h b/src/os/ObjectStore.h index 4ed42308e136..16b7ee18c64c 100644 --- a/src/os/ObjectStore.h +++ b/src/os/ObjectStore.h @@ -58,8 +58,8 @@ static inline void encode(const map *attrset, bufferlist &bl) } // this isn't the best place for these, but... -void decode_str_str_map_to_bl(bufferlist::iterator& p, bufferlist *out); -void decode_str_set_to_bl(bufferlist::iterator& p, bufferlist *out); +void decode_str_str_map_to_bl(bufferlist::const_iterator& p, bufferlist *out); +void decode_str_set_to_bl(bufferlist::const_iterator& p, bufferlist *out); // Flag bits typedef uint32_t osflagbits_t; @@ -427,7 +427,7 @@ public: void encode(bufferlist& bl) const { bl.append((char*)this, sizeof(TransactionData)); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { bl.copy(sizeof(TransactionData), (char*)this); } } __attribute__ ((packed)) ; @@ -453,11 +453,11 @@ public: public: Transaction() = default; - explicit Transaction(bufferlist::iterator &dp) { + explicit Transaction(bufferlist::const_iterator &dp) { decode(dp); } explicit Transaction(bufferlist &nbl) { - bufferlist::iterator dp = nbl.begin(); + auto dp = nbl.cbegin(); decode(dp); } @@ -845,7 +845,7 @@ public: uint64_t ops; char* op_buffer_p; - bufferlist::iterator data_bl_p; + bufferlist::const_iterator data_bl_p; public: vector colls; @@ -854,7 +854,7 @@ public: private: explicit iterator(Transaction *t) : t(t), - data_bl_p(t->data_bl.begin()), + data_bl_p(t->data_bl.cbegin()), colls(t->coll_index.size()), objects(t->object_index.size()) { @@ -1407,7 +1407,7 @@ public: ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(9, bl); DECODE_OLDEST(9); diff --git a/src/os/Transaction.cc b/src/os/Transaction.cc index c6bad474ebf6..69f82cc2b1f5 100644 --- a/src/os/Transaction.cc +++ b/src/os/Transaction.cc @@ -208,7 +208,7 @@ void ObjectStore::Transaction::dump(ceph::Formatter *f) f->dump_unsigned("type", type); bufferlist hint; i.decode_bl(hint); - bufferlist::iterator hiter = hint.begin(); + auto hiter = hint.cbegin(); if (type == Transaction::COLL_HINT_EXPECTED_NUM_OBJECTS) { uint32_t pg_num; uint64_t num_objs; diff --git a/src/os/bluestore/BitmapFreelistManager.cc b/src/os/bluestore/BitmapFreelistManager.cc index 0017df01a8cf..45bcd2b42d7d 100644 --- a/src/os/bluestore/BitmapFreelistManager.cc +++ b/src/os/bluestore/BitmapFreelistManager.cc @@ -118,25 +118,25 @@ int BitmapFreelistManager::init() string k = it->key(); if (k == "bytes_per_block") { bufferlist bl = it->value(); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(bytes_per_block, p); dout(10) << __func__ << " bytes_per_block 0x" << std::hex << bytes_per_block << std::dec << dendl; } else if (k == "blocks") { bufferlist bl = it->value(); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(blocks, p); dout(10) << __func__ << " blocks 0x" << std::hex << blocks << std::dec << dendl; } else if (k == "size") { bufferlist bl = it->value(); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(size, p); dout(10) << __func__ << " size 0x" << std::hex << size << std::dec << dendl; } else if (k == "blocks_per_key") { bufferlist bl = it->value(); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(blocks_per_key, p); dout(10) << __func__ << " blocks_per_key 0x" << std::hex << blocks_per_key << std::dec << dendl; diff --git a/src/os/bluestore/BlueFS.cc b/src/os/bluestore/BlueFS.cc index 567262c2fbd1..f4c38b533333 100644 --- a/src/os/bluestore/BlueFS.cc +++ b/src/os/bluestore/BlueFS.cc @@ -545,7 +545,7 @@ int BlueFS::_open_super() if (r < 0) return r; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(super, p); { bufferlist t; @@ -601,7 +601,7 @@ int BlueFS::_replay(bool noop, bool to_stdout) uint64_t seq; uuid_d uuid; { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); __u8 a, b; uint32_t len; decode(a, p); @@ -642,7 +642,7 @@ int BlueFS::_replay(bool noop, bool to_stdout) } bluefs_transaction_t t; try { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(t, p); } catch (buffer::error& e) { @@ -660,7 +660,7 @@ int BlueFS::_replay(bool noop, bool to_stdout) << ": " << t << std::endl; } - bufferlist::iterator p = t.op_bl.begin(); + auto p = t.op_bl.cbegin(); while (!p.end()) { __u8 op; decode(op, p); diff --git a/src/os/bluestore/BlueStore.cc b/src/os/bluestore/BlueStore.cc index b1cfed2651e9..26dfd93659f0 100644 --- a/src/os/bluestore/BlueStore.cc +++ b/src/os/bluestore/BlueStore.cc @@ -1,3 +1,4 @@ +// -*- mode:C++; tab-width:8; c-basic-offset:2; indent-tabs-mode:t -*- // vim: ts=8 sw=2 smarttab /* * Ceph - scalable distributed file system @@ -1928,7 +1929,7 @@ void BlueStore::Blob::split(Collection *coll, uint32_t blob_offset, Blob *r) #ifndef CACHE_BLOB_BL void BlueStore::Blob::decode( Collection *coll, - bufferptr::iterator& p, + bufferptr::const_iterator& p, uint64_t struct_v, uint64_t* sbid, bool include_ref_map) @@ -2711,7 +2712,7 @@ void BlueStore::ExtentMap::encode_spanning_blobs( } void BlueStore::ExtentMap::decode_spanning_blobs( - bufferptr::iterator& p) + bufferptr::const_iterator& p) { __u8 struct_v; denc(struct_v, p); @@ -3283,7 +3284,7 @@ void BlueStore::Collection::load_shared_blob(SharedBlobRef sb) sb->loaded = true; sb->persistent = new bluestore_shared_blob_t(sbid); - bufferlist::iterator p = v.begin(); + auto p = v.cbegin(); decode(*(sb->persistent), p); ldout(store->cct, 10) << __func__ << " sbid 0x" << std::hex << sbid << std::dec << " loaded shared_blob " << *sb << dendl; @@ -3369,7 +3370,7 @@ BlueStore::OnodeRef BlueStore::Collection::get_onode( assert(r >= 0); on = new Onode(this, oid, key); on->exists = true; - bufferptr::iterator p = v.front().begin_deep(); + auto p = v.front().begin_deep(); on->onode.decode(p); for (auto& i : on->onode.attrs) { i.second.reassign_to_mempool(mempool::mempool_bluestore_cache_other); @@ -4231,7 +4232,7 @@ int BlueStore::_read_bdev_label(CephContext* cct, string path, } uint32_t crc, expected_crc; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { decode(*label, p); bufferlist t; @@ -5222,7 +5223,7 @@ int BlueStore::_open_collections(int *errors) cache_shards[cid.hash_to_shard(cache_shards.size())], cid)); bufferlist bl = it->value(); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { decode(c->cnode, p); } catch (buffer::error& e) { @@ -5247,7 +5248,7 @@ void BlueStore::_open_statfs() int r = db->get(PREFIX_STAT, "bluestore_statfs", &bl); if (r >= 0) { if (size_t(bl.length()) >= sizeof(vstatfs.values)) { - auto it = bl.begin(); + auto it = bl.cbegin(); vstatfs.decode(it); } else { dout(10) << __func__ << " store_statfs is corrupt, using empty" << dendl; @@ -6262,7 +6263,7 @@ int BlueStore::_fsck(bool deep, bool repair) sb_info_t& sbi = p->second; bluestore_shared_blob_t shared_blob(sbid); bufferlist bl = it->value(); - bufferlist::iterator blp = bl.begin(); + auto blp = bl.cbegin(); try { decode(shared_blob, blp); } catch (buffer::error& e) { @@ -6557,7 +6558,7 @@ int BlueStore::_fsck(bool deep, bool repair) if (it) { for (it->lower_bound(string()); it->valid(); it->next()) { bufferlist bl = it->value(); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); bluestore_deferred_transaction_t wt; try { decode(wt, p); @@ -7478,7 +7479,7 @@ int BlueStore::_decompress(bufferlist& source, bufferlist* result) { int r = 0; utime_t start = ceph_clock_now(); - bufferlist::iterator i = source.begin(); + auto i = source.cbegin(); bluestore_compression_header_t chdr; decode(chdr, i); int alg = int(chdr.type); @@ -8131,7 +8132,7 @@ int BlueStore::_open_super_meta() nid_max = 0; bufferlist bl; db->get(PREFIX_SUPER, "nid_max", &bl); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { uint64_t v; decode(v, p); @@ -8149,7 +8150,7 @@ int BlueStore::_open_super_meta() blobid_max = 0; bufferlist bl; db->get(PREFIX_SUPER, "blobid_max", &bl); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { uint64_t v; decode(v, p); @@ -8179,7 +8180,7 @@ int BlueStore::_open_super_meta() bluefs_extents.clear(); bufferlist bl; db->get(PREFIX_SUPER, "bluefs_extents", &bl); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { decode(bluefs_extents, p); } @@ -8203,7 +8204,7 @@ int BlueStore::_open_super_meta() ondisk_format = 1; compat_ondisk_format = 1; } else { - auto p = bl.begin(); + auto p = bl.cbegin(); try { decode(ondisk_format, p); } catch (buffer::error& e) { @@ -8214,7 +8215,7 @@ int BlueStore::_open_super_meta() { r = db->get(PREFIX_SUPER, "min_compat_ondisk_format", &bl); assert(!r); - auto p = bl.begin(); + auto p = bl.cbegin(); try { decode(compat_ondisk_format, p); } catch (buffer::error& e) { @@ -8244,7 +8245,7 @@ int BlueStore::_open_super_meta() { bufferlist bl; db->get(PREFIX_SUPER, "min_alloc_size", &bl); - auto p = bl.begin(); + auto p = bl.cbegin(); try { uint64_t val; decode(val, p); @@ -8287,7 +8288,7 @@ int BlueStore::_upgrade_super() { bufferlist bl; db->get(PREFIX_SUPER, "min_min_alloc_size", &bl); - auto p = bl.begin(); + auto p = bl.cbegin(); try { uint64_t val; decode(val, p); @@ -9421,7 +9422,7 @@ int BlueStore::_deferred_replay() bluestore_deferred_transaction_t *deferred_txn = new bluestore_deferred_transaction_t; bufferlist bl = it->value(); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { decode(*deferred_txn, p); } catch (buffer::error& e) { @@ -9613,7 +9614,7 @@ void BlueStore::_txc_add_transaction(TransContext *txc, Transaction *t) uint32_t type = op->hint_type; bufferlist hint; i.decode_bl(hint); - bufferlist::iterator hiter = hint.begin(); + auto hiter = hint.cbegin(); if (type == Transaction::COLL_HINT_EXPECTED_NUM_OBJECTS) { uint32_t pg_num; uint64_t num_objs; @@ -11424,7 +11425,7 @@ int BlueStore::_omap_setkeys(TransContext *txc, { dout(15) << __func__ << " " << c->cid << " " << o->oid << dendl; int r; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); __u32 num; if (!o->onode.has_omap()) { o->onode.set_omap_flag(); @@ -11490,7 +11491,7 @@ int BlueStore::_omap_rmkeys(TransContext *txc, { dout(15) << __func__ << " " << c->cid << " " << o->oid << dendl; int r = 0; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); __u32 num; string final_key; diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h index a1e10712a597..7903fec564ce 100644 --- a/src/os/bluestore/BlueStore.h +++ b/src/os/bluestore/BlueStore.h @@ -599,7 +599,7 @@ public: } void decode( Collection */*coll*/, - bufferptr::iterator& p, + bufferptr::const_iterator& p, bool include_ref_map) { const char *start = p.get_pos(); denc(blob, p); @@ -639,7 +639,7 @@ public: } void decode( Collection *coll, - bufferptr::iterator& p, + bufferptr::const_iterator& p, uint64_t struct_v, uint64_t* sbid, bool include_ref_map); @@ -799,7 +799,7 @@ public: void bound_encode_spanning_blobs(size_t& p); void encode_spanning_blobs(bufferlist::contiguous_appender& p); - void decode_spanning_blobs(bufferptr::iterator& p); + void decode_spanning_blobs(bufferptr::const_iterator& p); BlobRef get_spanning_blob(int id) { auto p = spanning_blob_map.find(id); @@ -1480,7 +1480,7 @@ public: values[STATFS_COMPRESSED_ORIGINAL] == 0 && values[STATFS_COMPRESSED_ALLOCATED] == 0; } - void decode(bufferlist::iterator& it) { + void decode(bufferlist::const_iterator& it) { using ceph::decode; for (size_t i = 0; i < STATFS_LAST; i++) { decode(values[i], it); diff --git a/src/os/bluestore/bluefs_types.cc b/src/os/bluestore/bluefs_types.cc index d2e6b39c82ef..0adf058f0055 100644 --- a/src/os/bluestore/bluefs_types.cc +++ b/src/os/bluestore/bluefs_types.cc @@ -42,7 +42,7 @@ void bluefs_super_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void bluefs_super_t::decode(bufferlist::iterator& p) +void bluefs_super_t::decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(uuid, p); @@ -146,7 +146,7 @@ void bluefs_transaction_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void bluefs_transaction_t::decode(bufferlist::iterator& p) +void bluefs_transaction_t::decode(bufferlist::const_iterator& p) { uint32_t crc; DECODE_START(1, p); diff --git a/src/os/bluestore/bluefs_types.h b/src/os/bluestore/bluefs_types.h index 99c59c84285f..02afbd23ddef 100644 --- a/src/os/bluestore/bluefs_types.h +++ b/src/os/bluestore/bluefs_types.h @@ -63,7 +63,7 @@ struct bluefs_fnode_t { _denc_friend(*this, p); DENC_DUMP_POST(bluefs_fnode_t); } - void decode(buffer::ptr::iterator& p) { + void decode(buffer::ptr::const_iterator& p) { _denc_friend(*this, p); recalc_allocated(); } @@ -132,7 +132,7 @@ struct bluefs_super_t { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(list& ls); }; @@ -234,7 +234,7 @@ struct bluefs_transaction_t { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instance(list& ls); }; diff --git a/src/os/bluestore/bluestore_types.cc b/src/os/bluestore/bluestore_types.cc index 1ad0e0ce592c..a58f6cb8157c 100644 --- a/src/os/bluestore/bluestore_types.cc +++ b/src/os/bluestore/bluestore_types.cc @@ -34,7 +34,7 @@ void bluestore_bdev_label_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void bluestore_bdev_label_t::decode(bufferlist::iterator& p) +void bluestore_bdev_label_t::decode(bufferlist::const_iterator& p) { p.advance(60); // see above DECODE_START(2, p); diff --git a/src/os/bluestore/bluestore_types.h b/src/os/bluestore/bluestore_types.h index 805f10e3aa29..ce7d6e38ab22 100644 --- a/src/os/bluestore/bluestore_types.h +++ b/src/os/bluestore/bluestore_types.h @@ -40,7 +40,7 @@ struct bluestore_bdev_label_t { map meta; ///< {read,write}_meta() content from ObjectStore void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -123,7 +123,7 @@ struct denc_traits { denc(i, p); } } - static void decode(PExtentVector& v, bufferptr::iterator& p) { + static void decode(PExtentVector& v, bufferptr::const_iterator& p) { unsigned num; denc_varint(num, p); v.clear(); @@ -176,22 +176,21 @@ struct bluestore_extent_ref_map_t { } } void encode(bufferlist::contiguous_appender& p) const { - uint32_t n = ref_map.size(); + const uint32_t n = ref_map.size(); denc_varint(n, p); if (n) { auto i = ref_map.begin(); denc_varint_lowz(i->first, p); i->second.encode(p); int64_t pos = i->first; - while (--n) { - ++i; + while (++i != ref_map.end()) { denc_varint_lowz((int64_t)i->first - pos, p); i->second.encode(p); pos = i->first; } } } - void decode(bufferptr::iterator& p) { + void decode(bufferptr::const_iterator& p) { uint32_t n; denc_varint(n, p); if (n) { @@ -388,7 +387,7 @@ struct bluestore_blob_use_tracker_t { } } } - void decode(bufferptr::iterator& p) { + void decode(bufferptr::const_iterator& p) { clear(); denc_varint(au_size, p); if (au_size) { @@ -482,7 +481,7 @@ public: } } - void decode(bufferptr::iterator& p, uint64_t struct_v) { + void decode(bufferptr::const_iterator& p, uint64_t struct_v) { assert(struct_v == 1 || struct_v == 2); denc(extents, p); denc_varint(flags, p); diff --git a/src/os/filestore/DBObjectMap.cc b/src/os/filestore/DBObjectMap.cc index b36d9fe5509d..aaabdebd23ff 100644 --- a/src/os/filestore/DBObjectMap.cc +++ b/src/os/filestore/DBObjectMap.cc @@ -66,7 +66,7 @@ int DBObjectMap::check(std::ostream &out, bool repair, bool force) _Header header; bufferlist bl = iter->value(); while (true) { - bufferlist::iterator bliter = bl.begin(); + auto bliter = bl.cbegin(); header.decode(bliter); if (header.seq != 0) parent_to_actual_num_children[header.seq] = header.num_children; @@ -1013,7 +1013,7 @@ int DBObjectMap::upgrade_to_v2() // decode header to get oid _Header hdr; bufferlist bl = iter->value(); - bufferlist::iterator bliter = bl.begin(); + auto bliter = bl.cbegin(); hdr.decode(bliter); string newkey(ghobject_key(hdr.oid)); @@ -1059,7 +1059,7 @@ int DBObjectMap::get_state() if (r < 0) return r; if (!result.empty()) { - bufferlist::iterator bliter = result.begin()->second.begin(); + auto bliter = result.begin()->second.cbegin(); state.decode(bliter); } else { // New store @@ -1170,8 +1170,7 @@ DBObjectMap::Header DBObjectMap::_lookup_map_header( } Header ret(header, RemoveOnDelete(this)); - bufferlist::iterator iter = out.begin(); - + auto iter = out.cbegin(); ret->decode(iter); { Mutex::Locker l(cache_lock); @@ -1223,7 +1222,7 @@ DBObjectMap::Header DBObjectMap::lookup_parent(Header input) } Header header = Header(new _Header(), RemoveOnDelete(this)); - bufferlist::iterator iter = out.begin()->second.begin(); + auto iter = out.begin()->second.cbegin(); header->decode(iter); assert(header->seq == input->parent); dout(20) << "lookup_parent: parent seq is " << header->seq << " with parent " @@ -1329,7 +1328,7 @@ int DBObjectMap::list_objects(vector *out) KeyValueDB::Iterator iter = db->get_iterator(HOBJECT_TO_SEQ); for (iter->seek_to_first(); iter->valid(); iter->next()) { bufferlist bl = iter->value(); - bufferlist::iterator bliter = bl.begin(); + auto bliter = bl.cbegin(); _Header header; header.decode(bliter); out->push_back(header.oid); @@ -1343,7 +1342,7 @@ int DBObjectMap::list_object_headers(vector<_Header> *out) KeyValueDB::Iterator iter = db->get_iterator(HOBJECT_TO_SEQ); for (iter->seek_to_first(); iter->valid(); iter->next()) { bufferlist bl = iter->value(); - bufferlist::iterator bliter = bl.begin(); + auto bliter = bl.cbegin(); _Header header; header.decode(bliter); out->push_back(header); @@ -1358,7 +1357,7 @@ int DBObjectMap::list_object_headers(vector<_Header> *out) break; } else { bl = got.begin()->second; - bufferlist::iterator bliter = bl.begin(); + auto bliter = bl.cbegin(); header.decode(bliter); out->push_back(header); } diff --git a/src/os/filestore/DBObjectMap.h b/src/os/filestore/DBObjectMap.h index d07445188e6d..ba189ff06567 100644 --- a/src/os/filestore/DBObjectMap.h +++ b/src/os/filestore/DBObjectMap.h @@ -281,7 +281,7 @@ public: ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(3, bl); if (struct_v >= 2) decode(v, bl); @@ -328,7 +328,7 @@ public: ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { coll_t unused; DECODE_START(2, bl); decode(seq, bl); diff --git a/src/os/filestore/FileJournal.cc b/src/os/filestore/FileJournal.cc index 2f526780447f..aaa707ad617c 100644 --- a/src/os/filestore/FileJournal.cc +++ b/src/os/filestore/FileJournal.cc @@ -586,7 +586,7 @@ int FileJournal::_fdump(Formatter &f, bool simple) f.dump_unsigned("bl.length", bl.length()); } else { f.open_array_section("transactions"); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); int trans_num = 0; while (!p.end()) { ObjectStore::Transaction t(p); @@ -693,7 +693,7 @@ int FileJournal::read_header(header_t *hdr) const bl.push_back(std::move(bp)); try { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(*hdr, p); } catch (buffer::error& e) { diff --git a/src/os/filestore/FileJournal.h b/src/os/filestore/FileJournal.h index 7283d0be71d9..70e9a28d6489 100644 --- a/src/os/filestore/FileJournal.h +++ b/src/os/filestore/FileJournal.h @@ -175,7 +175,7 @@ public: } encode(em, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u32 v; decode(v, bl); @@ -197,7 +197,7 @@ public: } bufferlist em; decode(em, bl); - bufferlist::iterator t = em.begin(); + auto t = em.cbegin(); decode(flags, t); decode(fsid, t); decode(block_size, t); diff --git a/src/os/filestore/FileStore.cc b/src/os/filestore/FileStore.cc index 5754075c5b0a..05419c3ed77c 100644 --- a/src/os/filestore/FileStore.cc +++ b/src/os/filestore/FileStore.cc @@ -1366,7 +1366,7 @@ int FileStore::read_superblock() bufferlist bl; bl.push_back(std::move(bp)); - bufferlist::iterator i = bl.begin(); + auto i = bl.cbegin(); decode(superblock, i); return 0; } @@ -1386,7 +1386,7 @@ int FileStore::version_stamp_is_valid(uint32_t *version) } bufferlist bl; bl.push_back(std::move(bp)); - bufferlist::iterator i = bl.begin(); + auto i = bl.cbegin(); decode(*version, i); dout(10) << __FUNC__ << ": was " << *version << " vs target " << target_version << dendl; @@ -2492,7 +2492,7 @@ int FileStore::_check_global_replay_guard(const coll_t& cid, bl.append(buf, r); SequencerPosition opos; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(opos, p); VOID_TEMP_FAILURE_RETRY(::close(fd)); @@ -2664,7 +2664,7 @@ int FileStore::_check_replay_guard(int fd, const SequencerPosition& spos) bl.append(buf, r); SequencerPosition opos; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(opos, p); bool in_progress = false; if (!p.end()) // older journals don't have this @@ -2929,7 +2929,7 @@ void FileStore::_do_transaction( uint32_t type = op->hint_type; bufferlist hint; i.decode_bl(hint); - bufferlist::iterator hiter = hint.begin(); + auto hiter = hint.cbegin(); if (type == Transaction::COLL_HINT_EXPECTED_NUM_OBJECTS) { uint32_t pg_num; uint64_t num_objs; @@ -6107,7 +6107,7 @@ void FSSuperblock::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void FSSuperblock::decode(bufferlist::iterator &bl) +void FSSuperblock::decode(bufferlist::const_iterator &bl) { DECODE_START(2, bl); compat_features.decode(bl); diff --git a/src/os/filestore/FileStore.h b/src/os/filestore/FileStore.h index 37f3a8284edc..b34705807a44 100644 --- a/src/os/filestore/FileStore.h +++ b/src/os/filestore/FileStore.h @@ -99,7 +99,7 @@ public: FSSuperblock() { } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; diff --git a/src/os/filestore/GenericFileStoreBackend.cc b/src/os/filestore/GenericFileStoreBackend.cc index 7f3e9b23188e..02f45864fc7a 100644 --- a/src/os/filestore/GenericFileStoreBackend.cc +++ b/src/os/filestore/GenericFileStoreBackend.cc @@ -395,7 +395,7 @@ int GenericFileStoreBackend::_crc_load_or_init(int fd, SloppyCRCMap *cm) } bufferlist bl; bl.append(std::move(bp)); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { decode(*cm, p); } diff --git a/src/os/filestore/HashIndex.cc b/src/os/filestore/HashIndex.cc index a36a164b03a6..40de48c37856 100644 --- a/src/os/filestore/HashIndex.cc +++ b/src/os/filestore/HashIndex.cc @@ -99,7 +99,7 @@ int HashIndex::cleanup() { // No in progress operations! return 0; } - bufferlist::iterator i = bl.begin(); + auto i = bl.cbegin(); InProgressOp in_progress(i); subdir_info_s info; r = get_info(in_progress.path, &info); @@ -403,7 +403,7 @@ int HashIndex::read_settings() { derr << __func__ << " error reading settings: " << cpp_strerror(r) << dendl; return r; } - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); settings.decode(it); dout(20) << __func__ << " split_rand_factor = " << settings.split_rand_factor << dendl; return 0; @@ -724,7 +724,7 @@ int HashIndex::get_info(const vector &path, subdir_info_s *info) { int r = get_attr_path(path, SUBDIR_ATTR, buf); if (r < 0) return r; - bufferlist::iterator bufiter = buf.begin(); + auto bufiter = buf.cbegin(); info->decode(bufiter); assert(path.size() == (unsigned)info->hash_level); return 0; diff --git a/src/os/filestore/HashIndex.h b/src/os/filestore/HashIndex.h index 715be5dc0adb..3eba32188584 100644 --- a/src/os/filestore/HashIndex.h +++ b/src/os/filestore/HashIndex.h @@ -92,7 +92,7 @@ private: encode(hash_level, bl); } - void decode(bufferlist::iterator &bl) + void decode(bufferlist::const_iterator &bl) { using ceph::decode; __u8 v; @@ -114,7 +114,7 @@ private: encode(v, bl); encode(split_rand_factor, bl); } - void decode(bufferlist::iterator &bl) + void decode(bufferlist::const_iterator &bl) { using ceph::decode; __u8 v; @@ -134,7 +134,7 @@ private: InProgressOp(int op, const vector &path) : op(op), path(path) {} - explicit InProgressOp(bufferlist::iterator &bl) { + explicit InProgressOp(bufferlist::const_iterator &bl) { decode(bl); } @@ -150,7 +150,7 @@ private: encode(path, bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { using ceph::decode; __u8 v; decode(v, bl); diff --git a/src/os/filestore/IndexManager.cc b/src/os/filestore/IndexManager.cc index 3a884f84170e..88e17eb156b7 100644 --- a/src/os/filestore/IndexManager.cc +++ b/src/os/filestore/IndexManager.cc @@ -56,7 +56,7 @@ static int get_version(const char *path, uint32_t *version) { bp.set_length(r); bufferlist bl; bl.push_back(bp); - bufferlist::iterator i = bl.begin(); + auto i = bl.cbegin(); decode(*version, i); return 0; } diff --git a/src/os/filestore/JournalingObjectStore.cc b/src/os/filestore/JournalingObjectStore.cc index 0a9aebc2deb4..102b0dc06054 100644 --- a/src/os/filestore/JournalingObjectStore.cc +++ b/src/os/filestore/JournalingObjectStore.cc @@ -83,7 +83,7 @@ int JournalingObjectStore::journal_replay(uint64_t fs_op_seq) assert(op_seq == seq-1); dout(3) << "journal_replay: applying op seq " << seq << dendl; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); vector tls; while (!p.end()) { tls.emplace_back(Transaction(p)); diff --git a/src/os/filestore/SequencerPosition.h b/src/os/filestore/SequencerPosition.h index 6c5b11c9f2d2..164112eebf85 100644 --- a/src/os/filestore/SequencerPosition.h +++ b/src/os/filestore/SequencerPosition.h @@ -28,7 +28,7 @@ struct SequencerPosition { encode(op, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(seq, p); decode(trans, p); diff --git a/src/os/kstore/KStore.cc b/src/os/kstore/KStore.cc index 0a235d5b6253..17424d36953b 100644 --- a/src/os/kstore/KStore.cc +++ b/src/os/kstore/KStore.cc @@ -626,7 +626,7 @@ KStore::OnodeRef KStore::Collection::get_onode( assert(r >=0); on = new Onode(store->cct, oid, key); on->exists = true; - bufferlist::iterator p = v.begin(); + auto p = v.cbegin(); decode(on->onode, p); } o.reset(on); @@ -899,7 +899,7 @@ int KStore::_open_collections(int *errors) if (cid.parse(it->key())) { CollectionRef c(new Collection(this, cid)); bufferlist bl = it->value(); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { decode(c->cnode, p); } catch (buffer::error& e) { @@ -1890,7 +1890,7 @@ int KStore::_open_super_meta() nid_max = 0; bufferlist bl; db->get(PREFIX_SUPER, "nid_max", &bl); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { decode(nid_max, p); } catch (buffer::error& e) { @@ -2249,7 +2249,7 @@ void KStore::_txc_add_transaction(TransContext *txc, Transaction *t) uint32_t type = op->hint_type; bufferlist hint; i.decode_bl(hint); - bufferlist::iterator hiter = hint.begin(); + auto hiter = hint.cbegin(); if (type == Transaction::COLL_HINT_EXPECTED_NUM_OBJECTS) { uint32_t pg_num; uint64_t num_objs; @@ -2979,7 +2979,7 @@ int KStore::_omap_setkeys(TransContext *txc, { dout(15) << __func__ << " " << c->cid << " " << o->oid << dendl; int r; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); __u32 num; if (!o->onode.omap_head) { o->onode.omap_head = o->onode.nid; @@ -3024,11 +3024,11 @@ int KStore::_omap_setheader(TransContext *txc, int KStore::_omap_rmkeys(TransContext *txc, CollectionRef& c, OnodeRef& o, - bufferlist& bl) + const bufferlist& bl) { dout(15) << __func__ << " " << c->cid << " " << o->oid << dendl; int r = 0; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); __u32 num; if (!o->onode.omap_head) { diff --git a/src/os/kstore/KStore.h b/src/os/kstore/KStore.h index e5b8752e5193..4e1ca5cf7c33 100644 --- a/src/os/kstore/KStore.h +++ b/src/os/kstore/KStore.h @@ -631,7 +631,7 @@ private: int _omap_rmkeys(TransContext *txc, CollectionRef& c, OnodeRef& o, - bufferlist& bl); + const bufferlist& bl); int _omap_rmkey_range(TransContext *txc, CollectionRef& c, OnodeRef& o, diff --git a/src/os/kstore/kstore_types.cc b/src/os/kstore/kstore_types.cc index ce785be99c6a..07270374183e 100644 --- a/src/os/kstore/kstore_types.cc +++ b/src/os/kstore/kstore_types.cc @@ -25,7 +25,7 @@ void kstore_cnode_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void kstore_cnode_t::decode(bufferlist::iterator& p) +void kstore_cnode_t::decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(bits, p); @@ -61,7 +61,7 @@ void kstore_onode_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void kstore_onode_t::decode(bufferlist::iterator& p) +void kstore_onode_t::decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(nid, p); diff --git a/src/os/kstore/kstore_types.h b/src/os/kstore/kstore_types.h index 7cfb2475d1f2..13c33fb6a2a8 100644 --- a/src/os/kstore/kstore_types.h +++ b/src/os/kstore/kstore_types.h @@ -31,7 +31,7 @@ struct kstore_cnode_t { explicit kstore_cnode_t(int b=0) : bits(b) {} void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -59,7 +59,7 @@ struct kstore_onode_t { alloc_hint_flags(0) {} void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; diff --git a/src/os/memstore/MemStore.cc b/src/os/memstore/MemStore.cc index 8dc41a95f205..71266a635a56 100644 --- a/src/os/memstore/MemStore.cc +++ b/src/os/memstore/MemStore.cc @@ -147,7 +147,7 @@ int MemStore::_load() return r; set collections; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(collections, p); for (set::iterator q = collections.begin(); @@ -159,7 +159,7 @@ int MemStore::_load() if (r < 0) return r; CollectionRef c(new Collection(cct, *q)); - bufferlist::iterator p = cbl.begin(); + auto p = cbl.cbegin(); c->decode(p); coll_map[*q] = c; used_bytes += c->used_bytes(); @@ -802,7 +802,7 @@ void MemStore::_do_transaction(Transaction& t) uint32_t type = op->hint_type; bufferlist hint; i.decode_bl(hint); - bufferlist::iterator hiter = hint.begin(); + auto hiter = hint.cbegin(); if (type == Transaction::COLL_HINT_EXPECTED_NUM_OBJECTS) { uint32_t pg_num; uint64_t num_objs; @@ -1214,7 +1214,7 @@ int MemStore::_omap_setkeys(const coll_t& cid, const ghobject_t &oid, if (!o) return -ENOENT; std::lock_guard lock(o->omap_mutex); - bufferlist::iterator p = aset_bl.begin(); + auto p = aset_bl.cbegin(); __u32 num; decode(num, p); while (num--) { @@ -1237,7 +1237,7 @@ int MemStore::_omap_rmkeys(const coll_t& cid, const ghobject_t &oid, if (!o) return -ENOENT; std::lock_guard lock(o->omap_mutex); - bufferlist::iterator p = keys_bl.begin(); + auto p = keys_bl.cbegin(); __u32 num; decode(num, p); while (num--) { @@ -1424,7 +1424,7 @@ struct BufferlistObject : public MemStore::Object { encode_base(bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& p) override { + void decode(bufferlist::const_iterator& p) override { DECODE_START(1, p); decode(data, p); decode_base(p); @@ -1533,7 +1533,7 @@ struct MemStore::PageSetObject : public Object { encode_base(bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& p) override { + void decode(bufferlist::const_iterator& p) override { DECODE_START(1, p); decode(data_len, p); data.decode(p); diff --git a/src/os/memstore/MemStore.h b/src/os/memstore/MemStore.h index f31320fc1b64..d73b59afe1de 100644 --- a/src/os/memstore/MemStore.h +++ b/src/os/memstore/MemStore.h @@ -50,7 +50,7 @@ public: uint64_t dstoff) = 0; virtual int truncate(uint64_t offset) = 0; virtual void encode(bufferlist& bl) const = 0; - virtual void decode(bufferlist::iterator& p) = 0; + virtual void decode(bufferlist::const_iterator& p) = 0; void encode_base(bufferlist& bl) const { using ceph::encode; @@ -58,7 +58,7 @@ public: encode(omap_header, bl); encode(omap, bl); } - void decode_base(bufferlist::iterator& p) { + void decode_base(bufferlist::const_iterator& p) { using ceph::decode; decode(xattr, p); decode(omap_header, p); @@ -147,7 +147,7 @@ public: } ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(xattr, p); decode(use_page_set, p); diff --git a/src/os/memstore/PageSet.h b/src/os/memstore/PageSet.h index 9c35592c5484..57a7223a2efc 100644 --- a/src/os/memstore/PageSet.h +++ b/src/os/memstore/PageSet.h @@ -56,7 +56,7 @@ struct Page { bl.append(buffer::copy(data, page_size)); encode(offset, bl); } - void decode(bufferlist::iterator &p, size_t page_size) { + void decode(bufferlist::const_iterator &p, size_t page_size) { using ceph::decode; p.copy(page_size, data); decode(offset, p); @@ -214,7 +214,7 @@ class PageSet { for (auto p = pages.rbegin(); p != pages.rend(); ++p) p->encode(bl, page_size); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { using ceph::decode; assert(empty()); decode(page_size, p); diff --git a/src/osd/ECBackend.cc b/src/osd/ECBackend.cc index 2fde70fdbe16..50eb7583579a 100644 --- a/src/osd/ECBackend.cc +++ b/src/osd/ECBackend.cc @@ -443,7 +443,7 @@ void ECBackend::handle_recovery_read_complete( ECUtil::HashInfo hinfo(ec_impl->get_chunk_count()); if (op.obc->obs.oi.size > 0) { assert(op.xattrs.count(ECUtil::get_hinfo_key())); - bufferlist::iterator bp = op.xattrs[ECUtil::get_hinfo_key()].begin(); + auto bp = op.xattrs[ECUtil::get_hinfo_key()].cbegin(); decode(hinfo, bp); } op.hinfo = unstable_hashinfo_registry.lookup_or_create(hoid, hinfo); @@ -1749,7 +1749,7 @@ ECUtil::HashInfoRef ECBackend::get_hash_info( } } if (bl.length() > 0) { - bufferlist::iterator bp = bl.begin(); + auto bp = bl.cbegin(); try { decode(hinfo, bp); } catch(...) { diff --git a/src/osd/ECMsgTypes.cc b/src/osd/ECMsgTypes.cc index 643b2375c65c..02c3a8e20289 100644 --- a/src/osd/ECMsgTypes.cc +++ b/src/osd/ECMsgTypes.cc @@ -34,7 +34,7 @@ void ECSubWrite::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void ECSubWrite::decode(bufferlist::iterator &bl) +void ECSubWrite::decode(bufferlist::const_iterator &bl) { DECODE_START(4, bl); decode(from, bl); @@ -122,7 +122,7 @@ void ECSubWriteReply::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void ECSubWriteReply::decode(bufferlist::iterator &bl) +void ECSubWriteReply::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(from, bl); @@ -195,7 +195,7 @@ void ECSubRead::encode(bufferlist &bl, uint64_t features) const ENCODE_FINISH(bl); } -void ECSubRead::decode(bufferlist::iterator &bl) +void ECSubRead::decode(bufferlist::const_iterator &bl) { DECODE_START(3, bl); decode(from, bl); @@ -305,7 +305,7 @@ void ECSubReadReply::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void ECSubReadReply::decode(bufferlist::iterator &bl) +void ECSubReadReply::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(from, bl); diff --git a/src/osd/ECMsgTypes.h b/src/osd/ECMsgTypes.h index 793d6f8f4298..40eda36962c2 100644 --- a/src/osd/ECMsgTypes.h +++ b/src/osd/ECMsgTypes.h @@ -78,7 +78,7 @@ struct ECSubWrite { backfill_or_async_recovery = other.backfill_or_async_recovery; } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); private: @@ -96,7 +96,7 @@ struct ECSubWriteReply { bool applied; ECSubWriteReply() : tid(0), committed(false), applied(false) {} void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -109,7 +109,7 @@ struct ECSubRead { set attrs_to_read; map>> subchunks; void encode(bufferlist &bl, uint64_t features) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -122,7 +122,7 @@ struct ECSubReadReply { map> attrs_read; map errors; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; diff --git a/src/osd/ECUtil.cc b/src/osd/ECUtil.cc index b503565e906f..786e2cea4a70 100644 --- a/src/osd/ECUtil.cc +++ b/src/osd/ECUtil.cc @@ -184,7 +184,7 @@ void ECUtil::HashInfo::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void ECUtil::HashInfo::decode(bufferlist::iterator &bl) +void ECUtil::HashInfo::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(total_chunk_size, bl); diff --git a/src/osd/ECUtil.h b/src/osd/ECUtil.h index fb2e8ad283c3..1627741a1084 100644 --- a/src/osd/ECUtil.h +++ b/src/osd/ECUtil.h @@ -116,7 +116,7 @@ public: -1); } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(std::list& o); uint32_t get_chunk_hash(int shard) const { diff --git a/src/osd/HitSet.cc b/src/osd/HitSet.cc index 7578be520afe..227a738769b6 100644 --- a/src/osd/HitSet.cc +++ b/src/osd/HitSet.cc @@ -55,7 +55,7 @@ void HitSet::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void HitSet::decode(bufferlist::iterator &bl) +void HitSet::decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(sealed, bl); @@ -115,7 +115,7 @@ HitSet::Params::Params(const Params& o) // instead. bufferlist bl; o.impl->encode(bl); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); impl->decode(p); } // else we don't need to do anything } @@ -128,7 +128,7 @@ const HitSet::Params& HitSet::Params::operator=(const Params& o) // instead. bufferlist bl; o.impl->encode(bl); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); impl->decode(p); } return *this; @@ -167,7 +167,7 @@ bool HitSet::Params::create_impl(impl_type_t type) return true; } -void HitSet::Params::decode(bufferlist::iterator &bl) +void HitSet::Params::decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); __u8 type; diff --git a/src/osd/HitSet.h b/src/osd/HitSet.h index a846cb4a72aa..5f41321c33f2 100644 --- a/src/osd/HitSet.h +++ b/src/osd/HitSet.h @@ -64,7 +64,7 @@ public: virtual unsigned insert_count() const = 0; virtual unsigned approx_unique_insert_count() const = 0; virtual void encode(bufferlist &bl) const = 0; - virtual void decode(bufferlist::iterator& p) = 0; + virtual void decode(bufferlist::const_iterator& p) = 0; virtual void dump(Formatter *f) const = 0; virtual Impl* clone() const = 0; virtual void seal() {} @@ -84,7 +84,7 @@ public: virtual impl_type_t get_type() const = 0; virtual HitSet::Impl *get_new_impl() const = 0; virtual void encode(bufferlist &bl) const {} - virtual void decode(bufferlist::iterator& p) {} + virtual void decode(bufferlist::const_iterator& p) {} virtual void dump(Formatter *f) const {} virtual void dump_stream(ostream& o) const {} virtual ~Impl() {} @@ -106,7 +106,7 @@ public: const Params& operator=(const Params& o); void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); @@ -159,7 +159,7 @@ public: } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); @@ -227,7 +227,7 @@ public: encode(hits, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) override { + void decode(bufferlist::const_iterator &bl) override { DECODE_START(1, bl); decode(count, bl); decode(hits, bl); @@ -298,7 +298,7 @@ public: encode(hits, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) override { + void decode(bufferlist::const_iterator& bl) override { DECODE_START(1, bl); decode(count, bl); decode(hits, bl); @@ -363,7 +363,7 @@ public: encode(seed, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) override { + void decode(bufferlist::const_iterator& bl) override { DECODE_START(1, bl); decode(fpp_micro, bl); decode(target_size, bl); @@ -398,7 +398,7 @@ public: // oh god bufferlist bl; o.encode(bl); - bufferlist::iterator bli = bl.begin(); + auto bli = std::cbegin(bl); this->decode(bli); } @@ -434,7 +434,7 @@ public: encode(bloom, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) override { + void decode(bufferlist::const_iterator& bl) override { DECODE_START(1, bl); decode(bloom, bl); DECODE_FINISH(bl); diff --git a/src/osd/OSD.cc b/src/osd/OSD.cc index 26c28d6b4126..53318b2663d9 100644 --- a/src/osd/OSD.cc +++ b/src/osd/OSD.cc @@ -1428,7 +1428,7 @@ int OSDService::get_deleted_pool_pg_num(int64_t pool) bufferlist bl; int r = store->read(meta_ch, oid, 0, 0, bl); ceph_assert(r >= 0); - auto blp = bl.begin(); + auto blp = bl.cbegin(); pg_pool_t pi; ::decode(pi, blp); deleted_pool_pg_nums[pool] = pi.get_pg_num(); @@ -1723,8 +1723,7 @@ int OSD::mkfs(CephContext *cct, ObjectStore *store, const string &dev, } /* if we already have superblock, check content of superblock */ dout(0) << " have superblock" << dendl; - bufferlist::iterator p; - p = sbbl.begin(); + auto p = sbbl.cbegin(); decode(sb, p); if (whoami != sb.whoami) { derr << "provided osd id " << whoami << " != superblock's " << sb.whoami @@ -3584,7 +3583,7 @@ int OSD::read_superblock() if (r < 0) return r; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(superblock, p); dout(10) << "read_superblock " << superblock << dendl; @@ -3723,7 +3722,7 @@ PG* OSD::_make_pg( return nullptr; } ceph_assert(r >= 0); - auto p = bl.begin(); + auto p = bl.cbegin(); decode(pi, p); decode(name, p); if (p.end()) { // dev release v13.0.2 did not include ec_profile @@ -6595,7 +6594,7 @@ bool OSD::ms_verify_authorizer(Connection *con, int peer_type, s->auid = auid; if (caps_info.caps.length() > 0) { - bufferlist::iterator p = caps_info.caps.begin(); + auto p = caps_info.caps.cbegin(); string str; try { decode(str, p); @@ -7286,7 +7285,7 @@ void OSD::handle_osd_map(MOSDMap *m) } OSDMap::Incremental inc; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); inc.decode(p); if (o->apply_incremental(inc) < 0) { derr << "ERROR: bad fsid? i have " << osdmap->get_fsid() << " and inc has " << inc.fsid << dendl; diff --git a/src/osd/OSDMap.cc b/src/osd/OSDMap.cc index 94ae5e6b1e9e..03e22ccd5ec9 100644 --- a/src/osd/OSDMap.cc +++ b/src/osd/OSDMap.cc @@ -65,7 +65,7 @@ void osd_info_t::encode(bufferlist& bl) const encode(lost_at, bl); } -void osd_info_t::decode(bufferlist::iterator& bl) +void osd_info_t::decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; @@ -125,7 +125,7 @@ void osd_xinfo_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void osd_xinfo_t::decode(bufferlist::iterator& bl) +void osd_xinfo_t::decode(bufferlist::const_iterator& bl) { DECODE_START(3, bl); decode(down_stamp, bl); @@ -589,7 +589,7 @@ void OSDMap::Incremental::encode(bufferlist& bl, uint64_t features) const have_crc = true; } -void OSDMap::Incremental::decode_classic(bufferlist::iterator &p) +void OSDMap::Incremental::decode_classic(bufferlist::const_iterator &p) { using ceph::decode; __u32 n, t; @@ -689,7 +689,7 @@ void OSDMap::Incremental::decode_classic(bufferlist::iterator &p) decode(new_hb_front_up, p); } -void OSDMap::Incremental::decode(bufferlist::iterator& bl) +void OSDMap::Incremental::decode(bufferlist::const_iterator& bl) { using ceph::decode; /** @@ -869,7 +869,7 @@ void OSDMap::Incremental::dump(Formatter *f) const f->open_object_section("full_map"); OSDMap full; bufferlist fbl = fullmap; // kludge around constness. - auto p = fbl.begin(); + auto p = fbl.cbegin(); full.decode(p); full.dump(f); f->close_section(); @@ -878,7 +878,7 @@ void OSDMap::Incremental::dump(Formatter *f) const f->open_object_section("crush"); CrushWrapper c; bufferlist tbl = crush; // kludge around constness. - auto p = tbl.begin(); + auto p = tbl.cbegin(); c.decode(p); c.dump(f); f->close_section(); @@ -1992,7 +1992,7 @@ int OSDMap::apply_incremental(const Incremental &inc) // do new crush map last (after up/down stuff) if (inc.crush.length()) { bufferlist bl(inc.crush); - auto blp = bl.begin(); + auto blp = bl.cbegin(); crush.reset(new CrushWrapper); crush->decode(blp); if (require_osd_release >= CEPH_RELEASE_LUMINOUS) { @@ -2685,11 +2685,11 @@ void OSDMap::encode(bufferlist& bl, uint64_t features) const void OSDMap::decode(bufferlist& bl) { - auto p = bl.begin(); + auto p = bl.cbegin(); decode(p); } -void OSDMap::decode_classic(bufferlist::iterator& p) +void OSDMap::decode_classic(bufferlist::const_iterator& p) { using ceph::decode; __u32 n, t; @@ -2767,7 +2767,7 @@ void OSDMap::decode_classic(bufferlist::iterator& p) // crush bufferlist cbl; decode(cbl, p); - auto cblp = cbl.begin(); + auto cblp = cbl.cbegin(); crush->decode(cblp); // extended @@ -2810,7 +2810,7 @@ void OSDMap::decode_classic(bufferlist::iterator& p) post_decode(); } -void OSDMap::decode(bufferlist::iterator& bl) +void OSDMap::decode(bufferlist::const_iterator& bl) { using ceph::decode; /** @@ -2876,7 +2876,7 @@ void OSDMap::decode(bufferlist::iterator& bl) // crush bufferlist cbl; decode(cbl, bl); - auto cblp = cbl.begin(); + auto cblp = cbl.cbegin(); crush->decode(cblp); if (struct_v >= 3) { decode(erasure_code_profiles, bl); diff --git a/src/osd/OSDMap.h b/src/osd/OSDMap.h index 9faf95562176..791c1a79f5a6 100644 --- a/src/osd/OSDMap.h +++ b/src/osd/OSDMap.h @@ -76,7 +76,7 @@ struct osd_info_t { void dump(Formatter *f) const; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); static void generate_test_instances(list& o); }; WRITE_CLASS_ENCODER(osd_info_t) @@ -95,7 +95,7 @@ struct osd_xinfo_t { void dump(Formatter *f) const; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); static void generate_test_instances(list& o); }; WRITE_CLASS_ENCODER(osd_xinfo_t) @@ -118,7 +118,7 @@ struct PGTempMap { bl.append((char*)p.second, (*p.second + 1) * sizeof(int32_t)); } } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { using ceph::decode; data.clear(); map.clear(); @@ -126,7 +126,7 @@ struct PGTempMap { decode(n, p); if (!n) return; - bufferlist::iterator pstart = p; + auto pstart = p; size_t start_off = pstart.get_off(); vector> offsets; offsets.resize(n); @@ -153,7 +153,7 @@ struct PGTempMap { void rebuild() { bufferlist bl; encode(bl); - auto p = bl.begin(); + auto p = std::cbegin(bl); decode(p); } friend bool operator==(const PGTempMap& l, const PGTempMap& r) { @@ -260,7 +260,7 @@ struct PGTempMap { void encode(bufferlist& bl) const { encode(pg_temp, bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { decode(pg_temp, p); } friend bool operator==(const PGTempMap& l, const PGTempMap& r) { @@ -418,8 +418,8 @@ public: void encode_client_old(bufferlist& bl) const; void encode_classic(bufferlist& bl, uint64_t features) const; void encode(bufferlist& bl, uint64_t features=CEPH_FEATURES_ALL) const; - void decode_classic(bufferlist::iterator &p); - void decode(bufferlist::iterator &bl); + void decode_classic(bufferlist::const_iterator &p); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); @@ -429,10 +429,10 @@ public: have_crc(false), full_crc(0), inc_crc(0) { } explicit Incremental(bufferlist &bl) { - bufferlist::iterator p = bl.begin(); + auto p = std::cbegin(bl); decode(p); } - explicit Incremental(bufferlist::iterator &p) { + explicit Incremental(bufferlist::const_iterator &p) { decode(p); } @@ -1025,12 +1025,12 @@ public: private: void encode_client_old(bufferlist& bl) const; void encode_classic(bufferlist& bl, uint64_t features) const; - void decode_classic(bufferlist::iterator& p); + void decode_classic(bufferlist::const_iterator& p); void post_decode(); public: void encode(bufferlist& bl, uint64_t features=CEPH_FEATURES_ALL) const; void decode(bufferlist& bl); - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); /**** mapping facilities ****/ diff --git a/src/osd/PG.cc b/src/osd/PG.cc index 59428df4e571..1db7af550595 100644 --- a/src/osd/PG.cc +++ b/src/osd/PG.cc @@ -3516,7 +3516,7 @@ int PG::peek_map_epoch(ObjectStore *store, assert(values.size() == 2); // sanity check version - bufferlist::iterator bp = values[infover_key].begin(); + auto bp = values[infover_key].cbegin(); __u8 struct_v = 0; decode(struct_v, bp); assert(struct_v >= 8); @@ -3702,7 +3702,7 @@ int PG::read_info( assert(values.size() == 3 || values.size() == 4); - bufferlist::iterator p = values[infover_key].begin(); + auto p = values[infover_key].cbegin(); decode(struct_v, p); assert(struct_v >= 10); @@ -3829,7 +3829,7 @@ void PG::update_snap_map( assert(i->snaps.length() > 0); vector snaps; bufferlist snapbl = i->snaps; - bufferlist::iterator p = snapbl.begin(); + auto p = snapbl.cbegin(); try { decode(snaps, p); } catch (...) { @@ -4152,7 +4152,7 @@ void PG::do_replica_scrub_map(OpRequestRef op) op->mark_started(); - bufferlist::iterator p = const_cast(m->get_data()).begin(); + auto p = const_cast(m->get_data()).cbegin(); scrubber.received_maps[m->from].decode(p, info.pgid.pool()); dout(10) << "map version is " << scrubber.received_maps[m->from].valid_through @@ -4388,7 +4388,7 @@ void PG::_scan_snaps(ScrubMap &smap) continue; } bl.push_back(o.attrs[SS_ATTR]); - auto p = bl.begin(); + auto p = bl.cbegin(); try { decode(snapset, p); } catch(...) { @@ -4607,7 +4607,7 @@ void PG::repair_object( bv.push_back(po.attrs[OI_ATTR]); object_info_t oi; try { - bufferlist::iterator bliter = bv.begin(); + auto bliter = bv.cbegin(); decode(oi, bliter); } catch (...) { dout(0) << __func__ << ": Need version of replica, bad object_info_t: " << soid << dendl; diff --git a/src/osd/PGBackend.cc b/src/osd/PGBackend.cc index 6cdbac4001f6..db823d19a524 100644 --- a/src/osd/PGBackend.cc +++ b/src/osd/PGBackend.cc @@ -822,7 +822,7 @@ map::const_iterator } else { ss_bl.push_back(k->second); try { - bufferlist::iterator bliter = ss_bl.begin(); + auto bliter = ss_bl.cbegin(); decode(ss, bliter); if (first_ss_bl.length() == 0) { first_ss_bl.append(ss_bl); @@ -847,7 +847,7 @@ map::const_iterator } else { hk_bl.push_back(k->second); try { - bufferlist::iterator bliter = hk_bl.begin(); + auto bliter = hk_bl.cbegin(); decode(hi, bliter); if (first_hk_bl.length() == 0) { first_hk_bl.append(hk_bl); @@ -872,7 +872,7 @@ map::const_iterator } bl.push_back(k->second); try { - bufferlist::iterator bliter = bl.begin(); + auto bliter = bl.cbegin(); decode(oi, bliter); } catch (...) { // invalid object info, probably corrupt diff --git a/src/osd/PGLog.h b/src/osd/PGLog.h index ffc377b317d2..a057814cc096 100644 --- a/src/osd/PGLog.h +++ b/src/osd/PGLog.h @@ -1309,7 +1309,7 @@ public: if (p->key()[0] == '_') continue; bufferlist bl = p->value();//Copy bufferlist before creating iterator - bufferlist::iterator bp = bl.begin(); + auto bp = bl.cbegin(); if (p->key() == "divergent_priors") { decode(divergent_priors, bp); ldpp_dout(dpp, 20) << "read_log_and_missing " << divergent_priors.size() diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 656eff8f1727..b7d9d89ae4c9 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -817,7 +817,7 @@ void PrimaryLogPG::maybe_force_recovery() class PGLSPlainFilter : public PGLSFilter { string val; public: - int init(bufferlist::iterator ¶ms) override + int init(bufferlist::const_iterator ¶ms) override { try { decode(xattr, params); @@ -840,7 +840,7 @@ public: explicit PGLSParentFilter(CephContext* cct) : cct(cct) { xattr = "_parent"; } - int init(bufferlist::iterator ¶ms) override + int init(bufferlist::const_iterator ¶ms) override { try { decode(parent_ino, params); @@ -859,7 +859,7 @@ public: bool PGLSParentFilter::filter(const hobject_t &obj, bufferlist& xattr_data, bufferlist& outdata) { - bufferlist::iterator iter = xattr_data.begin(); + auto iter = xattr_data.cbegin(); inode_backtrace_t bt; generic_dout(0) << "PGLSParentFilter::filter" << dendl; @@ -911,7 +911,7 @@ bool PrimaryLogPG::pgls_filter(PGLSFilter *filter, hobject_t& sobj, bufferlist& return filter->filter(sobj, bl, outdata); } -int PrimaryLogPG::get_pgls_filter(bufferlist::iterator& iter, PGLSFilter **pfilter) +int PrimaryLogPG::get_pgls_filter(bufferlist::const_iterator& iter, PGLSFilter **pfilter) { string type; PGLSFilter *filter; @@ -1189,7 +1189,7 @@ void PrimaryLogPG::do_pg_op(OpRequestRef op) for (vector::iterator p = ops.begin(); p != ops.end(); ++p) { OSDOp& osd_op = *p; - bufferlist::iterator bp = p->indata.begin(); + auto bp = p->indata.cbegin(); switch (p->op.op) { case CEPH_OSD_OP_PGNLS_FILTER: try { @@ -1581,7 +1581,7 @@ int PrimaryLogPG::do_scrub_ls(MOSDOp *m, OSDOp *osd_op) dout(10) << " scrubls pg=" << m->get_pg() << " != " << info.pgid << dendl; return -EINVAL; // hmm? } - auto bp = osd_op->indata.begin(); + auto bp = osd_op->indata.cbegin(); scrub_ls_arg_t arg; try { arg.decode(bp); @@ -4143,7 +4143,7 @@ void PrimaryLogPG::do_scan( BackfillInterval& bi = peer_backfill_info[from]; bi.begin = m->begin; bi.end = m->end; - bufferlist::iterator p = const_cast(m->get_data()).begin(); + auto p = m->get_data().cbegin(); // take care to preserve ordering! bi.clear_objects(); @@ -4654,14 +4654,14 @@ int PrimaryLogPG::do_tmap2omap(OpContext *ctx, unsigned flags) return do_osd_ops(ctx, ops); } -int PrimaryLogPG::do_tmapup_slow(OpContext *ctx, bufferlist::iterator& bp, OSDOp& osd_op, - bufferlist& bl) +int PrimaryLogPG::do_tmapup_slow(OpContext *ctx, bufferlist::const_iterator& bp, + OSDOp& osd_op, bufferlist& bl) { // decode bufferlist header; map m; if (bl.length()) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(header, p); decode(m, p); assert(p.end()); @@ -4720,9 +4720,9 @@ int PrimaryLogPG::do_tmapup_slow(OpContext *ctx, bufferlist::iterator& bp, OSDOp return 0; } -int PrimaryLogPG::do_tmapup(OpContext *ctx, bufferlist::iterator& bp, OSDOp& osd_op) +int PrimaryLogPG::do_tmapup(OpContext *ctx, bufferlist::const_iterator& bp, OSDOp& osd_op) { - bufferlist::iterator orig_bp = bp; + bufferlist::const_iterator orig_bp = bp; int result = 0; if (bp.end()) { dout(10) << "tmapup is a no-op" << dendl; @@ -4741,7 +4741,7 @@ int PrimaryLogPG::do_tmapup(OpContext *ctx, bufferlist::iterator& bp, OSDOp& osd newop.outdata.hexdump(*_dout); *_dout << dendl; - bufferlist::iterator ip = newop.outdata.begin(); + auto ip = newop.outdata.cbegin(); bufferlist obl; dout(30) << "the update command is: \n"; @@ -4887,7 +4887,7 @@ int PrimaryLogPG::do_tmapup(OpContext *ctx, bufferlist::iterator& bp, OSDOp& osd *_dout << dendl; // sanity check - bufferlist::iterator tp = obl.begin(); + auto tp = obl.cbegin(); bufferlist h; decode(h, tp); map d; @@ -5068,7 +5068,7 @@ struct C_ChecksumRead : public Context { fill_extent_ctx = nullptr; if (osd_op.rval >= 0) { - bufferlist::iterator init_value_bl_it = init_value_bl.begin(); + bufferlist::const_iterator init_value_bl_it = init_value_bl.begin(); osd_op.rval = primary_log_pg->finish_checksum(osd_op, csum_type, &init_value_bl_it, read_bl); } @@ -5076,7 +5076,7 @@ struct C_ChecksumRead : public Context { }; int PrimaryLogPG::do_checksum(OpContext *ctx, OSDOp& osd_op, - bufferlist::iterator *bl_it) + bufferlist::const_iterator *bl_it) { dout(20) << __func__ << dendl; @@ -5185,14 +5185,14 @@ int PrimaryLogPG::do_checksum(OpContext *ctx, OSDOp& osd_op, } } - bufferlist::iterator init_value_bl_it = init_value_bl.begin(); + bufferlist::const_iterator init_value_bl_it = init_value_bl.begin(); return finish_checksum(osd_op, csum_type, &init_value_bl_it, read_op.outdata); } int PrimaryLogPG::finish_checksum(OSDOp& osd_op, Checksummer::CSumType csum_type, - bufferlist::iterator *init_value_bl_it, + bufferlist::const_iterator *init_value_bl_it, const bufferlist &read_bl) { dout(20) << __func__ << dendl; @@ -5630,7 +5630,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector& ops) dout(10) << "do_osd_op " << osd_op << dendl; - bufferlist::iterator bp = osd_op.indata.begin(); + auto bp = osd_op.indata.cbegin(); // user-visible modifcation? switch (op.op) { @@ -6485,7 +6485,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector& ops) result = -EEXIST; /* this is an exclusive create */ } else { if (osd_op.indata.length()) { - bufferlist::iterator p = osd_op.indata.begin(); + auto p = osd_op.indata.cbegin(); string category; try { decode(category, p); @@ -7376,7 +7376,7 @@ int PrimaryLogPG::do_osd_ops(OpContext *ctx, vector& ops) if (cct->_conf->subsys.should_gather()) { dout(20) << "setting vals: " << dendl; map to_set; - bufferlist::iterator pt = to_set_bl.begin(); + bufferlist::const_iterator pt = to_set_bl.begin(); decode(to_set, pt); for (map::iterator i = to_set.begin(); i != to_set.end(); @@ -7570,7 +7570,7 @@ int PrimaryLogPG::_get_tmap(OpContext *ctx, bufferlist *header, bufferlist *vals newop.op.op = CEPH_OSD_OP_TMAPGET; do_osd_ops(ctx, nops); try { - bufferlist::iterator i = newop.outdata.begin(); + bufferlist::const_iterator i = newop.outdata.begin(); decode(*header, i); (*vals).substr_of(newop.outdata, i.get_off(), i.get_remaining()); } catch (...) { @@ -8505,7 +8505,7 @@ struct C_CopyChunk : public Context { } }; -int PrimaryLogPG::do_copy_get(OpContext *ctx, bufferlist::iterator& bp, +int PrimaryLogPG::do_copy_get(OpContext *ctx, bufferlist::const_iterator& bp, OSDOp& osd_op, ObjectContextRef &obc) { object_info_t& oi = obc->obs.oi; @@ -9276,7 +9276,7 @@ void PrimaryLogPG::_write_copy_chunk(CopyOpRef cop, PGTransaction *t) } if (cop->omap_data.length()) { map omap; - bufferlist::iterator p = cop->omap_data.begin(); + bufferlist::const_iterator p = cop->omap_data.begin(); decode(omap, p); t->omap_setkeys(cop->results.temp_oid, omap); cop->omap_data.clear(); @@ -10790,7 +10790,7 @@ ObjectContextRef PrimaryLogPG::get_object_context( object_info_t oi; try { - bufferlist::iterator bliter = bv.begin(); + bufferlist::const_iterator bliter = bv.begin(); decode(oi, bliter); } catch (...) { dout(0) << __func__ << ": obc corrupt: " << soid << dendl; @@ -11168,7 +11168,7 @@ SnapSetContext *PrimaryLogPG::get_snapset_context( ssc = new SnapSetContext(oid.get_snapdir()); _register_snapset_context(ssc); if (bv.length()) { - bufferlist::iterator bvp = bv.begin(); + bufferlist::const_iterator bvp = bv.begin(); try { ssc->snapset.decode(bvp); } catch (buffer::error& e) { @@ -13897,7 +13897,7 @@ void PrimaryLogPG::agent_load_hit_sets() assert(r >= 0); } HitSetRef hs(new HitSet); - bufferlist::iterator pbl = bl.begin(); + bufferlist::const_iterator pbl = bl.begin(); decode(*hs, pbl); agent_state->add_hit_set(p->begin.sec(), hs); } @@ -14687,7 +14687,7 @@ void PrimaryLogPG::scrub_snapshot_metadata( } else { bufferlist bl; bl.push_back(p->second.attrs[SS_ATTR]); - bufferlist::iterator blp = bl.begin(); + auto blp = bl.cbegin(); try { snapset = SnapSet(); // Initialize optional<> before decoding into it decode(snapset.get(), blp); @@ -14953,7 +14953,7 @@ int PrimaryLogPG::rep_repair_primary_object(const hobject_t& soid, OpRequestRef dout(0) << __func__ << ": Need version of replica, objects_get_attr failed: " << soid << " error=" << r << dendl; } else try { - bufferlist::iterator bliter = bv.begin(); + auto bliter = bv.cbegin(); decode(oi, bliter); v = oi.version; } catch (...) { diff --git a/src/osd/PrimaryLogPG.h b/src/osd/PrimaryLogPG.h index 15f2c0f150c3..c07605cff6aa 100644 --- a/src/osd/PrimaryLogPG.h +++ b/src/osd/PrimaryLogPG.h @@ -1269,7 +1269,7 @@ protected: // -- copyfrom -- map copy_ops; - int do_copy_get(OpContext *ctx, bufferlist::iterator& bp, OSDOp& op, + int do_copy_get(OpContext *ctx, bufferlist::const_iterator& bp, OSDOp& op, ObjectContextRef& obc); int finish_copy_get(); @@ -1348,9 +1348,9 @@ protected: int do_xattr_cmp_str(int op, string& v1s, bufferlist& xattr); // -- checksum -- - int do_checksum(OpContext *ctx, OSDOp& osd_op, bufferlist::iterator *bl_it); + int do_checksum(OpContext *ctx, OSDOp& osd_op, bufferlist::const_iterator *bl_it); int finish_checksum(OSDOp& osd_op, Checksummer::CSumType csum_type, - bufferlist::iterator *init_value_bl_it, + bufferlist::const_iterator *init_value_bl_it, const bufferlist &read_bl); friend class C_ChecksumRead; @@ -1365,7 +1365,7 @@ protected: int do_writesame(OpContext *ctx, OSDOp& osd_op); bool pgls_filter(PGLSFilter *filter, hobject_t& sobj, bufferlist& outdata); - int get_pgls_filter(bufferlist::iterator& iter, PGLSFilter **pfilter); + int get_pgls_filter(bufferlist::const_iterator& iter, PGLSFilter **pfilter); map> in_progress_proxy_ops; void kick_proxy_ops_blocked(hobject_t& soid); @@ -1455,8 +1455,8 @@ public: int _get_tmap(OpContext *ctx, bufferlist *header, bufferlist *vals); int do_tmap2omap(OpContext *ctx, unsigned flags); - int do_tmapup(OpContext *ctx, bufferlist::iterator& bp, OSDOp& osd_op); - int do_tmapup_slow(OpContext *ctx, bufferlist::iterator& bp, OSDOp& osd_op, bufferlist& bl); + int do_tmapup(OpContext *ctx, bufferlist::const_iterator& bp, OSDOp& osd_op); + int do_tmapup_slow(OpContext *ctx, bufferlist::const_iterator& bp, OSDOp& osd_op, bufferlist& bl); void do_osd_op_effects(OpContext *ctx, const ConnectionRef& conn); private: diff --git a/src/osd/ReplicatedBackend.cc b/src/osd/ReplicatedBackend.cc index d6d1f731053a..013682db9d8e 100644 --- a/src/osd/ReplicatedBackend.cc +++ b/src/osd/ReplicatedBackend.cc @@ -1021,7 +1021,7 @@ void ReplicatedBackend::do_repop(OpRequestRef op) // shipped transaction and log entries vector log; - bufferlist::iterator p = const_cast(m->get_data()).begin(); + auto p = const_cast(m->get_data()).cbegin(); decode(rm->opt, p); if (m->new_temp_oid != hobject_t()) { @@ -1838,7 +1838,7 @@ int ReplicatedBackend::build_push_op(const ObjectRecoveryInfo &recovery_info, bufferlist bv = out_op->attrset[OI_ATTR]; object_info_t oi; try { - bufferlist::iterator bliter = bv.begin(); + auto bliter = bv.cbegin(); decode(oi, bliter); } catch (...) { dout(0) << __func__ << ": bad object_info_t: " << recovery_info.soid << dendl; diff --git a/src/osd/SnapMapper.cc b/src/osd/SnapMapper.cc index 348d7a3e224c..ee8615baee32 100644 --- a/src/osd/SnapMapper.cc +++ b/src/osd/SnapMapper.cc @@ -63,7 +63,7 @@ struct Mapping { encode(hoid, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(snap, bl); decode(hoid, bl); @@ -103,7 +103,7 @@ pair SnapMapper::from_raw( { Mapping map; bufferlist bl(image.second); - bufferlist::iterator bp(bl.begin()); + auto bp = bl.cbegin(); decode(map, bp); return make_pair(map.snap, map.hoid); } @@ -126,7 +126,7 @@ void SnapMapper::object_snaps::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void SnapMapper::object_snaps::decode(bufferlist::iterator &bl) +void SnapMapper::object_snaps::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(oid, bl); @@ -163,7 +163,7 @@ int SnapMapper::get_snaps( return -ENOENT; } if (out) { - bufferlist::iterator bp = got.begin()->second.begin(); + auto bp = got.begin()->second.cbegin(); decode(*out, bp); dout(20) << __func__ << " " << oid << " " << out->snaps << dendl; if (out->snaps.empty()) { diff --git a/src/osd/SnapMapper.h b/src/osd/SnapMapper.h index 99a7c8310187..f553ba45d37b 100644 --- a/src/osd/SnapMapper.h +++ b/src/osd/SnapMapper.h @@ -108,7 +108,7 @@ public: : oid(oid), snaps(snaps) {} object_snaps() {} void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bp); + void decode(bufferlist::const_iterator &bp); }; private: diff --git a/src/osd/osd_types.cc b/src/osd/osd_types.cc index 6a0dd549c60b..ec39aa9e5097 100644 --- a/src/osd/osd_types.cc +++ b/src/osd/osd_types.cc @@ -144,7 +144,7 @@ void pg_shard_t::encode(bufferlist &bl) const encode(shard, bl); ENCODE_FINISH(bl); } -void pg_shard_t::decode(bufferlist::iterator &bl) +void pg_shard_t::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(osd, bl); @@ -194,7 +194,7 @@ void object_locator_t::encode(bufferlist& bl) const ENCODE_FINISH_NEW_COMPAT(bl, encode_compat); } -void object_locator_t::decode(bufferlist::iterator& p) +void object_locator_t::decode(bufferlist::const_iterator& p) { DECODE_START_LEGACY_COMPAT_LEN(6, 3, 3, p); if (struct_v < 2) { @@ -248,7 +248,7 @@ void request_redirect_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void request_redirect_t::decode(bufferlist::iterator& bl) +void request_redirect_t::decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(redirect_locator, bl); @@ -303,7 +303,7 @@ void objectstore_perf_stat_t::encode(bufferlist &bl, uint64_t features) const ENCODE_FINISH(bl); } -void objectstore_perf_stat_t::decode(bufferlist::iterator &bl) +void objectstore_perf_stat_t::decode(bufferlist::const_iterator &bl) { DECODE_START(2, bl); if (struct_v >= 2) { @@ -370,7 +370,7 @@ void osd_stat_t::encode(bufferlist &bl, uint64_t features) const ENCODE_FINISH(bl); } -void osd_stat_t::decode(bufferlist::iterator &bl) +void osd_stat_t::decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(6, 2, 2, bl); decode(kb, bl); @@ -701,7 +701,7 @@ size_t coll_t::encoded_size() const return r; } -void coll_t::decode(bufferlist::iterator& bl) +void coll_t::decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 struct_v; @@ -959,7 +959,7 @@ void pool_snap_info_t::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void pool_snap_info_t::decode(bufferlist::iterator& bl) +void pool_snap_info_t::decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl); decode(snapid, bl); @@ -1112,7 +1112,7 @@ void pool_opts_t::encode(bufferlist& bl) const { ENCODE_FINISH(bl); } -void pool_opts_t::decode(bufferlist::iterator& bl) { +void pool_opts_t::decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); __u32 n; decode(n, bl); @@ -1647,7 +1647,7 @@ void pg_pool_t::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void pg_pool_t::decode(bufferlist::iterator& bl) +void pg_pool_t::decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(27, 5, 5, bl); decode(type, bl); @@ -2028,7 +2028,7 @@ void object_stat_sum_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void object_stat_sum_t::decode(bufferlist::iterator& bl) +void object_stat_sum_t::decode(bufferlist::const_iterator& bl) { bool decode_finish = false; DECODE_START(18, bl); // make sure to also update fast decode below @@ -2269,7 +2269,7 @@ void object_stat_collection_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void object_stat_collection_t::decode(bufferlist::iterator& bl) +void object_stat_collection_t::decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl); decode(sum, bl); @@ -2442,7 +2442,7 @@ void pg_stat_t::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void pg_stat_t::decode(bufferlist::iterator &bl) +void pg_stat_t::decode(bufferlist::const_iterator &bl) { bool tmp; uint32_t old_state; @@ -2642,7 +2642,7 @@ void pool_stat_t::encode(bufferlist &bl, uint64_t features) const ENCODE_FINISH(bl); } -void pool_stat_t::decode(bufferlist::iterator &bl) +void pool_stat_t::decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(6, 5, 5, bl); if (struct_v >= 4) { @@ -2720,7 +2720,7 @@ void pg_history_t::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void pg_history_t::decode(bufferlist::iterator &bl) +void pg_history_t::decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(9, 4, 4, bl); decode(epoch_created, bl); @@ -2840,7 +2840,7 @@ void pg_info_t::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void pg_info_t::decode(bufferlist::iterator &bl) +void pg_info_t::decode(bufferlist::const_iterator &bl) { DECODE_START(32, bl); decode(pgid.pgid, bl); @@ -2944,7 +2944,7 @@ void pg_notify_t::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void pg_notify_t::decode(bufferlist::iterator &bl) +void pg_notify_t::decode(bufferlist::const_iterator &bl) { DECODE_START(2, bl); decode(query_epoch, bl); @@ -3001,7 +3001,7 @@ void PastIntervals::pg_interval_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void PastIntervals::pg_interval_t::decode(bufferlist::iterator& bl) +void PastIntervals::pg_interval_t::decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(4, 2, 2, bl); decode(first, bl); @@ -3098,7 +3098,7 @@ struct compact_interval_t { encode(acting, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(first, bl); decode(last, bl); @@ -3193,7 +3193,7 @@ public: encode(intervals, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) override { + void decode(bufferlist::const_iterator &bl) override { DECODE_START(1, bl); decode(first, bl); decode(last, bl); @@ -3296,7 +3296,7 @@ ostream& operator<<(ostream& out, const PastIntervals::PriorSet &i) << ")"; } -void PastIntervals::decode(bufferlist::iterator &bl) +void PastIntervals::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); __u8 type = 0; @@ -3639,7 +3639,7 @@ void pg_query_t::encode(bufferlist &bl, uint64_t features) const { ENCODE_FINISH(bl); } -void pg_query_t::decode(bufferlist::iterator &bl) { +void pg_query_t::decode(bufferlist::const_iterator &bl) { DECODE_START(3, bl); decode(type, bl); decode(since, bl); @@ -3678,7 +3678,7 @@ void pg_query_t::generate_test_instances(list& o) // -- ObjectModDesc -- void ObjectModDesc::visit(Visitor *visitor) const { - bufferlist::iterator bp = bl.begin(); + auto bp = bl.cbegin(); try { while (!bp.end()) { DECODE_START(max_required_version, bp); @@ -3835,7 +3835,7 @@ void ObjectModDesc::encode(bufferlist &_bl) const encode(bl, _bl); ENCODE_FINISH(_bl); } -void ObjectModDesc::decode(bufferlist::iterator &_bl) +void ObjectModDesc::decode(bufferlist::const_iterator &_bl) { DECODE_START(2, _bl); max_required_version = struct_v; @@ -3865,7 +3865,7 @@ void pg_log_entry_t::encode_with_checksum(bufferlist& bl) const encode(crc, bl); } -void pg_log_entry_t::decode_with_checksum(bufferlist::iterator& p) +void pg_log_entry_t::decode_with_checksum(bufferlist::const_iterator& p) { using ceph::decode; bufferlist bl; @@ -3874,7 +3874,7 @@ void pg_log_entry_t::decode_with_checksum(bufferlist::iterator& p) decode(crc, p); if (crc != bl.crc32c(0)) throw buffer::malformed_input("bad checksum on pg_log_entry_t"); - bufferlist::iterator q = bl.begin(); + auto q = bl.cbegin(); this->decode(q); } @@ -3910,7 +3910,7 @@ void pg_log_entry_t::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void pg_log_entry_t::decode(bufferlist::iterator &bl) +void pg_log_entry_t::decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(11, 4, 4, bl); decode(op, bl); @@ -3991,7 +3991,7 @@ void pg_log_entry_t::dump(Formatter *f) const if (snaps.length() > 0) { vector v; bufferlist c = snaps; - bufferlist::iterator p = c.begin(); + auto p = c.cbegin(); try { using ceph::decode; decode(v, p); @@ -4031,7 +4031,7 @@ ostream& operator<<(ostream& out, const pg_log_entry_t& e) if (e.snaps.length()) { vector snaps; bufferlist c = e.snaps; - bufferlist::iterator p = c.begin(); + auto p = c.cbegin(); try { decode(snaps, p); } catch (...) { @@ -4064,7 +4064,7 @@ void pg_log_dup_t::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void pg_log_dup_t::decode(bufferlist::iterator &bl) +void pg_log_dup_t::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(reqid, bl); @@ -4153,7 +4153,7 @@ void pg_log_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void pg_log_t::decode(bufferlist::iterator &bl, int64_t pool) +void pg_log_t::decode(bufferlist::const_iterator &bl, int64_t pool) { DECODE_START_LEGACY_COMPAT_LEN(7, 3, 3, bl); decode(head, bl); @@ -4313,7 +4313,7 @@ void object_copy_cursor_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void object_copy_cursor_t::decode(bufferlist::iterator &bl) +void object_copy_cursor_t::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(attr_complete, bl); @@ -4372,7 +4372,7 @@ void object_copy_data_t::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void object_copy_data_t::decode(bufferlist::iterator& bl) +void object_copy_data_t::decode(bufferlist::const_iterator& bl) { DECODE_START(7, bl); if (struct_v < 5) { @@ -4513,7 +4513,7 @@ void pg_create_t::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void pg_create_t::decode(bufferlist::iterator &bl) +void pg_create_t::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(created, bl); @@ -4548,7 +4548,7 @@ void pg_hit_set_info_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void pg_hit_set_info_t::decode(bufferlist::iterator& p) +void pg_hit_set_info_t::decode(bufferlist::const_iterator& p) { DECODE_START(2, p); decode(begin, p); @@ -4597,7 +4597,7 @@ void pg_hit_set_history_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void pg_hit_set_history_t::decode(bufferlist::iterator& p) +void pg_hit_set_history_t::decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(current_last_update, p); @@ -4654,7 +4654,7 @@ void OSDSuperblock::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void OSDSuperblock::decode(bufferlist::iterator &bl) +void OSDSuperblock::decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(8, 5, 5, bl); if (struct_v < 3) { @@ -4734,7 +4734,7 @@ void SnapSet::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void SnapSet::decode(bufferlist::iterator& bl) +void SnapSet::decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(3, 2, 2, bl); decode(seq, bl); @@ -4894,7 +4894,7 @@ void watch_info_t::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void watch_info_t::decode(bufferlist::iterator& bl) +void watch_info_t::decode(bufferlist::const_iterator& bl) { DECODE_START_LEGACY_COMPAT_LEN(4, 3, 3, bl); decode(cookie, bl); @@ -4948,7 +4948,7 @@ void chunk_info_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void chunk_info_t::decode(bufferlist::iterator& bl) +void chunk_info_t::decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(offset, bl); @@ -4994,7 +4994,7 @@ void object_manifest_t::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void object_manifest_t::decode(bufferlist::iterator& bl) +void object_manifest_t::decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(type, bl); @@ -5113,7 +5113,7 @@ void object_info_t::encode(bufferlist& bl, uint64_t features) const ENCODE_FINISH(bl); } -void object_info_t::decode(bufferlist::iterator& bl) +void object_info_t::decode(bufferlist::const_iterator& bl) { object_locator_t myoloc; DECODE_START_LEGACY_COMPAT_LEN(17, 8, 8, bl); @@ -5286,7 +5286,7 @@ void ObjectRecoveryProgress::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void ObjectRecoveryProgress::decode(bufferlist::iterator &bl) +void ObjectRecoveryProgress::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(first, bl); @@ -5352,7 +5352,7 @@ void ObjectRecoveryInfo::encode(bufferlist &bl, uint64_t features) const ENCODE_FINISH(bl); } -void ObjectRecoveryInfo::decode(bufferlist::iterator &bl, +void ObjectRecoveryInfo::decode(bufferlist::const_iterator &bl, int64_t pool) { DECODE_START(2, bl); @@ -5443,7 +5443,7 @@ void PushReplyOp::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void PushReplyOp::decode(bufferlist::iterator &bl) +void PushReplyOp::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(soid, bl); @@ -5495,7 +5495,7 @@ void PullOp::encode(bufferlist &bl, uint64_t features) const ENCODE_FINISH(bl); } -void PullOp::decode(bufferlist::iterator &bl) +void PullOp::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(soid, bl); @@ -5567,7 +5567,7 @@ void PushOp::encode(bufferlist &bl, uint64_t features) const ENCODE_FINISH(bl); } -void PushOp::decode(bufferlist::iterator &bl) +void PushOp::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(soid, bl); @@ -5676,7 +5676,7 @@ void ScrubMap::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void ScrubMap::decode(bufferlist::iterator& bl, int64_t pool) +void ScrubMap::decode(bufferlist::const_iterator& bl, int64_t pool) { DECODE_START_LEGACY_COMPAT_LEN(3, 2, 2, bl); decode(objects, bl); @@ -5761,7 +5761,7 @@ void ScrubMap::object::encode(bufferlist& bl) const ENCODE_FINISH(bl); } -void ScrubMap::object::decode(bufferlist::iterator& bl) +void ScrubMap::object::decode(bufferlist::const_iterator& bl) { DECODE_START(9, bl); decode(size, bl); diff --git a/src/osd/osd_types.h b/src/osd/osd_types.h index 97ef9a7e25b8..994447e8e934 100644 --- a/src/osd/osd_types.h +++ b/src/osd/osd_types.h @@ -158,7 +158,7 @@ struct pg_shard_t { } string get_osd() const { return (osd == NO_OSD ? "NONE" : to_string(osd)); } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const { f->dump_unsigned("osd", osd); if (shard != shard_id_t::NO_SHARD) { @@ -262,7 +262,7 @@ struct object_locator_t { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -316,7 +316,7 @@ public: } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -355,7 +355,7 @@ struct old_pg_t { void encode(bufferlist& bl) const { ::encode_raw(v, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { ::decode_raw(v, bl); } }; @@ -436,7 +436,7 @@ struct pg_t { encode(m_seed, bl); encode((int32_t)-1, bl); // was preferred } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 v; decode(v, bl); @@ -444,7 +444,7 @@ struct pg_t { decode(m_seed, bl); bl.advance(sizeof(int32_t)); // was preferred } - void decode_old(bufferlist::iterator& bl) { + void decode_old(bufferlist::const_iterator& bl) { using ceph::decode; old_pg_t opg; decode(opg, bl); @@ -553,7 +553,7 @@ struct spg_t { encode(shard, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(pgid, bl); decode(shard, bl); @@ -693,7 +693,7 @@ public: } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); size_t encoded_size() const; inline bool operator==(const coll_t& rhs) const { @@ -831,7 +831,7 @@ public: encode(epoch, bl); #endif } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { #if defined(CEPH_LITTLE_ENDIAN) bl.copy(sizeof(version_t) + sizeof(epoch_t), (char *)this); #else @@ -841,7 +841,7 @@ public: #endif } void decode(bufferlist& bl) { - bufferlist::iterator p = bl.begin(); + auto p = std::cbegin(bl); decode(p); } }; @@ -897,7 +897,7 @@ struct objectstore_perf_stat_t { } void dump(Formatter *f) const; void encode(bufferlist &bl, uint64_t features) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); static void generate_test_instances(std::list& o); }; WRITE_CLASS_ENCODER_FEATURES(objectstore_perf_stat_t) @@ -945,7 +945,7 @@ struct osd_stat_t { void dump(Formatter *f) const; void encode(bufferlist &bl, uint64_t features) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); static void generate_test_instances(std::list& o); }; WRITE_CLASS_ENCODER_FEATURES(osd_stat_t) @@ -1029,7 +1029,7 @@ struct pool_snap_info_t { void dump(Formatter *f) const; void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); static void generate_test_instances(list& o); }; WRITE_CLASS_ENCODER_FEATURES(pool_snap_info_t) @@ -1114,7 +1114,7 @@ public: void dump(Formatter *f) const; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); private: typedef std::map opts_t; @@ -1613,7 +1613,7 @@ public: uint32_t get_random_pg_position(pg_t pgid, uint32_t seed) const; void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); static void generate_test_instances(list& o); }; @@ -1867,7 +1867,7 @@ struct object_stat_sum_t { "object_stat_sum_t have padding"); } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); static void generate_test_instances(list& o); }; WRITE_CLASS_ENCODER(object_stat_sum_t) @@ -1891,7 +1891,7 @@ struct object_stat_collection_t { void dump(Formatter *f) const; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); static void generate_test_instances(list& o); bool is_zero() const { @@ -2058,7 +2058,7 @@ struct pg_stat_t { void dump(Formatter *f) const; void dump_brief(Formatter *f) const; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); static void generate_test_instances(list& o); }; WRITE_CLASS_ENCODER(pg_stat_t) @@ -2115,7 +2115,7 @@ struct pool_stat_t { void dump(Formatter *f) const; void encode(bufferlist &bl, uint64_t features) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); static void generate_test_instances(list& o); }; WRITE_CLASS_ENCODER_FEATURES(pool_stat_t) @@ -2147,7 +2147,7 @@ struct pg_hit_set_info_t { : using_gmt(using_gmt) {} void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -2171,7 +2171,7 @@ struct pg_hit_set_history_t { } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -2307,7 +2307,7 @@ struct pg_history_t { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -2400,7 +2400,7 @@ struct pg_info_t { bool is_incomplete() const { return !last_backfill.is_max(); } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& p); + void decode(bufferlist::const_iterator& p); void dump(Formatter *f) const; bool overlaps_with(const pg_info_t &oinfo) const { return last_update > oinfo.log_tail ? @@ -2553,7 +2553,7 @@ struct pg_fast_info_t { encode(stats.stats.sum.num_objects_dirty, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& p) { + void decode(bufferlist::const_iterator& p) { DECODE_START(1, p); decode(last_update, p); decode(last_complete, p); @@ -2603,7 +2603,7 @@ struct pg_notify_t { assert(from == info.pgid.shard); } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &p); + void decode(bufferlist::const_iterator &p); void dump(Formatter *f) const; static void generate_test_instances(list &o); }; @@ -2645,7 +2645,7 @@ public: {} void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -2669,7 +2669,7 @@ public: virtual unique_ptr clone() const = 0; virtual ostream &print(ostream &out) const = 0; virtual void encode(bufferlist &bl) const = 0; - virtual void decode(bufferlist::iterator &bl) = 0; + virtual void decode(bufferlist::const_iterator &bl) = 0; virtual void dump(Formatter *f) const = 0; virtual void iterate_mayberw_back_to( bool ec_pool, @@ -2710,7 +2710,7 @@ public: ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const { assert(past_intervals); @@ -3128,7 +3128,7 @@ struct pg_query_t { } void encode(bufferlist &bl, uint64_t features) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); @@ -3307,7 +3307,7 @@ public: bl.rebuild(); } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -3435,10 +3435,10 @@ struct pg_log_entry_t { string get_key_name() const; void encode_with_checksum(bufferlist& bl) const; - void decode_with_checksum(bufferlist::iterator& p); + void decode_with_checksum(bufferlist::const_iterator& p); void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); @@ -3468,7 +3468,7 @@ struct pg_log_dup_t { string get_key_name() const; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); @@ -3673,7 +3673,7 @@ public: ostream& print(ostream& out) const; void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl, int64_t pool = -1); + void decode(bufferlist::const_iterator &bl, int64_t pool = -1); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -3723,7 +3723,7 @@ struct pg_missing_item { encode(have, bl); } } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; eversion_t e; decode(e, bl); @@ -4009,7 +4009,7 @@ public: encode(may_include_deletes, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl, int64_t pool = -1) { + void decode(bufferlist::const_iterator &bl, int64_t pool = -1) { for (auto const &i: missing) tracker.changed(i.first); DECODE_START_LEGACY_COMPAT_LEN(4, 2, 2, bl); @@ -4141,7 +4141,7 @@ void encode( ENCODE_DUMP_POST(cl); } template -void decode(pg_missing_set &c, bufferlist::iterator &p) { +void decode(pg_missing_set &c, bufferlist::const_iterator &p) { c.decode(p); } template @@ -4178,7 +4178,7 @@ struct pg_nls_response_t { } ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(handle, bl); __u32 n; @@ -4242,7 +4242,7 @@ struct pg_ls_response_t { encode(handle, bl); encode(entries, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; __u8 v; decode(v, bl); @@ -4298,7 +4298,7 @@ struct object_copy_cursor_t { static void generate_test_instances(list& o); void encode(bufferlist& bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; }; WRITE_CLASS_ENCODER(object_copy_cursor_t) @@ -4352,7 +4352,7 @@ public: static void generate_test_instances(list& o); void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; }; WRITE_CLASS_ENCODER_FEATURES(object_copy_data_t) @@ -4371,7 +4371,7 @@ struct pg_create_t { : created(c), parent(p), split_bits(s) {} void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -4448,7 +4448,7 @@ public: } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -4487,7 +4487,7 @@ struct SnapSet { SnapSet() : seq(0) {} explicit SnapSet(bufferlist& bl) { - bufferlist::iterator p = bl.begin(); + auto p = std::cbegin(bl); decode(p); } @@ -4498,7 +4498,7 @@ struct SnapSet { uint64_t get_clone_bytes(snapid_t clone) const; void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); @@ -4536,7 +4536,7 @@ struct watch_info_t { watch_info_t(uint64_t c, uint32_t t, const entity_addr_t& a) : cookie(c), timeout_seconds(t), addr(a) {} void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -4594,7 +4594,7 @@ struct chunk_info_t { return r; } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; friend ostream& operator<<(ostream& out, const chunk_info_t& ci); }; @@ -4643,7 +4643,7 @@ struct object_manifest_t { } static void generate_test_instances(list& o); void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); void dump(Formatter *f) const; friend ostream& operator<<(ostream& out, const object_info_t& oi); }; @@ -4786,9 +4786,9 @@ struct object_info_t { } void encode(bufferlist& bl, uint64_t features) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void decode(bufferlist& bl) { - bufferlist::iterator p = bl.begin(); + auto p = std::cbegin(bl); decode(p); } void dump(Formatter *f) const; @@ -4835,7 +4835,7 @@ struct ObjectRecoveryInfo { static void generate_test_instances(list& o); void encode(bufferlist &bl, uint64_t features) const; - void decode(bufferlist::iterator &bl, int64_t pool = -1); + void decode(bufferlist::const_iterator &bl, int64_t pool = -1); ostream &print(ostream &out) const; void dump(Formatter *f) const; }; @@ -4864,7 +4864,7 @@ struct ObjectRecoveryProgress { static void generate_test_instances(list& o); void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); ostream &print(ostream &out) const; void dump(Formatter *f) const; }; @@ -4876,7 +4876,7 @@ struct PushReplyOp { static void generate_test_instances(list& o); void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); ostream &print(ostream &out) const; void dump(Formatter *f) const; @@ -4893,7 +4893,7 @@ struct PullOp { static void generate_test_instances(list& o); void encode(bufferlist &bl, uint64_t features) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); ostream &print(ostream &out) const; void dump(Formatter *f) const; @@ -4917,7 +4917,7 @@ struct PushOp { static void generate_test_instances(list& o); void encode(bufferlist &bl, uint64_t features) const; - void decode(bufferlist::iterator &bl); + void decode(bufferlist::const_iterator &bl); ostream &print(ostream &out) const; void dump(Formatter *f) const; @@ -4955,7 +4955,7 @@ struct ScrubMap { ec_size_mismatch(false), large_omap_object_found(false) {} void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl); + void decode(bufferlist::const_iterator& bl); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -4978,7 +4978,7 @@ struct ScrubMap { } void encode(bufferlist& bl) const; - void decode(bufferlist::iterator& bl, int64_t pool=-1); + void decode(bufferlist::const_iterator& bl, int64_t pool=-1); void dump(Formatter *f) const; static void generate_test_instances(list& o); }; @@ -5115,7 +5115,7 @@ struct watch_item_t { encode(addr, bl, features); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(2, bl); decode(name, bl); decode(cookie, bl); @@ -5145,7 +5145,7 @@ struct obj_list_watch_response_t { encode(entries, bl, features); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(entries, bl); DECODE_FINISH(bl); @@ -5201,7 +5201,7 @@ struct clone_info { encode(size, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(cloneid, bl); decode(snaps, bl); @@ -5261,7 +5261,7 @@ struct obj_list_snap_response_t { encode(seq, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(2, bl); decode(clones, bl); if (struct_v >= 2) diff --git a/src/osdc/Journaler.cc b/src/osdc/Journaler.cc index 4cff1bad3ca2..692448f23a2b 100644 --- a/src/osdc/Journaler.cc +++ b/src/osdc/Journaler.cc @@ -228,7 +228,7 @@ void Journaler::_finish_reread_head(int r, bufferlist& bl, Context *finish) // unpack header if (r == 0) { Header h; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { decode(h, p); } catch (const buffer::error &e) { @@ -275,7 +275,7 @@ void Journaler::_finish_read_head(int r, bufferlist& bl) // unpack header bool corrupt = false; Header h; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { decode(h, p); @@ -1411,7 +1411,7 @@ bool JournalStream::readable(bufferlist &read_buf, uint64_t *need) const uint32_t entry_size = 0; uint64_t entry_sentinel = 0; - bufferlist::iterator p = read_buf.begin(); + auto p = read_buf.cbegin(); // Do we have enough data to decode an entry prefix? if (format >= JOURNAL_FORMAT_RESILIENT) { @@ -1471,7 +1471,7 @@ size_t JournalStream::read(bufferlist &from, bufferlist *entry, uint32_t entry_size = 0; // Consume envelope prefix: entry_size and entry_sentinel - bufferlist::iterator from_ptr = from.begin(); + auto from_ptr = from.cbegin(); if (format >= JOURNAL_FORMAT_RESILIENT) { uint64_t entry_sentinel = 0; decode(entry_sentinel, from_ptr); diff --git a/src/osdc/Journaler.h b/src/osdc/Journaler.h index 0b8caa09ac7d..d001d20383b2 100644 --- a/src/osdc/Journaler.h +++ b/src/osdc/Journaler.h @@ -158,7 +158,7 @@ public: encode(stream_format, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START_LEGACY_COMPAT_LEN(2, 2, 2, bl); decode(magic, bl); decode(trimmed_pos, bl); diff --git a/src/osdc/Objecter.cc b/src/osdc/Objecter.cc index 6118197a281c..ede51ccabf09 100644 --- a/src/osdc/Objecter.cc +++ b/src/osdc/Objecter.cc @@ -603,7 +603,7 @@ void Objecter::_linger_commit(LingerOp *info, int r, bufferlist& outbl) if (!info->is_watch) { // make note of the notify_id - bufferlist::iterator p = outbl.begin(); + auto p = outbl.cbegin(); try { decode(info->notify_id, p); ldout(cct, 10) << "_linger_commit notify_id=" << info->notify_id @@ -3776,7 +3776,7 @@ void Objecter::_nlist_reply(NListContext *list_context, int r, { ldout(cct, 10) << __func__ << " " << list_context << dendl; - bufferlist::iterator iter = list_context->bl.begin(); + auto iter = list_context->bl.cbegin(); pg_nls_response_t response; bufferlist extra_info; decode(response, iter); @@ -3875,7 +3875,7 @@ struct C_SelfmanagedSnap : public Context { void finish(int r) override { if (r == 0) { try { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(*psnapid, p); } catch (buffer::error&) { r = -EIO; @@ -5155,7 +5155,7 @@ void Objecter::_enumerate_reply( assert(next != NULL); // Decode the results - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); pg_nls_response_t response; // XXX extra_info doesn't seem used anywhere? @@ -5227,7 +5227,7 @@ namespace { void do_decode(std::vector& items, std::vector& bls) { for (auto bl : bls) { - auto p = bl.begin(); + auto p = bl.cbegin(); T t; decode(t, p); items.push_back(t); @@ -5269,7 +5269,7 @@ namespace { private: void decode() { scrub_ls_result_t result; - auto p = bl.begin(); + auto p = bl.cbegin(); result.decode(p); *interval = result.interval; if (objects) { diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h index b37c5de90a03..0cb9861e3e74 100644 --- a/src/osdc/Objecter.h +++ b/src/osdc/Objecter.h @@ -233,7 +233,7 @@ struct ObjectOperation { : psize(ps), pmtime(pm), ptime(pt), pts(_pts), prval(prval) {} void finish(int r) override { if (r >= 0) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { uint64_t size; ceph::real_time mtime; @@ -332,7 +332,7 @@ struct ObjectOperation { int *prval) : data_bl(data_bl), extents(extents), prval(prval) {} void finish(int r) override { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); if (r >= 0) { // NOTE: it's possible the sub-op has not been executed but the result // code remains zeroed. Avoid the costly exception handling on a @@ -442,7 +442,7 @@ struct ObjectOperation { } void finish(int r) override { if (r >= 0) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { if (pattrs) decode(*pattrs, p); @@ -484,7 +484,7 @@ struct ObjectOperation { } void finish(int r) override { if (r >= 0) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { if (pattrs) decode(*pattrs, p); @@ -519,7 +519,7 @@ struct ObjectOperation { : pwatchers(pw), prval(pr) {} void finish(int r) override { if (r >= 0) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { obj_list_watch_response_t resp; decode(resp, p); @@ -552,7 +552,7 @@ struct ObjectOperation { : psnaps(ps), prval(pr) {} void finish(int r) override { if (r >= 0) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { obj_list_snap_response_t resp; decode(resp, p); @@ -766,7 +766,7 @@ struct ObjectOperation { if (r < 0 && r != -ENOENT) return; try { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); object_copy_data_t copy_reply; decode(copy_reply, p); if (r == -ENOENT) { @@ -858,7 +858,7 @@ struct ObjectOperation { if (r < 0) return; try { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); bool isdirty; decode(isdirty, p); if (pisdirty) @@ -894,7 +894,7 @@ struct ObjectOperation { if (r < 0) return; try { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); std::list< std::pair > ls; decode(ls, p); if (ptls) { @@ -1478,7 +1478,7 @@ public: psize(ps), pmtime(pm), fin(c) {} void finish(int r) override { if (r >= 0) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); uint64_t s; ceph::real_time m; decode(s, p); @@ -1500,7 +1500,7 @@ public: fin(c) {} void finish(int r) override { if (r >= 0) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(attrset, p); } fin->complete(r); diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index 36ddafd98dc2..374c8125dd7a 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -740,7 +740,7 @@ add_executable(unittest_denc test_denc.cc ) add_ceph_unittest(unittest_denc) -target_link_libraries(unittest_denc os global) +target_link_libraries(unittest_denc global) # unittest_mempool add_executable(unittest_mempool diff --git a/src/test/cls_log/test_cls_log.cc b/src/test/cls_log/test_cls_log.cc index 7209382b27ac..daf1ceeb9e9c 100644 --- a/src/test/cls_log/test_cls_log.cc +++ b/src/test/cls_log/test_cls_log.cc @@ -31,7 +31,7 @@ static void reset_rop(librados::ObjectReadOperation **pop) { static int read_bl(bufferlist& bl, int *i) { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); try { decode(*i, iter); diff --git a/src/test/common/ObjectContents.h b/src/test/common/ObjectContents.h index 3b802fc36d85..dac8f5a4c735 100644 --- a/src/test/common/ObjectContents.h +++ b/src/test/common/ObjectContents.h @@ -77,7 +77,7 @@ public: seeds[0] = 0; } - explicit ObjectContents(bufferlist::iterator &bp) { + explicit ObjectContents(bufferlist::const_iterator &bp) { decode(_size, bp); decode(seeds, bp); decode(written, bp); diff --git a/src/test/common/test_bit_vector.cc b/src/test/common/test_bit_vector.cc index 9c2bee8cbd83..16966a75aa08 100644 --- a/src/test/common/test_bit_vector.cc +++ b/src/test/common/test_bit_vector.cc @@ -142,13 +142,13 @@ TYPED_TEST(BitVectorTest, partial_decode_encode) { bufferlist header_bl; header_bl.substr_of(bl, 0, bit_vector.get_header_length()); - bufferlist::iterator header_it = header_bl.begin(); + auto header_it = header_bl.cbegin(); bit_vector.decode_header(header_it); bufferlist footer_bl; footer_bl.substr_of(bl, bit_vector.get_footer_offset(), bl.length() - bit_vector.get_footer_offset()); - bufferlist::iterator footer_it = footer_bl.begin(); + auto footer_it = footer_bl.cbegin(); bit_vector.decode_footer(footer_it); typedef std::pair Extent; @@ -172,7 +172,7 @@ TYPED_TEST(BitVectorTest, partial_decode_encode) { bufferlist data_bl; data_bl.substr_of(bl, bit_vector.get_header_length() + byte_offset, byte_length); - bufferlist::iterator data_it = data_bl.begin(); + auto data_it = data_bl.cbegin(); bit_vector.decode_data(data_it, byte_offset); data_bl.clear(); @@ -196,7 +196,7 @@ TYPED_TEST(BitVectorTest, partial_decode_encode) { updated_bl.append(footer_bl); ASSERT_EQ(bl, updated_bl); - bufferlist::iterator updated_it = updated_bl.begin(); + auto updated_it = updated_bl.cbegin(); decode(bit_vector, updated_it); } } @@ -210,7 +210,7 @@ TYPED_TEST(BitVectorTest, header_crc) { bufferlist footer; bit_vector.encode_footer(footer); - bufferlist::iterator it = footer.begin(); + auto it = footer.cbegin(); bit_vector.decode_footer(it); bit_vector.resize(1); @@ -236,7 +236,7 @@ TYPED_TEST(BitVectorTest, data_crc) { bufferlist data; bit_vector1.encode_data(data, byte_offset, byte_length); - bufferlist::iterator data_it = data.begin(); + auto data_it = data.cbegin(); bit_vector1.decode_data(data_it, byte_offset); bit_vector2[bit_vector2.size() - 1] = 1; diff --git a/src/test/common/test_json_formattable.cc b/src/test/common/test_json_formattable.cc index 88a7af33ceb9..f0aad27885ef 100644 --- a/src/test/common/test_json_formattable.cc +++ b/src/test/common/test_json_formattable.cc @@ -129,7 +129,7 @@ TEST(formatable, bin_encode) { bufferlist bl; ::encode(f, bl); - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); try { ::decode(f2, iter); } catch (buffer::error& err) { diff --git a/src/test/compressor/compressor_example.h b/src/test/compressor/compressor_example.h index d2228c1bffb5..a2dbd8f660ad 100644 --- a/src/test/compressor/compressor_example.h +++ b/src/test/compressor/compressor_example.h @@ -43,7 +43,7 @@ public: out = in; return 0; } - int decompress(bufferlist::iterator &p, size_t compressed_len, bufferlist &out) override + int decompress(bufferlist::const_iterator &p, size_t compressed_len, bufferlist &out) override { p.copy(std::min(p.get_remaining(), compressed_len), out); return 0; diff --git a/src/test/compressor/test_compression.cc b/src/test/compressor/test_compression.cc index ad377c805119..8f09953d13a8 100644 --- a/src/test/compressor/test_compression.cc +++ b/src/test/compressor/test_compression.cc @@ -174,7 +174,7 @@ TEST_P(CompressorTest, compress_decompress) after.clear(); size_t compressed_len = out.length(); out.append_zero(12); - auto it = out.begin(); + auto it = out.cbegin(); res = compressor->decompress(it, compressed_len, after); EXPECT_EQ(res, 0); EXPECT_TRUE(exp.contents_equal(after)); @@ -199,7 +199,7 @@ TEST_P(CompressorTest, compress_decompress) size_t prefix_len = prefix.length(); prefix.claim_append(out); out.swap(prefix); - it = out.begin(); + it = out.cbegin(); it.advance(prefix_len); res = compressor->decompress(it, compressed_len, after); EXPECT_EQ(res, 0); diff --git a/src/test/crush/CrushWrapper.cc b/src/test/crush/CrushWrapper.cc index ec240823b956..26112fc40b37 100644 --- a/src/test/crush/CrushWrapper.cc +++ b/src/test/crush/CrushWrapper.cc @@ -1041,7 +1041,7 @@ TEST(CrushWrapper, choose_args_compat) { c.choose_args[caid] = arg_map; bufferlist bl; c.encode(bl, features|CEPH_FEATURE_CRUSH_CHOOSE_ARGS); - bufferlist::iterator i(bl.begin()); + auto i = bl.cbegin(); CrushWrapper c_new; c_new.decode(i); ASSERT_EQ(1u, c_new.choose_args.size()); @@ -1056,7 +1056,7 @@ TEST(CrushWrapper, choose_args_compat) { bufferlist bl; c.encode(bl, features); c.choose_args.clear(); - bufferlist::iterator i(bl.begin()); + auto i = bl.cbegin(); CrushWrapper c_new; c_new.decode(i); ASSERT_EQ(0u, c_new.choose_args.size()); diff --git a/src/test/encoding.cc b/src/test/encoding.cc index 8c0025ce8f27..4f91ecc4debd 100644 --- a/src/test/encoding.cc +++ b/src/test/encoding.cc @@ -11,7 +11,7 @@ static void test_encode_and_decode(const T& src) bufferlist bl(1000000); encode(src, bl); T dst; - bufferlist::iterator i(bl.begin()); + auto i = bl.cbegin(); decode(dst, i); ASSERT_EQ(src, dst) << "Encoding roundtrip changed the string: orig=" << src << ", but new=" << dst; } @@ -38,7 +38,7 @@ static void test_encode_and_nohead_nohead(Size len, const T& src) encode(len, bl); encode_nohead(src, bl); T dst; - bufferlist::iterator i(bl.begin()); + auto i = bl.cbegin(); decode(len, i); decode_nohead(len, dst, i); ASSERT_EQ(src, dst) << "Encoding roundtrip changed the string: orig=" << src << ", but new=" << dst; @@ -163,7 +163,7 @@ public: return data == rhs.data; } - friend void decode(ConstructorCounter &s, bufferlist::iterator& p) + friend void decode(ConstructorCounter &s, bufferlist::const_iterator& p) { decode(s.data, p); } @@ -384,7 +384,7 @@ TEST(small_encoding, varint) { cout << std::endl; ASSERT_EQ(bl.length(), v[i][1]); uint32_t u; - auto p = bl.begin().get_current_ptr().begin(); + auto p = bl.begin().get_current_ptr().cbegin(); denc_varint(u, p); ASSERT_EQ(v[i][0], u); } @@ -399,7 +399,7 @@ TEST(small_encoding, varint) { cout << std::endl; ASSERT_EQ(bl.length(), v[i][2]); int32_t u; - auto p = bl.begin().get_current_ptr().begin(); + auto p = bl.begin().get_current_ptr().cbegin(); denc_signed_varint(u, p); ASSERT_EQ((int32_t)v[i][0], u); } @@ -415,7 +415,7 @@ TEST(small_encoding, varint) { cout << std::endl; ASSERT_EQ(bl.length(), v[i][3]); int64_t u; - auto p = bl.begin().get_current_ptr().begin(); + auto p = bl.begin().get_current_ptr().cbegin(); denc_signed_varint(u, p); ASSERT_EQ(x, u); } @@ -462,7 +462,7 @@ TEST(small_encoding, varint_lowz) { cout << std::endl; ASSERT_EQ(bl.length(), v[i][1]); uint32_t u; - auto p = bl.begin().get_current_ptr().begin(); + auto p = bl.begin().get_current_ptr().cbegin(); denc_varint_lowz(u, p); ASSERT_EQ(v[i][0], u); } @@ -478,7 +478,7 @@ TEST(small_encoding, varint_lowz) { cout << std::endl; ASSERT_EQ(bl.length(), v[i][2]); int64_t u; - auto p = bl.begin().get_current_ptr().begin(); + auto p = bl.begin().get_current_ptr().cbegin(); denc_signed_varint_lowz(u, p); ASSERT_EQ(x, u); } @@ -494,7 +494,7 @@ TEST(small_encoding, varint_lowz) { cout << std::endl; ASSERT_EQ(bl.length(), v[i][3]); int64_t u; - auto p = bl.begin().get_current_ptr().begin(); + auto p = bl.begin().get_current_ptr().cbegin(); denc_signed_varint_lowz(u, p); ASSERT_EQ(x, u); } @@ -533,7 +533,7 @@ TEST(small_encoding, lba) { cout << std::endl; ASSERT_EQ(bl.length(), v[i][1]); uint64_t u; - auto p = bl.begin().get_current_ptr().begin(); + auto p = bl.begin().get_current_ptr().cbegin(); denc_lba(u, p); ASSERT_EQ(v[i][0], u); } diff --git a/src/test/encoding/ceph_dencoder.cc b/src/test/encoding/ceph_dencoder.cc index dd5a79202978..68cdc142b8c8 100644 --- a/src/test/encoding/ceph_dencoder.cc +++ b/src/test/encoding/ceph_dencoder.cc @@ -109,7 +109,7 @@ public: } string decode(bufferlist bl, uint64_t seek) override { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); p.seek(seek); try { using ceph::decode; @@ -226,7 +226,7 @@ public: } string decode(bufferlist bl, uint64_t seek) override { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); p.seek(seek); try { Message *n = decode_message(g_ceph_context, 0, p); diff --git a/src/test/encoding/test_ceph_time.h b/src/test/encoding/test_ceph_time.h index c65c9d83147d..c27cb5746b98 100644 --- a/src/test/encoding/test_ceph_time.h +++ b/src/test/encoding/test_ceph_time.h @@ -20,7 +20,7 @@ class time_point_wrapper { using ceph::encode; encode(t, bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { using ceph::decode; decode(t, p); } @@ -51,7 +51,7 @@ class timespan_wrapper { using ceph::encode; encode(d, bl); } - void decode(bufferlist::iterator &p) { + void decode(bufferlist::const_iterator &p) { using ceph::decode; decode(d, p); } diff --git a/src/test/librados/aio.cc b/src/test/librados/aio.cc index 861f34ebe4ff..287b5679e991 100644 --- a/src/test/librados/aio.cc +++ b/src/test/librados/aio.cc @@ -607,7 +607,7 @@ TEST(LibRadosAio, RoundTripPP3) ASSERT_EQ(0, memcmp(buf, bl.c_str(), sizeof(buf))); ASSERT_EQ(8U, csum_bl.length()); - auto csum_bl_it = csum_bl.begin(); + auto csum_bl_it = csum_bl.cbegin(); uint32_t csum_count; uint32_t csum; decode(csum_count, csum_bl_it); diff --git a/src/test/librados/c_read_operations.cc b/src/test/librados/c_read_operations.cc index 4e5cde616c4f..9d424aaaf387 100644 --- a/src/test/librados/c_read_operations.cc +++ b/src/test/librados/c_read_operations.cc @@ -529,7 +529,7 @@ TEST_F(CReadOpsTest, Exec) { // make sure buffer is at least as long as it claims bufferlist bl; bl.append(out, bytes_read); - auto it = bl.begin(); + auto it = bl.cbegin(); ceph::decode(features, it); ASSERT_EQ(RBD_FEATURES_ALL, features); rados_buffer_free(out); diff --git a/src/test/librados/io.cc b/src/test/librados/io.cc index 0f879fa45e18..9e56c79a603c 100644 --- a/src/test/librados/io.cc +++ b/src/test/librados/io.cc @@ -330,7 +330,7 @@ TEST_F(LibRadosIoPP, Checksum) { bufferlist csum_bl; ASSERT_EQ(0, ioctx.checksum("foo", LIBRADOS_CHECKSUM_TYPE_CRC32C, init_value_bl, sizeof(buf), 0, 0, &csum_bl)); - auto csum_bl_it = csum_bl.begin(); + auto csum_bl_it = csum_bl.cbegin(); uint32_t csum_count; decode(csum_count, csum_bl_it); ASSERT_EQ(1U, csum_count); diff --git a/src/test/librados/misc.cc b/src/test/librados/misc.cc index a07c344bf492..56298003992e 100644 --- a/src/test/librados/misc.cc +++ b/src/test/librados/misc.cc @@ -283,7 +283,7 @@ static std::string read_key_from_tmap(IoCtx& ioctx, const std::string &obj, oss << "ioctx.read(" << obj << ", bl, 0, 0) returned " << r; return oss.str(); } - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); bufferlist header; map m; decode(header, p); @@ -519,7 +519,7 @@ TEST_F(LibRadosMisc, Exec) { ASSERT_GT(res, 0); bufferlist bl; bl.append(buf2, res); - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); uint64_t all_features; decode(all_features, iter); // make sure *some* features are specified; don't care which ones @@ -532,7 +532,7 @@ TEST_F(LibRadosMiscPP, ExecPP) { bufferlist bl2, out; int r = ioctx.exec("foo", "rbd", "get_all_features", bl2, out); ASSERT_EQ(0, r); - bufferlist::iterator iter = out.begin(); + auto iter = out.cbegin(); uint64_t all_features; decode(all_features, iter); // make sure *some* features are specified; don't care which ones @@ -1153,7 +1153,7 @@ TYPED_TEST(LibRadosChecksum, Subset) { for (uint32_t i = 0; i < csum_count; ++i) { ASSERT_EQ(0, checksum_rvals[i]); - auto bl_it = checksum_bls[i].begin(); + auto bl_it = checksum_bls[i].cbegin(); uint32_t count; decode(count, bl_it); ASSERT_EQ(1U, count); @@ -1192,7 +1192,7 @@ TYPED_TEST(LibRadosChecksum, Chunked) { ASSERT_EQ(0, this->ioctx.operate("foo", &op, NULL)); ASSERT_EQ(0, checksum_rval); - auto bl_it = checksum_bl.begin(); + auto bl_it = checksum_bl.cbegin(); uint32_t count; decode(count, bl_it); ASSERT_EQ(csum_count, count); diff --git a/src/test/librados/tier.cc b/src/test/librados/tier.cc index 77b256188fab..85eaeef30762 100644 --- a/src/test/librados/tier.cc +++ b/src/test/librados/tier.cc @@ -2367,7 +2367,7 @@ TEST_F(LibRadosTwoPoolsPP, HitSetRead) { c->release(); if (hbl.length()) { - bufferlist::iterator p = hbl.begin(); + auto p = hbl.cbegin(); HitSet hs; decode(hs, p); if (hs.contains(oid)) { @@ -2466,7 +2466,7 @@ TEST_F(LibRadosTwoPoolsPP, HitSetWrite) { c->release(); try { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(hitsets[i], p); } catch (buffer::error& e) { @@ -3234,7 +3234,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestRefRead) { cache_ioctx.exec("bar", "refcount", "chunk_read", in, out); cls_chunk_refcount_read_ret read_ret; try { - bufferlist::iterator iter = out.begin(); + auto iter = out.cbegin(); decode(read_ret, iter); } catch (buffer::error& err) { ASSERT_TRUE(0); @@ -3247,7 +3247,7 @@ TEST_F(LibRadosTwoPoolsPP, ManifestRefRead) { cache_ioctx.exec("bar-chunk", "refcount", "chunk_read", in, out); cls_chunk_refcount_read_ret read_ret; try { - bufferlist::iterator iter = out.begin(); + auto iter = out.cbegin(); decode(read_ret, iter); } catch (buffer::error& err) { ASSERT_TRUE(0); @@ -5399,7 +5399,7 @@ TEST_F(LibRadosTwoPoolsECPP, HitSetRead) { c->release(); if (hbl.length()) { - bufferlist::iterator p = hbl.begin(); + auto p = hbl.cbegin(); HitSet hs; decode(hs, p); if (hs.contains(oid)) { @@ -5465,7 +5465,7 @@ TEST_F(LibRadosTierECPP, HitSetWrite) { //bl.hexdump(std::cout); //std::cout << std::endl; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(hitsets[i], p); // cope with racing splits by refreshing pg_num diff --git a/src/test/librados/watch_notify.cc b/src/test/librados/watch_notify.cc index 4da695768059..5e65add855e2 100644 --- a/src/test/librados/watch_notify.cc +++ b/src/test/librados/watch_notify.cc @@ -344,7 +344,7 @@ TEST_F(LibRadosWatchNotify, WatchNotify2) { reply.append(reply_buf, reply_buf_len); std::map, bufferlist> reply_map; std::set > missed_map; - bufferlist::iterator reply_p = reply.begin(); + auto reply_p = reply.cbegin(); decode(reply_map, reply_p); decode(missed_map, reply_p); ASSERT_EQ(1u, reply_map.size()); @@ -395,7 +395,7 @@ TEST_F(LibRadosWatchNotify, AioWatchNotify2) { reply.append(reply_buf, reply_buf_len); std::map, bufferlist> reply_map; std::set > missed_map; - bufferlist::iterator reply_p = reply.begin(); + auto reply_p = reply.cbegin(); decode(reply_map, reply_p); decode(missed_map, reply_p); ASSERT_EQ(1u, reply_map.size()); @@ -449,7 +449,7 @@ TEST_F(LibRadosWatchNotify, AioNotify) { reply.append(reply_buf, reply_buf_len); std::map, bufferlist> reply_map; std::set > missed_map; - bufferlist::iterator reply_p = reply.begin(); + auto reply_p = reply.cbegin(); decode(reply_map, reply_p); decode(missed_map, reply_p); ASSERT_EQ(1u, reply_map.size()); @@ -494,7 +494,7 @@ TEST_P(LibRadosWatchNotifyPP, WatchNotify2) { ASSERT_EQ(watches.size(), 1u); bufferlist bl2, bl_reply; ASSERT_EQ(0, ioctx.notify2(notify_oid, bl2, 300000, &bl_reply)); - bufferlist::iterator p = bl_reply.begin(); + auto p = bl_reply.cbegin(); std::map,bufferlist> reply_map; std::set > missed_map; decode(reply_map, p); @@ -533,7 +533,7 @@ TEST_P(LibRadosWatchNotifyPP, AioWatchNotify2) { ASSERT_EQ(watches.size(), 1u); bufferlist bl2, bl_reply; ASSERT_EQ(0, ioctx.notify2(notify_oid, bl2, 300000, &bl_reply)); - bufferlist::iterator p = bl_reply.begin(); + auto p = bl_reply.cbegin(); std::map,bufferlist> reply_map; std::set > missed_map; decode(reply_map, p); @@ -575,7 +575,7 @@ TEST_P(LibRadosWatchNotifyPP, AioNotify) { ASSERT_EQ(0, comp->wait_for_complete()); ASSERT_EQ(0, comp->get_return_value()); comp->release(); - bufferlist::iterator p = bl_reply.begin(); + auto p = bl_reply.cbegin(); std::map,bufferlist> reply_map; std::set > missed_map; decode(reply_map, p); @@ -621,7 +621,7 @@ TEST_F(LibRadosWatchNotify, WatchNotify2Multi) { reply.append(reply_buf, reply_buf_len); std::map, bufferlist> reply_map; std::set > missed_map; - bufferlist::iterator reply_p = reply.begin(); + auto reply_p = reply.cbegin(); decode(reply_map, reply_p); decode(missed_map, reply_p); ASSERT_EQ(2u, reply_map.size()); @@ -666,7 +666,7 @@ TEST_F(LibRadosWatchNotify, WatchNotify2Timeout) { reply.append(reply_buf, reply_buf_len); std::map, bufferlist> reply_map; std::set > missed_map; - bufferlist::iterator reply_p = reply.begin(); + auto reply_p = reply.cbegin(); decode(reply_map, reply_p); decode(missed_map, reply_p); ASSERT_EQ(0u, reply_map.size()); @@ -756,7 +756,7 @@ TEST_P(LibRadosWatchNotifyPP, WatchNotify3) { std::cout << "notify2" << std::endl; ASSERT_EQ(0, ioctx.notify2(notify_oid, bl2, 300000, &bl_reply)); std::cout << "notify2 done" << std::endl; - bufferlist::iterator p = bl_reply.begin(); + auto p = bl_reply.cbegin(); std::map,bufferlist> reply_map; std::set > missed_map; decode(reply_map, p); @@ -832,7 +832,7 @@ TEST_F(LibRadosWatchNotify, Watch3Timeout) { reply.append(reply_buf, reply_buf_len); std::map, bufferlist> reply_map; std::set > missed_map; - bufferlist::iterator reply_p = reply.begin(); + auto reply_p = reply.cbegin(); decode(reply_map, reply_p); decode(missed_map, reply_p); ASSERT_EQ(0u, reply_map.size()); @@ -862,7 +862,7 @@ TEST_F(LibRadosWatchNotify, Watch3Timeout) { reply.append(reply_buf, reply_buf_len); std::map, bufferlist> reply_map; std::set > missed_map; - bufferlist::iterator reply_p = reply.begin(); + auto reply_p = reply.cbegin(); decode(reply_map, reply_p); decode(missed_map, reply_p); ASSERT_EQ(1u, reply_map.size()); diff --git a/src/test/librados_test_stub/TestIoCtxImpl.cc b/src/test/librados_test_stub/TestIoCtxImpl.cc index 72836938da82..96786a84e067 100644 --- a/src/test/librados_test_stub/TestIoCtxImpl.cc +++ b/src/test/librados_test_stub/TestIoCtxImpl.cc @@ -287,7 +287,7 @@ int TestIoCtxImpl::tmap_update(const std::string& oid, bufferlist& cmdbl) { if (r < 0) { return r; } - bufferlist::iterator iter = inbl.begin(); + auto iter = inbl.cbegin(); decode(tmap_header, iter); decode(tmap, iter); } @@ -295,7 +295,7 @@ int TestIoCtxImpl::tmap_update(const std::string& oid, bufferlist& cmdbl) { __u8 c; std::string key; bufferlist value; - bufferlist::iterator iter = cmdbl.begin(); + auto iter = cmdbl.cbegin(); decode(c, iter); decode(key, iter); diff --git a/src/test/mon/test_mon_workloadgen.cc b/src/test/mon/test_mon_workloadgen.cc index 20d7fbf78ac6..0fa150229789 100644 --- a/src/test/mon/test_mon_workloadgen.cc +++ b/src/test/mon/test_mon_workloadgen.cc @@ -819,7 +819,7 @@ class OSDStub : public TestStub dout(5) << __func__ << " full epoch " << start_full << dendl; bufferlist &bl = rit->second; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); osdmap.decode(p); } } @@ -835,7 +835,7 @@ class OSDStub : public TestStub << " on full epoch " << start_full << dendl; OSDMap::Incremental inc; bufferlist &bl = it->second; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); inc.decode(p); int err = osdmap.apply_incremental(inc); diff --git a/src/test/msgr/test_msgr.cc b/src/test/msgr/test_msgr.cc index ed83a9379259..a027aa6fcc9a 100644 --- a/src/test/msgr/test_msgr.cc +++ b/src/test/msgr/test_msgr.cc @@ -867,7 +867,7 @@ class SyntheticDispatcher : public Dispatcher { } Payload pl; - auto p = m->get_data().begin(); + auto p = m->get_data().cbegin(); decode(pl, p); if (pl.who == Payload::PING) { lderr(g_ceph_context) << __func__ << " conn=" << m->get_connection() << pl << dendl; diff --git a/src/test/objectstore/FileStoreTracker.cc b/src/test/objectstore/FileStoreTracker.cc index 7ed13c254142..bd634cec17cd 100644 --- a/src/test/objectstore/FileStoreTracker.cc +++ b/src/test/objectstore/FileStoreTracker.cc @@ -50,7 +50,7 @@ int FileStoreTracker::init() db->get("STATUS", to_get, &got); restart_seq = 0; if (!got.empty()) { - bufferlist::iterator bp = got.begin()->second.begin(); + auto bp = got.begin()->second.cbegin(); decode(restart_seq, bp); } ++restart_seq; @@ -223,7 +223,7 @@ void encode(const ObjStatus &obj, bufferlist &bl) { encode(obj.last_committed, bl); encode(obj.restart_seq, bl); } -void decode(ObjStatus &obj, bufferlist::iterator &bl) { +void decode(ObjStatus &obj, bufferlist::const_iterator &bl) { decode(obj.last_applied, bl); decode(obj.last_committed, bl); decode(obj.restart_seq, bl); @@ -239,7 +239,7 @@ ObjStatus get_obj_status(const pair &obj, db->get(obj_to_meta_prefix(obj), to_get, &got); ObjStatus retval; if (!got.empty()) { - bufferlist::iterator bp = got.begin()->second.begin(); + auto bp = got.begin()->second.cbegin(); decode(retval, bp); } return retval; @@ -339,7 +339,7 @@ ObjectContents FileStoreTracker::get_current_content( iter->seek_to_last(); if (iter->valid()) { bufferlist bl = iter->value(); - bufferlist::iterator bp = bl.begin(); + auto bp = bl.cbegin(); pair val; decode(val, bp); assert(seq_to_key(val.first) == iter->key()); @@ -359,7 +359,7 @@ ObjectContents FileStoreTracker::get_content( if (got.empty()) return ObjectContents(); pair val; - bufferlist::iterator bp = got.begin()->second.begin(); + auto bp = got.begin()->second.cbegin(); decode(val, bp); bp = val.second.begin(); assert(val.first == version); @@ -376,7 +376,7 @@ pair FileStoreTracker::get_valid_reads( if (iter->valid()) { pair val; bufferlist bl = iter->value(); - bufferlist::iterator bp = bl.begin(); + auto bp = bl.cbegin(); decode(val, bp); bounds.second = val.first + 1; } @@ -436,7 +436,7 @@ uint64_t FileStoreTracker::set_content(const pair &obj, if (iter->valid()) { pair val; bufferlist bl = iter->value(); - bufferlist::iterator bp = bl.begin(); + auto bp = bl.cbegin(); decode(val, bp); most_recent = val.first; } diff --git a/src/test/objectstore/ObjectStoreTransactionBenchmark.cc b/src/test/objectstore/ObjectStoreTransactionBenchmark.cc index 77c1049443af..7a166d7d4d57 100644 --- a/src/test/objectstore/ObjectStoreTransactionBenchmark.cc +++ b/src/test/objectstore/ObjectStoreTransactionBenchmark.cc @@ -77,7 +77,7 @@ class Transaction { t.encode(bl); encode_ticks.add(Cycles::rdtsc() - start_time); - bufferlist::iterator bliter = bl.begin(); + auto bliter = bl.cbegin(); start_time = Cycles::rdtsc(); d.decode(bliter); decode_ticks.add(Cycles::rdtsc() - start_time); diff --git a/src/test/objectstore/store_test.cc b/src/test/objectstore/store_test.cc index 031214a87264..941cc81d12f4 100644 --- a/src/test/objectstore/store_test.cc +++ b/src/test/objectstore/store_test.cc @@ -420,7 +420,7 @@ TEST_P(StoreTest, FiemapEmpty) { bufferlist bl; store->fiemap(ch, oid, 0, 100000, bl); map m, e; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(m, p); cout << " got " << m << std::endl; e[0] = 100000; @@ -459,7 +459,7 @@ TEST_P(StoreTest, FiemapHoles) { bufferlist bl; store->fiemap(ch, oid, 0, SKIP_STEP * (MAX_EXTENTS - 1) + 3, bl); map m, e; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(m, p); cout << " got " << m << std::endl; ASSERT_TRUE(!m.empty()); @@ -479,7 +479,7 @@ TEST_P(StoreTest, FiemapHoles) { bufferlist bl; store->fiemap(ch, oid, SKIP_STEP, SKIP_STEP * (MAX_EXTENTS - 2) + 3, bl); map m, e; - auto p = bl.begin(); + auto p = bl.cbegin(); decode(m, p); cout << " got " << m << std::endl; ASSERT_TRUE(!m.empty()); diff --git a/src/test/objectstore/test_idempotent_sequence.cc b/src/test/objectstore/test_idempotent_sequence.cc index 09514ca30acb..052db64915ff 100644 --- a/src/test/objectstore/test_idempotent_sequence.cc +++ b/src/test/objectstore/test_idempotent_sequence.cc @@ -122,7 +122,7 @@ int run_get_last_op(std::string& filestore_path, std::string& journal_path) store->read(ch, txn_object, 0, 100, bl); int32_t t = 0; if (bl.length()) { - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(t, p); } if (t > txn) { diff --git a/src/test/osd/Object.cc b/src/test/osd/Object.cc index a8390f704174..7d799863c014 100644 --- a/src/test/osd/Object.cc +++ b/src/test/osd/Object.cc @@ -19,7 +19,7 @@ void ContDesc::encode(bufferlist &bl) const ENCODE_FINISH(bl); } -void ContDesc::decode(bufferlist::iterator &bl) +void ContDesc::decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(objnum, bl); diff --git a/src/test/osd/Object.h b/src/test/osd/Object.h index 3c21541ab7be..03d9c454b965 100644 --- a/src/test/osd/Object.h +++ b/src/test/osd/Object.h @@ -45,7 +45,7 @@ public: return !((*this) == rhs); } void encode(bufferlist &bl) const; - void decode(bufferlist::iterator &bp); + void decode(bufferlist::const_iterator &bp); }; WRITE_CLASS_ENCODER(ContDesc) diff --git a/src/test/osd/RadosModel.h b/src/test/osd/RadosModel.h index 6ed7cbd17f20..a59b0a404ecd 100644 --- a/src/test/osd/RadosModel.h +++ b/src/test/osd/RadosModel.h @@ -1419,7 +1419,7 @@ public: } if (old_value.has_contents()) { ContDesc to_check; - bufferlist::iterator p = headerbl.begin(); + auto p = headerbl.cbegin(); decode(to_check, p); if (to_check != old_value.most_recent()) { cerr << num << ": oid " << oid << " found incorrect object contents " << to_check @@ -1441,7 +1441,7 @@ public: uint32_t checksum = 0; if (checksum_retvals[i] == 0) { try { - auto bl_it = checksums[i].begin(); + auto bl_it = checksums[i].cbegin(); uint32_t csum_count; decode(csum_count, bl_it); decode(checksum, bl_it); @@ -2171,7 +2171,7 @@ public: uint32_t checksum[2] = {0}; if (checksum_retvals[1] == 0) { try { - auto bl_it = checksums[1].begin(); + auto bl_it = checksums[1].cbegin(); uint32_t csum_count; decode(csum_count, bl_it); decode(checksum[1], bl_it); @@ -2747,7 +2747,7 @@ public: int r = comp2->get_return_value(); if (r == 0) { HitSet hitset; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); decode(hitset, p); cout << num << ": got hitset of type " << hitset.get_type_name() << " size " << bl.length() diff --git a/src/test/osd/TestOSDMap.cc b/src/test/osd/TestOSDMap.cc index b3a982461d55..fbea1a478312 100644 --- a/src/test/osd/TestOSDMap.cc +++ b/src/test/osd/TestOSDMap.cc @@ -94,7 +94,7 @@ public: void get_crush(CrushWrapper& newcrush) { bufferlist bl; osdmap.crush->encode(bl, CEPH_FEATURES_SUPPORTED_DEFAULT); - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); newcrush.decode(p); } int crush_move(const string &name, const vector &argvec) { diff --git a/src/test/osd/hitset.cc b/src/test/osd/hitset.cc index 414064058dbc..6234bdaba233 100644 --- a/src/test/osd/hitset.cc +++ b/src/test/osd/hitset.cc @@ -66,7 +66,7 @@ TEST_F(BloomHitSetTest, Params) { bufferlist bl; params.encode(bl); BloomHitSet::Params p2; - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); p2.decode(iter); EXPECT_EQ(0.1, p2.get_fpp()); EXPECT_EQ((unsigned)100, p2.target_size); diff --git a/src/test/perf_local.cc b/src/test/perf_local.cc index ede48395099c..d58a54507ea2 100644 --- a/src/test/perf_local.cc +++ b/src/test/perf_local.cc @@ -194,7 +194,7 @@ struct DummyBlock { encode(d, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator &bl) { + void decode(bufferlist::const_iterator &bl) { DECODE_START(1, bl); decode(a, bl); decode(b, bl); @@ -215,7 +215,7 @@ double buffer_encode_decode() bufferlist b; DummyBlock dummy_block; encode(dummy_block, b); - bufferlist::iterator iter = b.begin(); + auto iter = b.cbegin(); decode(dummy_block, iter); } uint64_t stop = Cycles::rdtsc(); @@ -308,7 +308,7 @@ double buffer_iterator() int sum = 0; uint64_t start = Cycles::rdtsc(); for (int i = 0; i < count; i++) { - bufferlist::iterator it = b.begin(); + auto it = b.cbegin(); while (!it.end()) { sum += (static_cast(it.get_current_ptr().c_str()))[it.get_remaining()-1]; ++it; diff --git a/src/test/rbd_mirror/test_mock_ImageReplayer.cc b/src/test/rbd_mirror/test_mock_ImageReplayer.cc index fd43290c6760..3e427e98ea66 100644 --- a/src/test/rbd_mirror/test_mock_ImageReplayer.cc +++ b/src/test/rbd_mirror/test_mock_ImageReplayer.cc @@ -45,7 +45,7 @@ namespace journal { template<> struct Replay { - MOCK_METHOD2(decode, int(bufferlist::iterator *, EventEntry *)); + MOCK_METHOD2(decode, int(bufferlist::const_iterator *, EventEntry *)); MOCK_METHOD3(process, void(const EventEntry &, Context *, Context *)); MOCK_METHOD1(flush, void(Context*)); MOCK_METHOD2(shut_down, void(bool, Context*)); @@ -1300,7 +1300,7 @@ TEST_F(TestMockImageReplayer, DelayedReplay) { EXPECT_CALL(mock_replay_entry, get_data()); C_SaferCond decode_ctx; EXPECT_CALL(mock_local_replay, decode(_, _)) - .WillOnce(DoAll(Invoke([&decode_ctx](bufferlist::iterator* it, + .WillOnce(DoAll(Invoke([&decode_ctx](bufferlist::const_iterator* it, librbd::journal::EventEntry *e) { decode_ctx.complete(0); }), diff --git a/src/test/test_addrs.cc b/src/test/test_addrs.cc index 43723e467b6f..9e672315fb33 100644 --- a/src/test/test_addrs.cc +++ b/src/test/test_addrs.cc @@ -90,13 +90,12 @@ TEST(Msgr, TestAddrEncodeAddrvecDecode) for (unsigned i = 0; addr_checks2[i][0]; ++i) { entity_addr_t addr; entity_addrvec_t addrvec; - bufferlist::iterator bli; const char *end = ""; bool ok = addr.parse(addr_checks2[i][0], &end); ASSERT_TRUE(ok); bufferlist bl; addr.encode(bl, 0); - bli = bl.begin(); + auto bli = bl.cbegin(); addrvec.decode(bli); ASSERT_EQ(addr, addrvec.v[0]); } @@ -108,13 +107,12 @@ TEST(Msgr, TestAddrvec0EncodeAddrDecode) entity_addr_t addr; entity_addrvec_t addrvec; bufferlist bl; - bufferlist::iterator bli; const char *end = ""; bool ok = addr.parse(addr_checks2[i][0], &end); ASSERT_TRUE(ok); addrvec.v.push_back(addr); addrvec.encode(bl, 0); - bli = bl.begin(); + auto bli = bl.cbegin(); entity_addr_t a; a.decode(bli); ASSERT_EQ(addr, a); @@ -126,9 +124,8 @@ TEST(Msgr, TestEmptyAddrvecEncodeAddrDecode) entity_addrvec_t addrvec; entity_addr_t addr; bufferlist bl; - bufferlist::iterator bli; addrvec.encode(bl, 0); - bli = bl.begin(); + auto bli = bl.cbegin(); addr.decode(bli); ASSERT_EQ(addr, entity_addr_t(1, 0)); } @@ -150,7 +147,6 @@ TEST(Msgr, TestAddrvecEncodeAddrDecode0) entity_addr_t addr; entity_addrvec_t addrvec; bufferlist bl; - bufferlist::iterator bli; for (unsigned i = 0; addrvec_checks[i][0]; ++i) { const char *end = ""; @@ -160,7 +156,7 @@ TEST(Msgr, TestAddrvecEncodeAddrDecode0) } addrvec.encode(bl, 0); - bli = bl.begin(); + auto bli = bl.cbegin(); addr.decode(bli); @@ -176,7 +172,6 @@ TEST(Msgr, TestAddrvecEncodeAddrDecode1) entity_addr_t addr, a; entity_addrvec_t addrvec; bufferlist bl; - bufferlist::iterator bli; bool flag = true; for (unsigned i = 0; addrvec_checks[i][1]; ++i) { @@ -191,7 +186,7 @@ TEST(Msgr, TestAddrvecEncodeAddrDecode1) } addrvec.encode(bl, 0); - bli = bl.begin(); + auto bli = bl.cbegin(); addr.decode(bli); @@ -204,7 +199,6 @@ TEST(Msgr, TestAddrvecEncodeAddrDecode2) entity_addr_t addr; entity_addrvec_t addrvec; bufferlist bl; - bufferlist::iterator bli; for (unsigned i = 0; addrvec_checks[i][2]; ++i) { const char *end = ""; @@ -214,7 +208,7 @@ TEST(Msgr, TestAddrvecEncodeAddrDecode2) } addrvec.encode(bl, 0); - bli = bl.begin(); + auto bli = bl.cbegin(); addr.decode(bli); @@ -227,7 +221,6 @@ TEST(Msgr, TestAddrvecEncodeAddrDecode3) entity_addr_t addr; entity_addrvec_t addrvec; bufferlist bl; - bufferlist::iterator bli; for (unsigned i = 0; addrvec_checks[i][3]; ++i) { const char *end = ""; @@ -237,7 +230,7 @@ TEST(Msgr, TestAddrvecEncodeAddrDecode3) } addrvec.encode(bl, 0); - bli = bl.begin(); + auto bli = bl.cbegin(); addr.decode(bli); diff --git a/src/tools/RadosDump.cc b/src/tools/RadosDump.cc index 43ae78ff1c1f..902ffa439f4f 100644 --- a/src/tools/RadosDump.cc +++ b/src/tools/RadosDump.cc @@ -17,7 +17,7 @@ int RadosDump::read_super() { bufferlist ebl; - bufferlist::iterator ebliter = ebl.begin(); + auto ebliter = ebl.cbegin(); ssize_t bytes; bytes = ebl.read_fd(file_fd, super_header::FIXED_LENGTH); @@ -37,7 +37,7 @@ int RadosDump::get_header(header *h) assert (h != NULL); bufferlist ebl; - bufferlist::iterator ebliter = ebl.begin(); + auto ebliter = ebl.cbegin(); ssize_t bytes; bytes = ebl.read_fd(file_fd, sh.header_size); @@ -56,7 +56,7 @@ int RadosDump::get_footer(footer *f) assert(f != NULL); bufferlist ebl; - bufferlist::iterator ebliter = ebl.begin(); + auto ebliter = ebl.cbegin(); ssize_t bytes; bytes = ebl.read_fd(file_fd, sh.footer_size); @@ -106,7 +106,6 @@ int RadosDump::read_section(sectiontype_t *type, bufferlist *bl) int RadosDump::skip_object(bufferlist &bl) { - bufferlist::iterator ebliter = bl.begin(); bufferlist ebl; bool done = false; while(!done) { @@ -115,7 +114,6 @@ int RadosDump::skip_object(bufferlist &bl) if (ret) return ret; - ebliter = ebl.begin(); if (type >= END_OF_TYPES) { cout << "Skipping unknown object section type" << std::endl; continue; diff --git a/src/tools/RadosDump.h b/src/tools/RadosDump.h index 412d3d7a44d1..83f02e69d518 100644 --- a/src/tools/RadosDump.h +++ b/src/tools/RadosDump.h @@ -73,7 +73,7 @@ struct super_header { encode(header_size, bl); encode(footer_size, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(magic, bl); decode(version, bl); @@ -96,7 +96,7 @@ struct header { encode(size, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { uint32_t debug_type; DECODE_START(1, bl); decode(debug_type, bl); @@ -115,7 +115,7 @@ struct footer { encode(magic, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(magic, bl); DECODE_FINISH(bl); @@ -141,7 +141,7 @@ struct pg_begin { ENCODE_FINISH(bl); } // NOTE: New super_ver prevents decode from ver 1 - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(3, bl); decode(pgid.pgid, bl); if (struct_v > 1) { @@ -177,7 +177,7 @@ struct object_begin { encode(oi, bl, -1); /* FIXME: we always encode with full features */ ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(3, bl); decode(hoid.hobj, bl); if (struct_v > 1) { @@ -209,7 +209,7 @@ struct data_section { encode(databl, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(offset, bl); decode(len, bl); @@ -238,7 +238,7 @@ struct attr_section { encode(data, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(data, bl); DECODE_FINISH(bl); @@ -255,7 +255,7 @@ struct omap_hdr_section { encode(hdr, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(hdr, bl); DECODE_FINISH(bl); @@ -273,7 +273,7 @@ struct omap_section { encode(omap, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(1, bl); decode(omap, bl); DECODE_FINISH(bl); @@ -323,7 +323,7 @@ struct metadata_section { encode(missing, bl); ENCODE_FINISH(bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { DECODE_START(6, bl); decode(struct_ver, bl); decode(map_epoch, bl); diff --git a/src/tools/ceph_authtool.cc b/src/tools/ceph_authtool.cc index 2f81f99d5fff..e147e2b8ff1f 100644 --- a/src/tools/ceph_authtool.cc +++ b/src/tools/ceph_authtool.cc @@ -198,7 +198,7 @@ int main(int argc, const char **argv) r = bl.read_file(fn.c_str(), &err); if (r >= 0) { try { - bufferlist::iterator iter = bl.begin(); + auto iter = bl.cbegin(); decode(keyring, iter); } catch (const buffer::error &err) { cerr << "error reading file " << fn << std::endl; @@ -229,7 +229,7 @@ int main(int argc, const char **argv) int r = obl.read_file(import_keyring.c_str(), &err); if (r >= 0) { try { - bufferlist::iterator iter = obl.begin(); + auto iter = obl.cbegin(); decode(other, iter); } catch (const buffer::error &err) { cerr << "error reading file " << import_keyring << std::endl; diff --git a/src/tools/ceph_monstore_tool.cc b/src/tools/ceph_monstore_tool.cc index d8b78dce874b..25d987ec2b2a 100644 --- a/src/tools/ceph_monstore_tool.cc +++ b/src/tools/ceph_monstore_tool.cc @@ -69,7 +69,7 @@ public: fd = -1; return; } - bufferlist::iterator bliter = bl.begin(); + auto bliter = bl.cbegin(); uint8_t ver, ver2; decode(ver, bliter); decode(ver2, bliter); @@ -88,7 +88,7 @@ public: fd = -1; return; } - bliter = bl.begin(); + bliter = bl.cbegin(); t.reset(new MonitorDBStore::Transaction); t->decode(bliter); } @@ -339,7 +339,7 @@ int rewrite_transaction(MonitorDBStore& store, int version, std::cerr << err << ": " << cpp_strerror(r) << std::endl; return r; } - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); crush->decode(p); } @@ -477,7 +477,7 @@ int inflate_pgmap(MonitorDBStore& st, unsigned n, bool can_be_trimmed) { } bufferlist pg_bl = i->value(); pg_stat_t ps; - bufferlist::iterator p = pg_bl.begin(); + auto p = pg_bl.cbegin(); decode(ps, p); // will update the last_epoch_clean of all the pgs. pg_stat[pgid] = ps; @@ -970,14 +970,14 @@ int main(int argc, char **argv) { fs_map.print(ss); } else if (map_type == "mgr") { MgrMap mgr_map; - auto p = bl.begin(); + auto p = bl.cbegin(); mgr_map.decode(p); JSONFormatter f; f.dump_object("mgrmap", mgr_map); f.flush(ss); } else if (map_type == "crushmap") { CrushWrapper cw; - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); cw.decode(it); CrushCompiler cc(cw, std::cerr, 0); cc.decompile(ss); diff --git a/src/tools/ceph_objectstore_tool.cc b/src/tools/ceph_objectstore_tool.cc index c3c5805de3bf..be65987c6d58 100644 --- a/src/tools/ceph_objectstore_tool.cc +++ b/src/tools/ceph_objectstore_tool.cc @@ -110,7 +110,7 @@ int _action_on_all_objects_in_pg(ObjectStore *store, coll_t coll, action_on_obje cerr << "Error getting attr on : " << make_pair(coll, *obj) << ", " << cpp_strerror(r) << std::endl; } else { - bufferlist::iterator bp = attr.begin(); + auto bp = attr.cbegin(); try { decode(oi, bp); } catch (...) { @@ -551,7 +551,7 @@ int do_trim_pg_log(ObjectStore *store, const coll_t &coll, continue; bufferlist bl = p->value(); - bufferlist::iterator bp = bl.begin(); + auto bp = bl.cbegin(); pg_log_entry_t e; try { e.decode_with_checksum(bp); @@ -759,7 +759,7 @@ int ObjectStoreTool::export_files(ObjectStore *store, coll_t coll) int set_inc_osdmap(ObjectStore *store, epoch_t e, bufferlist& bl, bool force) { OSDMap::Incremental inc; - bufferlist::iterator it = bl.begin(); + auto it = bl.cbegin(); inc.decode(it); if (e == 0) { e = inc.epoch; @@ -915,7 +915,7 @@ int ObjectStoreTool::do_export(ObjectStore *fs, coll_t coll, spg_t pgid, int dump_data(Formatter *formatter, bufferlist &bl) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); data_section ds; ds.decode(ebliter); @@ -931,7 +931,7 @@ int dump_data(Formatter *formatter, bufferlist &bl) int get_data(ObjectStore *store, coll_t coll, ghobject_t hoid, ObjectStore::Transaction *t, bufferlist &bl) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); data_section ds; ds.decode(ebliter); @@ -945,7 +945,7 @@ int dump_attrs( Formatter *formatter, ghobject_t hoid, bufferlist &bl) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); attr_section as; as.decode(ebliter); @@ -956,7 +956,7 @@ int dump_attrs( map::iterator mi = as.data.find(SS_ATTR); if (mi != as.data.end()) { SnapSet snapset; - auto p = mi->second.begin(); + auto p = mi->second.cbegin(); snapset.decode(p); formatter->open_object_section("snapset"); snapset.dump(formatter); @@ -1003,7 +1003,7 @@ int get_attrs( ObjectStore::Transaction *t, bufferlist &bl, OSDriver &driver, SnapMapper &snap_mapper) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); attr_section as; as.decode(ebliter); @@ -1019,7 +1019,7 @@ int get_attrs( map::iterator mi = as.data.find(SS_ATTR); if (mi != as.data.end()) { SnapSet snapset; - auto p = mi->second.begin(); + auto p = mi->second.cbegin(); snapset.decode(p); cout << "snapset " << snapset << std::endl; for (auto& p : snapset.clone_snaps) { @@ -1051,7 +1051,7 @@ int get_attrs( int dump_omap_hdr(Formatter *formatter, bufferlist &bl) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); omap_hdr_section oh; oh.decode(ebliter); @@ -1065,7 +1065,7 @@ int dump_omap_hdr(Formatter *formatter, bufferlist &bl) int get_omap_hdr(ObjectStore *store, coll_t coll, ghobject_t hoid, ObjectStore::Transaction *t, bufferlist &bl) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); omap_hdr_section oh; oh.decode(ebliter); @@ -1078,7 +1078,7 @@ int get_omap_hdr(ObjectStore *store, coll_t coll, ghobject_t hoid, int dump_omap(Formatter *formatter, bufferlist &bl) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); omap_section os; os.decode(ebliter); @@ -1102,7 +1102,7 @@ int dump_omap(Formatter *formatter, bufferlist &bl) int get_omap(ObjectStore *store, coll_t coll, ghobject_t hoid, ObjectStore::Transaction *t, bufferlist &bl) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); omap_section os; os.decode(ebliter); @@ -1115,7 +1115,7 @@ int get_omap(ObjectStore *store, coll_t coll, ghobject_t hoid, int ObjectStoreTool::dump_object(Formatter *formatter, bufferlist &bl) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); object_begin ob; ob.decode(ebliter); @@ -1188,7 +1188,7 @@ int ObjectStoreTool::get_object(ObjectStore *store, { ObjectStore::Transaction tran; ObjectStore::Transaction *t = &tran; - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); object_begin ob; ob.decode(ebliter); @@ -1283,7 +1283,7 @@ int ObjectStoreTool::get_object(ObjectStore *store, int dump_pg_metadata(Formatter *formatter, bufferlist &bl, metadata_section &ms) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); ms.decode(ebliter); formatter->open_object_section("metadata_section"); @@ -1327,7 +1327,7 @@ int dump_pg_metadata(Formatter *formatter, bufferlist &bl, metadata_section &ms) int get_pg_metadata(ObjectStore *store, bufferlist &bl, metadata_section &ms, const OSDSuperblock& sb, OSDMap& curmap, spg_t pgid) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); ms.decode(ebliter); spg_t old_pgid = ms.info.pgid; ms.info.pgid = pgid; @@ -1622,7 +1622,7 @@ int ObjectStoreTool::dump_import(Formatter *formatter) return -EFAULT; } - bufferlist::iterator ebliter = ebl.begin(); + auto ebliter = ebl.cbegin(); pg_begin pgb; pgb.decode(ebliter); spg_t pgid = pgb.pgid; @@ -1724,7 +1724,7 @@ int ObjectStoreTool::do_import(ObjectStore *store, OSDSuperblock& sb, return -EFAULT; } - bufferlist::iterator ebliter = ebl.begin(); + auto ebliter = ebl.cbegin(); pg_begin pgb; pgb.decode(ebliter); spg_t pgid = pgb.pgid; @@ -2428,7 +2428,7 @@ int get_snapset(ObjectStore *store, coll_t coll, ghobject_t &ghobj, SnapSet &ss, << cpp_strerror(r) << std::endl; return r; } - bufferlist::iterator bp = attr.begin(); + auto bp = attr.cbegin(); try { decode(ss, bp); } catch (...) { @@ -2457,7 +2457,7 @@ int print_obj_info(ObjectStore *store, coll_t coll, ghobject_t &ghobj, Formatter << cpp_strerror(r) << std::endl; } else { object_info_t oi; - bufferlist::iterator bp = attr.begin(); + auto bp = attr.cbegin(); try { decode(oi, bp); formatter->open_object_section("info"); @@ -2518,7 +2518,7 @@ int set_size( return r; } object_info_t oi; - bufferlist::iterator bp = attr.begin(); + auto bp = attr.cbegin(); try { decode(oi, bp); } catch (...) { @@ -3454,14 +3454,14 @@ int main(int argc, char **argv) bufferlist bl; OSDSuperblock superblock; auto ch = fs->open_collection(coll_t::meta()); - bufferlist::iterator p; + bufferlist::const_iterator p; ret = fs->read(ch, OSD_SUPERBLOCK_GOBJECT, 0, 0, bl); if (ret < 0) { cerr << "Failure to read OSD superblock: " << cpp_strerror(ret) << std::endl; goto out; } - p = bl.begin(); + p = bl.cbegin(); decode(superblock, p); if (debug) { diff --git a/src/tools/cephfs/DataScan.cc b/src/tools/cephfs/DataScan.cc index ab64d1e38d9d..9b8b6d15bbe9 100644 --- a/src/tools/cephfs/DataScan.cc +++ b/src/tools/cephfs/DataScan.cc @@ -612,7 +612,7 @@ int DataScan::forall_objects( int r = ioctx.getxattr(oid, "scrub_tag", scrub_tag_bl); if (r >= 0) { std::string read_tag; - bufferlist::iterator q = scrub_tag_bl.begin(); + auto q = scrub_tag_bl.cbegin(); try { decode(read_tag, q); if (read_tag == filter_tag) { @@ -960,7 +960,7 @@ int DataScan::scan_links() } for (auto& p : items) { - bufferlist::iterator q = p.second.begin(); + auto q = p.second.cbegin(); string dname; snapid_t last; dentry_key_t::decode_helper(p.first, dname, last); @@ -1172,7 +1172,7 @@ int DataScan::scan_frags() if (parent_r != -ENODATA) { try { - bufferlist::iterator q = parent_bl.begin(); + auto q = parent_bl.cbegin(); backtrace.decode(q); } catch (buffer::error &e) { dout(4) << "Corrupt backtrace on '" << oid << "': " << e << dendl; @@ -1187,7 +1187,7 @@ int DataScan::scan_frags() if (layout_r != -ENODATA) { try { - bufferlist::iterator q = layout_bl.begin(); + auto q = layout_bl.cbegin(); decode(loaded_layout, q); } catch (buffer::error &e) { dout(4) << "Corrupt layout on '" << oid << "': " << e << dendl; @@ -1286,7 +1286,7 @@ int MetadataTool::read_fnode( return r; } - bufferlist::iterator old_fnode_iter = fnode_bl.begin(); + auto old_fnode_iter = fnode_bl.cbegin(); try { (*fnode).decode(old_fnode_iter); } catch (const buffer::error &err) { @@ -1325,7 +1325,7 @@ int MetadataTool::read_dentry(inodeno_t parent_ino, frag_t frag, } try { - bufferlist::iterator q = vals[key].begin(); + auto q = vals[key].cbegin(); snapid_t dnfirst; decode(dnfirst, q); char dentry_type; @@ -1427,7 +1427,7 @@ int MetadataDriver::get_frag_of( inode_backtrace_t backtrace; if (parent_bl.length()) { try { - bufferlist::iterator q = parent_bl.begin(); + auto q = parent_bl.cbegin(); backtrace.decode(q); have_backtrace = true; } catch (buffer::error &e) { diff --git a/src/tools/cephfs/JournalScanner.cc b/src/tools/cephfs/JournalScanner.cc index cb2ea244a09d..a68c88441264 100644 --- a/src/tools/cephfs/JournalScanner.cc +++ b/src/tools/cephfs/JournalScanner.cc @@ -93,7 +93,7 @@ int JournalScanner::scan_pointer() JournalPointer jp; try { - bufferlist::iterator q = pointer_bl.begin(); + auto q = pointer_bl.cbegin(); jp.decode(q); } catch(buffer::error &e) { derr << "Pointer " << pointer_oid << " is corrupt: " << e.what() << dendl; @@ -122,7 +122,7 @@ int JournalScanner::scan_header() header_present = true; } - bufferlist::iterator header_bl_i = header_bl.begin(); + auto header_bl_i = header_bl.cbegin(); header = new Journaler::Header(); try { @@ -211,7 +211,7 @@ int JournalScanner::scan_events() << ", 0x" << read_buf.length() << std::dec << " bytes available" << dendl; do { - bufferlist::iterator p = read_buf.begin(); + auto p = read_buf.cbegin(); uint64_t candidate_sentinel; decode(candidate_sentinel, p); @@ -303,7 +303,7 @@ int JournalScanner::scan_events() } else if (type == "purge_queue"){ PurgeItem pi; try { - bufferlist::iterator q = le_bl.begin(); + auto q = le_bl.cbegin(); ::decode(pi, q); } catch (const buffer::error &err) { valid_entry = false; diff --git a/src/tools/cephfs/JournalTool.cc b/src/tools/cephfs/JournalTool.cc index 95a06111cdb2..3e746de95859 100644 --- a/src/tools/cephfs/JournalTool.cc +++ b/src/tools/cephfs/JournalTool.cc @@ -674,7 +674,7 @@ int JournalTool::recover_dentries( } else if (r == 0) { // Conditionally update existing omap header fnode_t old_fnode; - bufferlist::iterator old_fnode_iter = old_fnode_bl.begin(); + auto old_fnode_iter = old_fnode_bl.cbegin(); try { old_fnode.decode(old_fnode_iter); dout(4) << "frag " << frag_oid.name << " fnode old v" << @@ -779,7 +779,7 @@ int JournalTool::recover_dentries( dout(4) << "dentry exists, checking versions..." << dendl; bufferlist &old_dentry = read_vals[key]; // Decode dentry+inode - bufferlist::iterator q = old_dentry.begin(); + auto q = old_dentry.cbegin(); snapid_t dnfirst; decode(dnfirst, q); @@ -848,7 +848,7 @@ int JournalTool::recover_dentries( dout(4) << "dentry exists, checking versions..." << dendl; bufferlist &old_dentry = read_vals[key]; // Decode dentry+inode - bufferlist::iterator q = old_dentry.begin(); + auto q = old_dentry.cbegin(); snapid_t dnfirst; decode(dnfirst, q); @@ -904,7 +904,7 @@ int JournalTool::recover_dentries( if (it != read_vals.end()) { dout(4) << "dentry exists, will remove" << dendl; - bufferlist::iterator q = it->second.begin(); + auto q = it->second.cbegin(); snapid_t dnfirst; decode(dnfirst, q); char dentry_type; @@ -980,7 +980,7 @@ int JournalTool::recover_dentries( InodeStore old_inode; dout(4) << "root exists, will modify (" << old_root_ino_bl.length() << ")" << dendl; - bufferlist::iterator inode_bl_iter = old_root_ino_bl.begin(); + auto inode_bl_iter = old_root_ino_bl.cbegin(); std::string magic; decode(magic, inode_bl_iter); if (magic == CEPH_FS_ONDISK_MAGIC) { @@ -1173,7 +1173,7 @@ int JournalTool::consume_inos(const std::set &inos) // Deserialize InoTable version_t inotable_ver; - bufferlist::iterator q = inotable_bl.begin(); + auto q = inotable_bl.cbegin(); decode(inotable_ver, q); InoTable ino_table(NULL); ino_table.decode(q); diff --git a/src/tools/cephfs/TableTool.cc b/src/tools/cephfs/TableTool.cc index 9c522fab1d20..60616c38e122 100644 --- a/src/tools/cephfs/TableTool.cc +++ b/src/tools/cephfs/TableTool.cc @@ -114,7 +114,7 @@ public: bufferlist table_bl; int read_r = io->read(object_name, table_bl, 0, 0); if (read_r >= 0) { - bufferlist::iterator q = table_bl.begin(); + auto q = table_bl.cbegin(); try { if (mds_table) { version_t version; diff --git a/src/tools/crushtool.cc b/src/tools/crushtool.cc index 12b7cfd10d44..67e2a1d073f0 100644 --- a/src/tools/crushtool.cc +++ b/src/tools/crushtool.cc @@ -830,7 +830,7 @@ int main(int argc, const char **argv) return EXIT_FAILURE; } } - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { crush.decode(p); } catch(...) { diff --git a/src/tools/osdmaptool.cc b/src/tools/osdmaptool.cc index 8847589b1a0b..9acd4c9ffa2c 100644 --- a/src/tools/osdmaptool.cc +++ b/src/tools/osdmaptool.cc @@ -411,7 +411,7 @@ int main(int argc, const char **argv) // validate CrushWrapper cw; - bufferlist::iterator p = cbl.begin(); + auto p = cbl.cbegin(); cw.decode(p); if (cw.get_max_devices() > osdmap.get_max_osd()) { diff --git a/src/tools/rados/RadosImport.cc b/src/tools/rados/RadosImport.cc index d437535268b8..ba4698cef4e8 100644 --- a/src/tools/rados/RadosImport.cc +++ b/src/tools/rados/RadosImport.cc @@ -91,7 +91,7 @@ int RadosImport::import(librados::IoCtx &io_ctx, bool no_overwrite) pool_mode = true; cout << "Importing pool" << std::endl; } else if (type == TYPE_PG_BEGIN) { - bufferlist::iterator ebliter = ebl.begin(); + auto ebliter = ebl.cbegin(); pg_begin pgb; pgb.decode(ebliter); spg_t pgid = pgb.pgid;; @@ -168,7 +168,7 @@ int RadosImport::import(librados::IoCtx &io_ctx, bool no_overwrite) int RadosImport::get_object_rados(librados::IoCtx &ioctx, bufferlist &bl, bool no_overwrite) { - bufferlist::iterator ebliter = bl.begin(); + auto ebliter = bl.cbegin(); object_begin ob; ob.decode(ebliter); map::iterator i; @@ -281,7 +281,7 @@ int RadosImport::get_object_rados(librados::IoCtx &ioctx, bufferlist &bl, bool n return ret; } - ebliter = ebl.begin(); + ebliter = ebl.cbegin(); //cout << "\tdo_object: Section type " << hex << type << dec << std::endl; //cout << "\t\tsection size " << ebl.length() << std::endl; if (type >= END_OF_TYPES) { diff --git a/src/tools/rados/rados.cc b/src/tools/rados/rados.cc index 4b21e8322d17..4d425757205f 100644 --- a/src/tools/rados/rados.cc +++ b/src/tools/rados/rados.cc @@ -1385,7 +1385,7 @@ static void dump_shard(const shard_info_t& shard, if (!shard.has_info_corrupted()) { object_info_t oi; bufferlist bl; - bufferlist::iterator bliter = k->second.begin(); + auto bliter = k->second.cbegin(); decode(oi, bliter); // Can't be corrupted f.open_object_section("object_info"); oi.dump(&f); @@ -1404,7 +1404,7 @@ static void dump_shard(const shard_info_t& shard, if (!shard.has_snapset_corrupted()) { SnapSet ss; bufferlist bl; - bufferlist::iterator bliter = k->second.begin(); + auto bliter = k->second.cbegin(); decode(ss, bliter); // Can't be corrupted f.open_object_section("snapset"); ss.dump(&f); @@ -1423,7 +1423,7 @@ static void dump_shard(const shard_info_t& shard, if (!shard.has_hinfo_corrupted()) { ECUtil::HashInfo hi; bufferlist bl; - bufferlist::iterator bliter = k->second.begin(); + auto bliter = k->second.cbegin(); decode(hi, bliter); // Can't be corrupted f.open_object_section("hashinfo"); hi.dump(&f); @@ -1509,7 +1509,7 @@ static void dump_inconsistent(const inconsistent_obj_t& inc, bufferlist bl; auto k = shard.attrs.find(OI_ATTR); assert(k != shard.attrs.end()); // Can't be missing - bufferlist::iterator bliter = k->second.begin(); + auto bliter = k->second.cbegin(); decode(oi, bliter); // Can't be corrupted f.open_object_section("selected_object_info"); oi.dump(&f); @@ -1540,7 +1540,7 @@ static void dump_inconsistent(const inconsistent_snapset_t& inc, if (inc.ss_bl.length()) { SnapSet ss; bufferlist bl = inc.ss_bl; - bufferlist::iterator bliter = bl.begin(); + auto bliter = bl.cbegin(); decode(ss, bliter); // Can't be corrupted f.open_object_section("snapset"); ss.dump(&f); @@ -2831,7 +2831,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, cerr << "error reading " << pool_name << "/" << oid << ": " << cpp_strerror(ret) << std::endl; goto out; } - bufferlist::iterator p = outdata.begin(); + auto p = outdata.cbegin(); bufferlist header; map kv; try { @@ -2884,7 +2884,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, } bufferlist hdr; map kv; - bufferlist::iterator p = bl.begin(); + auto p = bl.cbegin(); try { decode(hdr, p); decode(kv, p); @@ -3217,7 +3217,7 @@ static int rados_tool_common(const std::map < std::string, std::string > &opts, if (replybl.length()) { map,bufferlist> rm; set > missed; - bufferlist::iterator p = replybl.begin(); + auto p = replybl.cbegin(); decode(rm, p); decode(missed, p); for (map,bufferlist>::iterator p = rm.begin(); diff --git a/src/tools/radosacl.cc b/src/tools/radosacl.cc index 9e608a0812c2..3b071705b018 100644 --- a/src/tools/radosacl.cc +++ b/src/tools/radosacl.cc @@ -41,7 +41,7 @@ struct ACLID { void encode(bufferlist& bl) const { bl.append((const char *)id, ID_SIZE); } - void decode(bufferlist::iterator& iter) { + void decode(bufferlist::const_iterator& iter) { iter.copy(ID_SIZE, (char *)id); } }; @@ -69,7 +69,7 @@ public: using ceph::encode; encode(acls_map, bl); } - void decode(bufferlist::iterator& bl) { + void decode(bufferlist::const_iterator& bl) { using ceph::decode; decode(acls_map, bl); } @@ -161,7 +161,7 @@ int main(int argc, const char **argv) << " len=" << bl2.length() << std::endl; ObjectACLs oa; if (r >= 0) { - bufferlist::iterator iter = bl2.begin(); + auto iter = bl2.cbegin(); oa.decode(iter); } diff --git a/src/tools/rebuild_mondb.cc b/src/tools/rebuild_mondb.cc index 09986593fa3a..9d8cb4c5dd24 100644 --- a/src/tools/rebuild_mondb.cc +++ b/src/tools/rebuild_mondb.cc @@ -98,7 +98,7 @@ static int get_auth_inc(const string& keyring_path, cout << "ignoring empty keyring: " << keyring_path << std::endl; return 0; } - auto bp = bl.begin(); + auto bp = bl.cbegin(); try { decode(keyring, bp); } catch (const buffer::error& e) { @@ -259,7 +259,7 @@ int update_osdmap(ObjectStore& fs, OSDSuperblock& sb, MonitorDBStore& ms) t->put(prefix, e, bl); OSDMap::Incremental inc; - auto p = bl.begin(); + auto p = bl.cbegin(); inc.decode(p); features = inc.encode_features | CEPH_FEATURE_RESERVED; if (osdmap.get_epoch() && e > 1) { @@ -293,7 +293,7 @@ int update_osdmap(ObjectStore& fs, OSDSuperblock& sb, MonitorDBStore& ms) } t->put(prefix, ms.combine_strings("full", e), bl); - auto p = bl.begin(); + auto p = bl.cbegin(); osdmap.decode(p); if (osdmap.have_crc()) { if (have_crc && osdmap.get_crc() != crc) { @@ -380,7 +380,7 @@ int update_pgmap_pg(ObjectStore& fs, MonitorDBStore& ms) r = ms.get(prefix, stringify(pgid.pgid), bl); if (r >= 0) { pg_stat_t pg_stat; - auto bp = bl.begin(); + auto bp = bl.cbegin(); decode(pg_stat, bp); latest_epoch = pg_stat.reported_epoch; } -- 2.47.3