boost/pool
2
0
Fork 0
mirror of https://github.com/boostorg/pool.git synced 2026-01-19 16:32:14 +00:00
Code Issues Projects Releases Wiki Activity

Fix the Broken malloc_n Behavior (#53)

Browse Source 
* Fix the Broken `malloc_n` Behavior

* Fix the Broken `malloc_n` Behavior

* Fix the Broken `malloc_n` Behavior

Added Unit Tests

* Fix the Broken `malloc_n` Behavior

Add more unit tests.

* Fix the Broken `malloc_n` Behavior

* Fix the Broken `malloc_n` Behavior

* Fix the Broken `malloc_n` Behavior
This commit is contained in:
Lei Mao
2023-01-15 04:23:45 -08:00
committed by GitHub
parent 600bcb0273
commit 8ec1be1e82
3 changed files with 117 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
include/boost/pool/simple_segregated_storage.hpp
View File

@@ -328,6 +328,19 @@ void * simple_segregated_storage<SizeType>::try_malloc_n(
void * & start, size_type n, const size_type partition_size)
{
void * iter = nextof(start);
if (n == 1)
{
void * next = nextof(iter);
if (next != static_cast<char *>(iter) + partition_size)
{
start = iter;
return 0;
}
else
{
return iter;
}
}
while (--n != 0)
{
void * next = nextof(iter);

28
test/test_pool_alloc.cpp
View File

@@ -263,6 +263,34 @@ void test_mem_usage()
// This will clean up the memory leak from (*B*)
}
{
pool_type pool(sizeof(int), 2);
void * ptr_0 = pool.malloc();
void * ptr_1 = pool.malloc();
void * ptr_2 = pool.malloc();
void * ptr_3 = pool.malloc();
pool.ordered_free(ptr_2);
pool.ordered_free(ptr_3);
BOOST_TEST(pool.release_memory());
pool.ordered_free(ptr_0);
pool.ordered_free(ptr_1);
BOOST_TEST(pool.release_memory());
}
{
pool_type pool(sizeof(int), 2);
void * ptr_0 = pool.malloc();
void * ptr_1 = pool.malloc();
void * ptr_2 = pool.malloc();
void * ptr_3 = pool.malloc();
pool.ordered_free(ptr_0);
pool.ordered_free(ptr_1);
BOOST_TEST(pool.release_memory());
pool.ordered_free(ptr_2);
pool.ordered_free(ptr_3);
BOOST_TEST(pool.release_memory());
}
BOOST_TEST(track_alloc::ok());
}

76
test/test_simple_seg_storage.cpp
View File

@@ -277,6 +277,82 @@ int main()
BOOST_TEST(nchunks == 3);
}
{
char* const pc = track_allocator::malloc(4 * partition_sz);
test_simp_seg_store tstore;
tstore.add_ordered_block(pc, 4 * partition_sz, partition_sz);
void* pvret = tstore.malloc_n(1, partition_sz);
BOOST_TEST(pvret == pc);
// There should still be two contiguous
// and one non-contiguous chunk left
std::size_t nchunks = 0;
while(!tstore.empty())
{
tstore.malloc();
++nchunks;
}
BOOST_TEST(nchunks == 3);
}
{
char* const pc = track_allocator::malloc(4 * partition_sz);
test_simp_seg_store tstore;
tstore.add_ordered_block(pc, 4 * partition_sz, partition_sz);
void* pvret = tstore.malloc_n(2, partition_sz);
BOOST_TEST(pvret == pc);
// There should still be two contiguous
// and one non-contiguous chunk left
std::size_t nchunks = 0;
while(!tstore.empty())
{
tstore.malloc();
++nchunks;
}
BOOST_TEST(nchunks == 2);
}
{
char* const pc = track_allocator::malloc(4 * partition_sz);
test_simp_seg_store tstore;
tstore.add_ordered_block(pc, 4 * partition_sz, partition_sz);
void* pvret = tstore.malloc_n(1, 2 * partition_sz);
BOOST_TEST(pvret == 0);
// There should still be two contiguous
// and one non-contiguous chunk left
std::size_t nchunks = 0;
while(!tstore.empty())
{
tstore.malloc();
++nchunks;
}
BOOST_TEST(nchunks == 4);
}
{
char* const pc = track_allocator::malloc(4 * partition_sz);
test_simp_seg_store tstore;
tstore.add_ordered_block(pc, 4 * partition_sz, partition_sz);
void* pvret = tstore.malloc_n(2, 2 * partition_sz);
BOOST_TEST(pvret == 0);
// There should still be two contiguous
// and one non-contiguous chunk left
std::size_t nchunks = 0;
while(!tstore.empty())
{
tstore.malloc();
++nchunks;
}
BOOST_TEST(nchunks == 4);
}
{
char* const pc = track_allocator::malloc(12 * partition_sz);
test_simp_seg_store tstore;