From 16409361c73e8330960625b6f1893642b65e71f9 Mon Sep 17 00:00:00 2001 From: Kefu Chai Date: Wed, 10 Mar 2021 15:59:13 +0800 Subject: [PATCH] crimson: switch to ceph_le*() constructors instead of using init_le*() helpers, use ceph_le*() constructors for better readability. Signed-off-by: Kefu Chai --- src/crimson/net/ProtocolV2.cc | 16 ++++----- .../lba_manager/btree/lba_btree_node_impl.h | 12 +++---- .../seastore/omap_manager/btree/omap_types.h | 34 +++++++++---------- src/crimson/os/seastore/onode.h | 2 +- src/crimson/os/seastore/seastore_types.h | 14 ++++---- src/test/crimson/test_fixed_kv_node_layout.cc | 12 +++---- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/crimson/net/ProtocolV2.cc b/src/crimson/net/ProtocolV2.cc index 4e118302bc852..15376fe8a1420 100644 --- a/src/crimson/net/ProtocolV2.cc +++ b/src/crimson/net/ProtocolV2.cc @@ -1834,8 +1834,8 @@ ceph::bufferlist ProtocolV2::do_sweep_messages( ceph_msg_header2 header2{header.seq, header.tid, header.type, header.priority, header.version, - init_le32(0), header.data_off, - init_le64(conn.in_seq), + ceph_le32(0), header.data_off, + ceph_le64(conn.in_seq), footer.flags, header.compat_version, header.reserved}; @@ -1873,16 +1873,16 @@ seastar::future<> ProtocolV2::read_message(utime_t throttle_stamp) current_header.type, current_header.priority, current_header.version, - init_le32(msg_frame.front_len()), - init_le32(msg_frame.middle_len()), - init_le32(msg_frame.data_len()), + ceph_le32(msg_frame.front_len()), + ceph_le32(msg_frame.middle_len()), + ceph_le32(msg_frame.data_len()), current_header.data_off, conn.get_peer_name(), current_header.compat_version, current_header.reserved, - init_le32(0)}; - ceph_msg_footer footer{init_le32(0), init_le32(0), - init_le32(0), init_le64(0), current_header.flags}; + ceph_le32(0)}; + ceph_msg_footer footer{ceph_le32(0), ceph_le32(0), + ceph_le32(0), ceph_le64(0), current_header.flags}; auto conn_ref = seastar::static_pointer_cast( conn.shared_from_this()); diff --git a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.h b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.h index af8ddfdbeeeef..e2cc70eb03a6d 100644 --- a/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.h +++ b/src/crimson/os/seastore/lba_manager/btree/lba_btree_node_impl.h @@ -37,8 +37,8 @@ struct lba_node_meta_le_t { lba_node_meta_le_t() = default; lba_node_meta_le_t(const lba_node_meta_le_t &) = default; explicit lba_node_meta_le_t(const lba_node_meta_t &val) - : begin(init_le64(val.begin)), - end(init_le64(val.end)), + : begin(ceph_le64(val.begin)), + end(ceph_le64(val.end)), depth(init_depth_le(val.depth)) {} operator lba_node_meta_t() const { @@ -319,16 +319,16 @@ constexpr size_t LEAF_NODE_CAPACITY = 145; struct lba_map_val_le_t { extent_len_le_t len = init_extent_len_le(0); paddr_le_t paddr; - ceph_le32 refcount = init_le32(0); - ceph_le32 checksum = init_le32(0); + ceph_le32 refcount{0}; + ceph_le32 checksum{0}; lba_map_val_le_t() = default; lba_map_val_le_t(const lba_map_val_le_t &) = default; explicit lba_map_val_le_t(const lba_map_val_t &val) : len(init_extent_len_le(val.len)), paddr(paddr_le_t(val.paddr)), - refcount(init_le32(val.refcount)), - checksum(init_le32(val.checksum)) {} + refcount(val.refcount), + checksum(val.checksum) {} operator lba_map_val_t() const { return lba_map_val_t{ len, paddr, refcount, checksum }; diff --git a/src/crimson/os/seastore/omap_manager/btree/omap_types.h b/src/crimson/os/seastore/omap_manager/btree/omap_types.h index e187a1cad903a..9e0d10e035863 100644 --- a/src/crimson/os/seastore/omap_manager/btree/omap_types.h +++ b/src/crimson/os/seastore/omap_manager/btree/omap_types.h @@ -68,24 +68,24 @@ struct omap_inner_key_t { }; struct omap_inner_key_le_t { - ceph_le16 key_off = init_le16(0); - ceph_le16 key_len = init_le16(0); - laddr_le_t laddr = laddr_le_t(0); + ceph_le16 key_off{0}; + ceph_le16 key_len{0}; + laddr_le_t laddr{0}; omap_inner_key_le_t() = default; omap_inner_key_le_t(const omap_inner_key_le_t &) = default; explicit omap_inner_key_le_t(const omap_inner_key_t &key) - : key_off(init_le16(key.key_off)), - key_len(init_le16(key.key_len)), - laddr(laddr_le_t(key.laddr)) {} + : key_off(key.key_off), + key_len(key.key_len), + laddr(key.laddr) {} operator omap_inner_key_t() const { return omap_inner_key_t{uint16_t(key_off), uint16_t(key_len), laddr_t(laddr)}; } omap_inner_key_le_t& operator=(omap_inner_key_t key) { - key_off = init_le16(key.key_off); - key_len = init_le16(key.key_len); + key_off = key.key_off; + key_len = key.key_len; laddr = laddr_le_t(key.laddr); return *this; } @@ -123,16 +123,16 @@ struct omap_leaf_key_t { }; struct omap_leaf_key_le_t { - ceph_le16 key_off = init_le16(0); - ceph_le16 key_len = init_le16(0); - ceph_le16 val_len = init_le16(0); + ceph_le16 key_off{0}; + ceph_le16 key_len{0}; + ceph_le16 val_len{0}; omap_leaf_key_le_t() = default; omap_leaf_key_le_t(const omap_leaf_key_le_t &) = default; explicit omap_leaf_key_le_t(const omap_leaf_key_t &key) - : key_off(init_le16(key.key_off)), - key_len(init_le16(key.key_len)), - val_len(init_le16(key.val_len)) {} + : key_off(key.key_off), + key_len(key.key_len), + val_len(key.val_len) {} operator omap_leaf_key_t() const { return omap_leaf_key_t{uint16_t(key_off), uint16_t(key_len), @@ -140,9 +140,9 @@ struct omap_leaf_key_le_t { } omap_leaf_key_le_t& operator=(omap_leaf_key_t key) { - key_off = init_le16(key.key_off); - key_len = init_le16(key.key_len); - val_len = init_le16(key.val_len); + key_off = key.key_off; + key_len = key.key_len; + val_len = key.val_len; return *this; } diff --git a/src/crimson/os/seastore/onode.h b/src/crimson/os/seastore/onode.h index 08ad754fb407d..afe9773a34f37 100644 --- a/src/crimson/os/seastore/onode.h +++ b/src/crimson/os/seastore/onode.h @@ -17,7 +17,7 @@ namespace crimson::os::seastore { struct __attribute__((packed)) onode_layout_t { - ceph_le32 size = init_le32(0); + ceph_le32 size{0}; omap_root_le_t omap_root; } __attribute__((packed)); diff --git a/src/crimson/os/seastore/seastore_types.h b/src/crimson/os/seastore/seastore_types.h index 4318d7f926dda..47d828d8ac73a 100644 --- a/src/crimson/os/seastore/seastore_types.h +++ b/src/crimson/os/seastore/seastore_types.h @@ -18,7 +18,7 @@ using depth_t = uint32_t; using depth_le_t = ceph_le32; inline depth_le_t init_depth_le(uint32_t i) { - return init_le32(i); + return ceph_le32(i); } using checksum_t = uint32_t; @@ -177,14 +177,14 @@ constexpr paddr_t make_fake_paddr(segment_off_t off) { } struct __attribute((packed)) paddr_le_t { - ceph_le32 segment = init_le32(NULL_SEG_ID); - ceph_les32 offset = init_les32(NULL_SEG_OFF); + ceph_le32 segment = ceph_le32(NULL_SEG_ID); + ceph_les32 offset = ceph_les32(NULL_SEG_OFF); paddr_le_t() = default; paddr_le_t(ceph_le32 segment, ceph_les32 offset) : segment(segment), offset(offset) {} paddr_le_t(segment_id_t segment, segment_off_t offset) - : segment(init_le32(segment)), offset(init_les32(offset)) {} + : segment(ceph_le32(segment)), offset(ceph_les32(offset)) {} paddr_le_t(const paddr_t &addr) : paddr_le_t(addr.segment, addr.offset) {} operator paddr_t() const { @@ -230,12 +230,12 @@ constexpr laddr_t L_ADDR_ROOT = std::numeric_limits::max() - 1; constexpr laddr_t L_ADDR_LBAT = std::numeric_limits::max() - 2; struct __attribute((packed)) laddr_le_t { - ceph_le64 laddr = init_le64(L_ADDR_NULL); + ceph_le64 laddr = ceph_le64(L_ADDR_NULL); laddr_le_t() = default; laddr_le_t(const laddr_le_t &) = default; explicit laddr_le_t(const laddr_t &addr) - : laddr(init_le64(addr)) {} + : laddr(ceph_le64(addr)) {} operator laddr_t() const { return laddr_t(laddr); @@ -255,7 +255,7 @@ constexpr extent_len_t EXTENT_LEN_MAX = using extent_len_le_t = ceph_le32; inline extent_len_le_t init_extent_len_le(extent_len_t len) { - return init_le32(len); + return ceph_le32(len); } struct laddr_list_t : std::list> { diff --git a/src/test/crimson/test_fixed_kv_node_layout.cc b/src/test/crimson/test_fixed_kv_node_layout.cc index 5f59c4e5e045d..e6377ec14e3cf 100644 --- a/src/test/crimson/test_fixed_kv_node_layout.cc +++ b/src/test/crimson/test_fixed_kv_node_layout.cc @@ -24,13 +24,13 @@ struct test_val_t { }; struct test_val_le_t { - ceph_le32 t1 = init_le32(0); - ceph_les32 t2 = init_les32(0); + ceph_le32 t1{0}; + ceph_les32 t2{0}; test_val_le_t() = default; test_val_le_t(const test_val_le_t &) = default; test_val_le_t(const test_val_t &nv) - : t1(init_le32(nv.t1)), t2(init_les32(nv.t2)) {} + : t1(nv.t1), t2(nv.t2) {} operator test_val_t() const { return test_val_t{t1, t2}; @@ -67,13 +67,13 @@ struct test_meta_t { }; struct test_meta_le_t { - ceph_le32 t1 = init_le32(0); - ceph_le32 t2 = init_le32(0); + ceph_le32 t1{0}; + ceph_le32 t2{0}; test_meta_le_t() = default; test_meta_le_t(const test_meta_le_t &) = default; test_meta_le_t(const test_meta_t &nv) - : t1(init_le32(nv.t1)), t2(init_le32(nv.t2)) {} + : t1(nv.t1), t2(nv.t2) {} operator test_meta_t() const { return test_meta_t{t1, t2}; -- 2.39.5