Skip to content

Fix object pool size reporting under ASan #3739

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chenBright wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −1
Open

Fix object pool size reporting under ASan #3739

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/butil/object_pool_inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,7 +380,7 @@ class BAIDU_CACHELINE_ALIGNMENT ObjectPool {
}
}
}
info.total_size = info.block_num * info.block_item_num * sizeof(T);
info.total_size = info.block_num * info.block_item_num * sizeof(BlockItem);
return info;
}

Expand Down
23 changes: 23 additions & 0 deletions test/object_pool_unittest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ void check_block_capacity(size_t expected_capacity) {
}

clear_objects<T>();
EXPECT_EQ(0u, describe_objects<T>().total_size);
EXPECT_EQ(expected_capacity, describe_objects<T>().block_item_num);
std::vector<T*> objects;
for (size_t i = 0; i < expected_capacity; ++i) {
Expand All @@ -147,17 +148,39 @@ void check_block_capacity(size_t expected_capacity) {
objects.push_back(obj);
}
EXPECT_EQ(1u, describe_objects<T>().block_num);
EXPECT_EQ(sizeof(Block::items), describe_objects<T>().total_size);
T* next = get_object<T>();
ASSERT_TRUE(next);
EXPECT_EQ(2u, describe_objects<T>().block_num);
EXPECT_EQ(2 * sizeof(Block::items), describe_objects<T>().total_size);
EXPECT_EQ(0, return_object(next));
EXPECT_EQ(next, get_object<T>());
EXPECT_EQ(0, return_object(next));
for (T* obj : objects) {
EXPECT_EQ('x', obj->data[0]);
EXPECT_EQ(0, return_object(obj));
}
EXPECT_EQ(2 * sizeof(Block::items), describe_objects<T>().total_size);
clear_objects<T>();
EXPECT_EQ(0u, describe_objects<T>().total_size);
}

TEST_F(ObjectPoolTest, total_size_counts_slot_storage) {
clear_objects<char>();
EXPECT_EQ(0u, describe_objects<char>().total_size);
char* obj = get_object<char>();
ASSERT_TRUE(obj);
const ObjectPoolInfo info = describe_objects<char>();
EXPECT_EQ(1u, info.item_num);
#ifdef BUTIL_USE_ASAN
EXPECT_EQ(2048u, info.total_size);
#else
EXPECT_EQ(256u, info.total_size);
#endif
EXPECT_EQ(0, return_object(obj));
EXPECT_EQ(info.total_size, describe_objects<char>().total_size);
clear_objects<char>();
EXPECT_EQ(0u, describe_objects<char>().total_size);
}

TEST_F(ObjectPoolTest, block_size_limit_includes_slot_padding) {
Expand Down
Loading