intarith: kill P2* macros

These macros are originally introduced in https://github.com/ceph/ceph/pull/10128
and get replaced by https://github.com/ceph/ceph/pull/19913.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>

diff --git a/src/include/intarith.h b/src/include/intarith.h
index b2fb849db310549c617b71f141305c05db1a5def..e08cbc0e4f26cc4dea1156e428dae10cc655bf81 100644 (file)
--- a/src/include/intarith.h
+++ b/src/include/intarith.h
@@ -46,29 +46,25 @@ constexpr inline std::make_unsigned_t<std::common_type_t<T, U>> shift_round_up(T
 }
 
 /*
- * Macro to determine if value is a power of 2
+ * Wrapper to determine if value is a power of 2
  */
-#define ISP2(x)                (((x) & ((x) - 1)) == 0)
-
 template<typename T>
 constexpr inline bool isp2(T x) {
   return (x & (x - 1)) == 0;
 }
 
 /*
- * Macros for various sorts of alignment and rounding.  The "align" must
+ * Wrappers for various sorts of alignment and rounding.  The "align" must
  * be a power of 2.  Often times it is a block, sector, or page.
  */
 
 /*
  * return x rounded down to an align boundary
- * eg, P2ALIGN(1200, 1024) == 1024 (1*align)
- * eg, P2ALIGN(1024, 1024) == 1024 (1*align)
- * eg, P2ALIGN(0x1234, 0x100) == 0x1200 (0x12*align)
- * eg, P2ALIGN(0x5600, 0x100) == 0x5600 (0x56*align)
+ * eg, p2align(1200, 1024) == 1024 (1*align)
+ * eg, p2align(1024, 1024) == 1024 (1*align)
+ * eg, p2align(0x1234, 0x100) == 0x1200 (0x12*align)
+ * eg, p2align(0x5600, 0x100) == 0x5600 (0x56*align)
  */
-#define P2ALIGN(x, align)              ((x) & -(align))
-
 template<typename T, typename U>
 constexpr inline std::make_unsigned_t<std::common_type_t<T, U>> p2align(T x, U align) {
   return x & -align;
@@ -76,11 +72,9 @@ constexpr inline std::make_unsigned_t<std::common_type_t<T, U>> p2align(T x, U a
 
 /*
  * return x % (mod) align
- * eg, P2PHASE(0x1234, 0x100) == 0x34 (x-0x12*align)
- * eg, P2PHASE(0x5600, 0x100) == 0x00 (x-0x56*align)
+ * eg, p2phase(0x1234, 0x100) == 0x34 (x-0x12*align)
+ * eg, p2phase(0x5600, 0x100) == 0x00 (x-0x56*align)
  */
-#define P2PHASE(x, align)              ((x) & ((align) - 1))
-
 template<typename T, typename U>
 constexpr inline std::make_unsigned_t<std::common_type_t<T, U>> p2phase(T x, U align) {
   return x & (align - 1);
@@ -89,11 +83,9 @@ constexpr inline std::make_unsigned_t<std::common_type_t<T, U>> p2phase(T x, U a
 /*
  * return how much space is left in this block (but if it's perfectly
  * aligned, return 0).
- * eg, P2NPHASE(0x1234, 0x100) == 0xcc (0x13*align-x)
- * eg, P2NPHASE(0x5600, 0x100) == 0x00 (0x56*align-x)
+ * eg, p2nphase(0x1234, 0x100) == 0xcc (0x13*align-x)
+ * eg, p2nphase(0x5600, 0x100) == 0x00 (0x56*align-x)
  */
-#define P2NPHASE(x, align)             (-(x) & ((align) - 1))
-
 template<typename T, typename U>
 constexpr inline std::make_unsigned_t<std::common_type_t<T, U>> p2nphase(T x, U align) {
   return -x & (align - 1);
@@ -101,11 +93,9 @@ constexpr inline std::make_unsigned_t<std::common_type_t<T, U>> p2nphase(T x, U
 
 /*
  * return x rounded up to an align boundary
- * eg, P2ROUNDUP(0x1234, 0x100) == 0x1300 (0x13*align)
- * eg, P2ROUNDUP(0x5600, 0x100) == 0x5600 (0x56*align)
+ * eg, p2roundup(0x1234, 0x100) == 0x1300 (0x13*align)
+ * eg, p2roundup(0x5600, 0x100) == 0x5600 (0x56*align)
  */
-#define P2ROUNDUP(x, align)            (-(-(x) & -(align)))
-
 template<typename T, typename U>
 constexpr inline std::make_unsigned_t<std::common_type_t<T, U>> p2roundup(T x, U align) {
   return (-(-(x) & -(align)));

diff --git a/src/os/bluestore/BlueStore.h b/src/os/bluestore/BlueStore.h
index f0b6bc00e9d44e188a658e4b12e0b11c20541adb..da993a8a908e2900d0ff4ff8ebae63c309876d20 100644 (file)
--- a/src/os/bluestore/BlueStore.h
+++ b/src/os/bluestore/BlueStore.h
@@ -2716,7 +2716,7 @@ public:
        granularity = ROUND_UP_TO(granularity, min_alloc_size);
       }
 
-      uint64_t entries = P2ROUNDUP(total, granularity) / granularity;
+      uint64_t entries = p2roundup(total, granularity) / granularity;
       collections_bfs.resize(entries,
         bloom_filter(BLOOM_FILTER_SALT_COUNT,
                      BLOOM_FILTER_TABLE_SIZE,

diff --git a/src/test/test_intarith.cc b/src/test/test_intarith.cc
index ad4487a870a638c9af9f58be190f0a0446c28b79..239222046e3a3af5526fe173c85de25ee030ed3a 100644 (file)
--- a/src/test/test_intarith.cc
+++ b/src/test/test_intarith.cc
@@ -63,20 +63,20 @@ TEST(intarith, ctz) {
 }
 
 TEST(intarith, p2family) {
-  ASSERT_TRUE(ISP2(0x100));
-  ASSERT_FALSE(ISP2(0x1234));
+  ASSERT_TRUE(isp2(0x100));
+  ASSERT_FALSE(isp2(0x1234));
 
-  ASSERT_EQ(1024, P2ALIGN(1200, 1024));
-  ASSERT_EQ(1024, P2ALIGN(1024, 1024));
-  ASSERT_EQ(0x1200, P2ALIGN(0x1234, 0x100));
-  ASSERT_EQ(0x5600, P2ALIGN(0x5600, 0x100));
+  ASSERT_EQ(1024, p2align(1200, 1024));
+  ASSERT_EQ(1024, p2align(1024, 1024));
+  ASSERT_EQ(0x1200, p2align(0x1234, 0x100));
+  ASSERT_EQ(0x5600, p2align(0x5600, 0x100));
 
-  ASSERT_EQ(0x34, P2PHASE(0x1234, 0x100));
-  ASSERT_EQ(0x00, P2PHASE(0x5600, 0x100));
+  ASSERT_EQ(0x34, p2phase(0x1234, 0x100));
+  ASSERT_EQ(0x00, p2phase(0x5600, 0x100));
 
-  ASSERT_EQ(0xcc, P2NPHASE(0x1234, 0x100));
-  ASSERT_EQ(0x00, P2NPHASE(0x5600, 0x100));
+  ASSERT_EQ(0xcc, p2nphase(0x1234, 0x100));
+  ASSERT_EQ(0x00, p2nphase(0x5600, 0x100));
 
-  ASSERT_EQ(0x1300, P2ROUNDUP(0x1234, 0x100));
-  ASSERT_EQ(0x5600, P2ROUNDUP(0x5600, 0x100));
+  ASSERT_EQ(0x1300, p2roundup(0x1234, 0x100));
+  ASSERT_EQ(0x5600, p2roundup(0x5600, 0x100));
 }