feedc0de/boost_container
1
0
Fork 0
forked from boostorg/container
Code Pull Requests Activity

Refactor advanced insertion algorithms and implement a new devector insert strategy, moving elements to the middle if there is a reasonable free capacity at the other end of the container.

Browse Source
This commit is contained in:
Ion Gaztañaga
2022-09-20 00:22:19 +02:00
parent 8b27fefb8e
commit 704bf10058
13 changed files with 2574 additions and 1934 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/devector_options_test.cpp
+110 -17
View File
@@ -53,6 +53,13 @@ void test_stored_size_type()
typedef devector<unsigned char, allocator<unsigned char>, options_t> devector_t;
test_stored_size_type_impl<Unsigned, devector_t>();
}
//Test size reduction
{
typedef devector<unsigned char, void, options_t> devector_t;
BOOST_STATIC_ASSERT( sizeof(Unsigned) >= sizeof(std::size_t) ||
sizeof(devector_t) < sizeof(devector<unsigned char>) );
}
}
void test_growth_factor_50()
@@ -64,13 +71,10 @@ void test_growth_factor_50()
< growth_factor<growth_factor_50> >::type options_t;
#endif
devector<int, new_allocator<int>, options_t> v;
v.resize(5);
v.resize(v.capacity());
std::size_t old_capacity = v.capacity();
devector<int, new_allocator<int>, options_t> v(5u, 0);
std::size_t old_capacity = v.size() + v.back_free_capacity() + v.front_free_capacity();
v.push_back(0);
std::size_t new_capacity = v.capacity();
std::size_t new_capacity = v.size() + v.back_free_capacity() + v.front_free_capacity();
BOOST_TEST(new_capacity == old_capacity + old_capacity/2);
}
@@ -83,13 +87,11 @@ void test_growth_factor_60()
< growth_factor<growth_factor_60> >::type options_t;
#endif
devector<int, new_allocator<int>, options_t> v;
devector<int, new_allocator<int>, options_t> v(5u, 0);
v.resize(5);
v.resize(v.capacity());
std::size_t old_capacity = v.capacity();
std::size_t old_capacity = v.size()+v.back_free_capacity()+v.front_free_capacity();
v.push_back(0);
std::size_t new_capacity = v.capacity();
std::size_t new_capacity = v.size() + v.back_free_capacity() + v.front_free_capacity();
BOOST_TEST(new_capacity == old_capacity + 3*old_capacity/5);
}
@@ -102,16 +104,105 @@ void test_growth_factor_100()
< growth_factor<growth_factor_100> >::type options_t;
#endif
devector<int, new_allocator<int>, options_t> v;
v.resize(5);
v.resize(v.capacity());
std::size_t old_capacity = v.capacity();
devector<int, new_allocator<int>, options_t> v(5,0);
std::size_t old_capacity = v.size() + v.back_free_capacity() + v.front_free_capacity();
v.push_back(0);
std::size_t new_capacity = v.capacity();
std::size_t new_capacity = v.size() + v.back_free_capacity() + v.front_free_capacity();
BOOST_TEST(new_capacity == 2*old_capacity);
}
void test_stored_relloc_limit_66()
{
#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
using options_t = devector_options_t< relocation_limit<relocation_limit_66> >;
#else
typedef devector_options
< relocation_limit<relocation_limit_66> >::type options_t;
#endif
const std::size_t buffer_size = 32u;
const std::size_t initial_side = buffer_size/2u;
devector<int, new_allocator<int>, options_t> v(initial_side, initial_side, reserve_only_tag_t());
const int* buffer = v.data();
const int* buffer_start = v.data() - initial_side;
std::size_t old_cp = v.capacity();
for ( int i = 0u; i != (int)initial_side; ++i) {
v.push_back(i);
}
BOOST_TEST(v.back_free_capacity() == 0);
BOOST_TEST(buffer == v.data());
v.push_back(0);
BOOST_TEST(v.size() == initial_side + 1u);
//Relocation -> 9 elements on the left, 8 elements on the right
BOOST_TEST(v.front_free_capacity() == (buffer_size - v.size())/2u);
BOOST_TEST(v.data() == buffer_start + v.front_free_capacity());
BOOST_TEST(v.capacity() == old_cp);
//Reach the back limit again
for (int i = 0u, max = (int)v.back_free_capacity(); i != max; ++i) {
v.push_back(-i);
}
BOOST_TEST(v.back_free_capacity() == 0);
//New insertion should reallocate
v.push_back(-1);
BOOST_TEST(v.back_free_capacity() > 8);
BOOST_TEST(v.capacity() > old_cp);
}
void test_stored_relloc_limit_90()
{
#if !defined(BOOST_NO_CXX11_TEMPLATE_ALIASES)
using options_t = devector_options_t< relocation_limit<relocation_limit_90> >;
#else
typedef devector_options
< relocation_limit<relocation_limit_90> >::type options_t;
#endif
const std::size_t buffer_size = 32u;
const std::size_t initial_side = buffer_size/2u;
devector<int, new_allocator<int>, options_t> v(initial_side, initial_side, reserve_only_tag_t());
const int* buffer = v.data();
const int* buffer_start = v.data() - initial_side;
std::size_t old_cp = v.capacity();
for ( int i = 0u; i != (int)initial_side; ++i) {
v.push_back(i);
}
BOOST_TEST(v.back_free_capacity() == 0);
BOOST_TEST(buffer == v.data());
v.push_back(0);
BOOST_TEST(v.size() == initial_side + 1u);
//Relocation -> 9 elements on the left, 8 elements on the right
BOOST_TEST(v.front_free_capacity() == (buffer_size - v.size())/2u);
BOOST_TEST(v.data() == buffer_start + v.front_free_capacity());
BOOST_TEST(v.capacity() == old_cp);
//Reach the back limit again
for (int i = 0u, max = (int)v.back_free_capacity(); i != max; ++i) {
v.push_back(-i);
}
BOOST_TEST(v.back_free_capacity() == 0);
//New insertion should relocate again
v.push_back(-1);
BOOST_TEST(v.capacity() == old_cp);
BOOST_TEST(v.front_free_capacity() == (buffer_size - v.size()) / 2u);
BOOST_TEST(v.data() == buffer_start + v.front_free_capacity());
//Reach the back limit again
for (int i = 0u, max = (int)v.back_free_capacity(); i != max; ++i) {
v.push_back(-i);
}
BOOST_TEST(v.back_free_capacity() == 0);
//Last insertion should reallocate
v.push_back(-1);
BOOST_TEST(v.capacity() > old_cp);
}
int main()
{
test_growth_factor_50();
@@ -119,5 +210,7 @@ int main()
test_growth_factor_100();
test_stored_size_type<unsigned char>();
test_stored_size_type<unsigned short>();
test_stored_relloc_limit_66();
test_stored_relloc_limit_90();
return ::boost::report_errors();
}