460nm/asl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Implement move assign for buffer

Browse Source
This commit is contained in:
Steven Le Rouzic
2025-01-01 19:40:06 +01:00
parent 22131693e1
commit 7e66d8e7e5
2 changed files with 121 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
asl/buffer.hpp
View File

@ -111,15 +111,8 @@ private:
} }
} }
public: // NOLINTNEXTLINE(*-rvalue-reference-param-not-moved)
constexpr buffer() requires default_constructible<Allocator> = default; void move_from_other(buffer&& other)
explicit constexpr buffer(Allocator allocator)
: m_allocator{ASL_MOVE(allocator)}
{}
constexpr buffer(buffer&& other)
: buffer(ASL_MOVE(other.m_allocator))
{ {
if (other.is_on_heap()) if (other.is_on_heap())
{ {
@ -142,6 +135,30 @@ public:
other.set_size_inline(0); other.set_size_inline(0);
} }
public:
constexpr buffer() requires default_constructible<Allocator> = default;
explicit constexpr buffer(Allocator allocator)
: m_allocator{ASL_MOVE(allocator)}
{}
constexpr buffer(buffer&& other)
: buffer(ASL_MOVE(other.m_allocator))
{
move_from_other(ASL_MOVE(other));
}
constexpr buffer& operator=(buffer&& other)
{
if (&other == this) { return *this; }
destroy();
m_allocator = ASL_MOVE(other.m_allocator);
move_from_other(ASL_MOVE(other));
return *this;
}
~buffer() ~buffer()
{ {
destroy(); destroy();

97
asl/tests/buffer_tests.cpp
View File

@ -191,13 +191,14 @@ ASL_TEST(clear)
ASL_TEST_EXPECT(b.size() == 0); ASL_TEST_EXPECT(b.size() == 0);
} }
static_assert(asl::buffer<DestructorObserver>::kInlineCapacity == 2);
ASL_TEST(clear_destructor_small) ASL_TEST(clear_destructor_small)
{ {
bool d0 = false; bool d0 = false;
bool d1 = false; bool d1 = false;
asl::buffer<DestructorObserver> buf; asl::buffer<DestructorObserver> buf;
static_assert(asl::buffer<DestructorObserver>::kInlineCapacity >= 2);
buf.push(&d0); buf.push(&d0);
buf.push(&d1); buf.push(&d1);
@ -214,7 +215,6 @@ ASL_TEST(clear_destructor_heap)
bool d2 = false; bool d2 = false;
asl::buffer<DestructorObserver> buf; asl::buffer<DestructorObserver> buf;
static_assert(asl::buffer<DestructorObserver>::kInlineCapacity < 3);
buf.push(&d0); buf.push(&d0);
buf.push(&d1); buf.push(&d1);
@ -283,3 +283,96 @@ ASL_TEST(move_construct_from_inline_non_trivial)
ASL_TEST_EXPECT(d[0] == true); ASL_TEST_EXPECT(d[0] == true);
ASL_TEST_EXPECT(d[1] == true); ASL_TEST_EXPECT(d[1] == true);
} }
ASL_TEST(move_assign_from_heap)
{
bool d[6]{};
{
asl::buffer<DestructorObserver> buf;
asl::buffer<DestructorObserver> buf2;
buf.push(&d[0]);
buf.push(&d[1]);
buf.push(&d[2]);
buf2.push(&d[3]);
buf2.push(&d[4]);
buf2.push(&d[5]);
ASL_TEST_EXPECT(d[0] == false);
ASL_TEST_EXPECT(d[1] == false);
ASL_TEST_EXPECT(d[2] == false);
ASL_TEST_EXPECT(d[3] == false);
ASL_TEST_EXPECT(d[4] == false);
ASL_TEST_EXPECT(d[5] == false);
buf2 = ASL_MOVE(buf);
ASL_TEST_EXPECT(buf.size() == 0);
ASL_TEST_EXPECT(buf2.size() == 3);
ASL_TEST_EXPECT(d[0] == false);
ASL_TEST_EXPECT(d[1] == false);
ASL_TEST_EXPECT(d[2] == false);
ASL_TEST_EXPECT(d[3] == true);
ASL_TEST_EXPECT(d[4] == true);
ASL_TEST_EXPECT(d[5] == true);
}
ASL_TEST_EXPECT(d[0] == true);
ASL_TEST_EXPECT(d[1] == true);
ASL_TEST_EXPECT(d[2] == true);
ASL_TEST_EXPECT(d[3] == true);
ASL_TEST_EXPECT(d[4] == true);
ASL_TEST_EXPECT(d[5] == true);
}
ASL_TEST(move_assign_trivial_heap_to_inline)
{
isize_t alloc_count = 0;
asl::buffer<int64_t, CounterAllocator> buf{CounterAllocator(&alloc_count)};
asl::buffer<int64_t, CounterAllocator> buf2{CounterAllocator(&alloc_count)};
buf.push(1);
buf.push(2);
ASL_TEST_EXPECT(alloc_count == 0);
buf2.push(3);
buf2.push(4);
buf2.push(5);
ASL_TEST_EXPECT(alloc_count == 1);
buf = ASL_MOVE(buf2);
ASL_TEST_EXPECT(alloc_count == 1);
ASL_TEST_EXPECT(buf.size() == 3);
ASL_TEST_EXPECT(buf2.size() == 0);
ASL_TEST_EXPECT(buf[0] == 3);
ASL_TEST_EXPECT(buf[1] == 4);
ASL_TEST_EXPECT(buf[2] == 5);
}
ASL_TEST(move_assign_trivial_inline_to_heap)
{
isize_t alloc_count = 0;
asl::buffer<int64_t, CounterAllocator> buf{CounterAllocator(&alloc_count)};
asl::buffer<int64_t, CounterAllocator> buf2{CounterAllocator(&alloc_count)};
buf.push(1);
buf.push(2);
ASL_TEST_EXPECT(alloc_count == 0);
buf2.push(3);
buf2.push(4);
buf2.push(5);
ASL_TEST_EXPECT(alloc_count == 1);
buf2 = ASL_MOVE(buf);
ASL_TEST_EXPECT(alloc_count == 1);
ASL_TEST_EXPECT(buf.size() == 0);
ASL_TEST_EXPECT(buf2.size() == 2);
ASL_TEST_EXPECT(buf2[0] == 1);
ASL_TEST_EXPECT(buf2[1] == 2);
}