RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #21085 from xiexingguo/wip-kill-p2-macros

Browse Source 
intarith: get rid of  P2* and ROUND_UP* macros

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Kefu Chai 2018-03-29 09:05:47 +08:00 committed by GitHub
commit 5cd64fdf86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 27 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
src/include/intarith.h
View File

@ -17,58 +17,42 @@
#include <type_traits>
#ifndef DIV_ROUND_UP
#define DIV_ROUND_UP(n, d) (((n) + (d) - 1) / (d))
#endif
template<typename T, typename U>
constexpr inline std::make_unsigned_t<std::common_type_t<T, U>> div_round_up(T n, U d) {
return (n + d - 1) / d;
}
#ifndef ROUND_UP_TO
#define ROUND_UP_TO(n, d) ((n)%(d) ? ((n)+(d)-(n)%(d)) : (n))
#endif
template<typename T, typename U>
constexpr inline std::make_unsigned_t<std::common_type_t<T, U>> round_up_to(T n, U d) {
return (n % d ? (n + d - n % d) : n);
}
#ifndef SHIFT_ROUND_UP
#define SHIFT_ROUND_UP(x,y) (((x)+(1<<(y))-1) >> (y))
#endif
template<typename T, typename U>
constexpr inline std::make_unsigned_t<std::common_type_t<T, U>> shift_round_up(T x, U y) {
return (x + (1 << y) - 1) >> y;
}
/*
* 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 +60,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 +71,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 +81,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)));

6
src/os/bluestore/BlueStore.h
View File

@ -2707,16 +2707,16 @@ public:
assert(min_alloc_size && isp2(min_alloc_size));
assert(mem_cap);
total = ROUND_UP_TO(total, min_alloc_size);
total = round_up_to(total, min_alloc_size);
granularity = total * BLOOM_FILTER_TABLE_SIZE * 2 / mem_cap;
if (!granularity) {
granularity = min_alloc_size;
} else {
granularity = ROUND_UP_TO(granularity, min_alloc_size);
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,

24
src/test/test_intarith.cc
View File

@ -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));
}