coffee/cpp-ipc
1
0
Fork 0
mirror of https://github.com/mutouyun/cpp-ipc.git synced 2025-12-06 16:56:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed segmentation fault in unit test.

Browse Source
This commit is contained in:
mutouyun 2023-09-10 12:31:09 +08:00
parent 342f3ef27e
commit 1f93852fe7
2 changed files with 19 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/libpmr/small_storage.h
View File

@ -283,7 +283,7 @@ class holder<void, true> : public holder_base {
public:
template <typename Value>
static std::size_t full_sizeof(std::size_t count) noexcept {
return offsetof(holder, info_) + detail::full_sizeof<Value>(count);
return sizeof(holder) - sizeof(info_) + detail::full_sizeof<Value>(count);
}
holder() noexcept

29
test/pmr/test_pmr_small_storage.cpp
View File

@ -74,17 +74,24 @@ TEST(small_storage, holder_copy_move) {
h5.destroy(alc);
h6.destroy(alc);
pmr::holder<void, true> h7(alc, ::LIBIMP::types<int>{}, 10);
pmr::holder<void, true> h8, h9;
h7.copy_to(alc, &h8);
EXPECT_EQ(h7.count(), 10);
EXPECT_EQ(h8.count(), 10);
h7.move_to(alc, &h9);
EXPECT_EQ(h7.count(), 0);
EXPECT_EQ(h9.count(), 10);
h7.destroy(alc);
h8.destroy(alc);
h9.destroy(alc);
void *ph1 = std::malloc(pmr::holder<void, true>::full_sizeof<int>(10));
void *ph2 = std::malloc(pmr::holder<void, true>::full_sizeof<int>(10));
void *ph3 = std::malloc(pmr::holder<void, true>::full_sizeof<int>(10));
auto *h7 = ::new (ph1) pmr::holder<void, true>(alc, ::LIBIMP::types<int>{}, 10);
auto *h8 = ::new (ph2) pmr::holder<void, true>;
auto *h9 = ::new (ph2) pmr::holder<void, true>;
h7->copy_to(alc, h8);
EXPECT_EQ(h7->count(), 10);
EXPECT_EQ(h8->count(), 10);
h7->move_to(alc, h9);
EXPECT_EQ(h7->count(), 0);
EXPECT_EQ(h9->count(), 10);
h7->destroy(alc);
h8->destroy(alc);
h9->destroy(alc);
std::free(ph1);
std::free(ph2);
std::free(ph3);
pmr::holder<void, false> h10(alc, ::LIBIMP::types<int>{}, 10);
pmr::holder<void, false> h11, h12;