boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-30 11:27:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Expand out fill_buckets.

Browse Source
This commit is contained in:
Daniel James
2016-08-14 20:55:40 +01:00
parent 992f9ccf21
commit 609ae6cb4e
3 changed files with 89 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
include/boost/unordered/detail/equivalent.hpp
View File

@ -628,17 +628,62 @@ namespace boost { namespace unordered { namespace detail {
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// fill_buckets // fill_buckets
template <class NodeCreator> void copy_buckets(table const& src) {
void fill_buckets(iterator n, NodeCreator& creator) node_constructor constructor(this->node_alloc());
{ this->create_buckets(this->bucket_count_);
while (n.node_) {
for (iterator n = src.begin(); n.node_;) {
std::size_t key_hash = n.node_->hash_; std::size_t key_hash = n.node_->hash_;
iterator group_end(n.node_->group_prev_->next_); iterator group_end(n.node_->group_prev_->next_);
constructor.construct_with_value2(*n);
iterator pos = this->add_node(creator.create(*n), key_hash, iterator()); iterator pos = this->add_node(constructor, key_hash, iterator());
for (++n; n != group_end; ++n) for (++n; n != group_end; ++n)
{ {
this->add_node(creator.create(*n), key_hash, pos); constructor.construct_with_value2(*n);
this->add_node(constructor, key_hash, pos);
}
}
}
void move_buckets(table& src) {
node_constructor constructor(this->node_alloc());
this->create_buckets(this->bucket_count_);
for (iterator n = src.begin(); n.node_;) {
std::size_t key_hash = n.node_->hash_;
iterator group_end(n.node_->group_prev_->next_);
constructor.construct_with_value2(boost::move(*n));
iterator pos = this->add_node(constructor, key_hash, iterator());
for (++n; n != group_end; ++n)
{
constructor.construct_with_value2(boost::move(*n));
this->add_node(constructor, key_hash, pos);
}
}
}
void assign_buckets(table const& src) {
node_holder<node_allocator> holder(*this);
for (iterator n = src.begin(); n.node_;) {
std::size_t key_hash = n.node_->hash_;
iterator group_end(n.node_->group_prev_->next_);
iterator pos = this->add_node(holder.copy_of(*n), key_hash, iterator());
for (++n; n != group_end; ++n)
{
this->add_node(holder.copy_of(*n), key_hash, pos);
}
}
}
void move_assign_buckets(table& src) {
node_holder<node_allocator> holder(*this);
for (iterator n = src.begin(); n.node_;) {
std::size_t key_hash = n.node_->hash_;
iterator group_end(n.node_->group_prev_->next_);
iterator pos = this->add_node(holder.move_copy_of(*n), key_hash, iterator());
for (++n; n != group_end; ++n)
{
this->add_node(holder.move_copy_of(*n), key_hash, pos);
} }
} }
} }

91
include/boost/unordered/detail/table.hpp
View File

@ -68,70 +68,6 @@ namespace boost { namespace unordered { namespace detail {
value_base& operator=(value_base const&); value_base& operator=(value_base const&);
}; };
template <typename NodeAlloc>
struct copy_nodes
{
typedef boost::unordered::detail::allocator_traits<NodeAlloc>
node_allocator_traits;
node_constructor<NodeAlloc> constructor;
explicit copy_nodes(NodeAlloc& a) : constructor(a) {}
typename node_allocator_traits::pointer create(
typename node_allocator_traits::value_type::value_type const& v)
{
constructor.construct_with_value2(v);
return constructor.release();
}
};
template <typename NodeAlloc>
struct move_nodes
{
typedef boost::unordered::detail::allocator_traits<NodeAlloc>
node_allocator_traits;
node_constructor<NodeAlloc> constructor;
explicit move_nodes(NodeAlloc& a) : constructor(a) {}
typename node_allocator_traits::pointer create(
typename node_allocator_traits::value_type::value_type& v)
{
constructor.construct_with_value2(boost::move(v));
return constructor.release();
}
};
template <typename Buckets>
struct assign_nodes
{
node_holder<typename Buckets::node_allocator> holder;
explicit assign_nodes(Buckets& b) : holder(b) {}
typename Buckets::node_pointer create(
typename Buckets::value_type const& v)
{
return holder.copy_of(v);
}
};
template <typename Buckets>
struct move_assign_nodes
{
node_holder<typename Buckets::node_allocator> holder;
explicit move_assign_nodes(Buckets& b) : holder(b) {}
typename Buckets::node_pointer create(
typename Buckets::value_type& v)
{
return holder.move_copy_of(v);
}
};
template <typename Types> template <typename Types>
struct table : struct table :
boost::unordered::detail::functions< boost::unordered::detail::functions<
@ -391,9 +327,7 @@ namespace boost { namespace unordered { namespace detail {
void init(table const& x) void init(table const& x)
{ {
if (x.size_) { if (x.size_) {
create_buckets(bucket_count_); static_cast<table_impl*>(this)->copy_buckets(x);
copy_nodes<node_allocator> node_creator(node_alloc());
static_cast<table_impl*>(this)->fill_buckets(x.begin(), node_creator);
} }
} }
@ -404,11 +338,7 @@ namespace boost { namespace unordered { namespace detail {
} }
else if(x.size_) { else if(x.size_) {
// TODO: Could pick new bucket size? // TODO: Could pick new bucket size?
create_buckets(bucket_count_); static_cast<table_impl*>(this)->move_buckets(x);
move_nodes<node_allocator> node_creator(node_alloc());
node_holder<node_allocator> nodes(x);
static_cast<table_impl*>(this)->fill_buckets(nodes.begin(), node_creator);
} }
} }
@ -650,11 +580,7 @@ namespace boost { namespace unordered { namespace detail {
clear_buckets(); clear_buckets();
} }
// assign_nodes takes ownership of the container's elements, static_cast<table_impl*>(this)->assign_buckets(x);
// assigning to them if possible, and deleting any that are
// left over.
assign_nodes<table> node_creator(*this);
static_cast<table_impl*>(this)->fill_buckets(x.begin(), node_creator);
} }
void assign(table const& x, true_type) void assign(table const& x, true_type)
@ -679,9 +605,7 @@ namespace boost { namespace unordered { namespace detail {
// Finally copy the elements. // Finally copy the elements.
if (x.size_) { if (x.size_) {
create_buckets(bucket_count_); static_cast<table_impl*>(this)->copy_buckets(x);
copy_nodes<node_allocator> node_creator(node_alloc());
static_cast<table_impl*>(this)->fill_buckets(x.begin(), node_creator);
} }
} }
} }
@ -735,12 +659,7 @@ namespace boost { namespace unordered { namespace detail {
clear_buckets(); clear_buckets();
} }
// move_assign_nodes takes ownership of the container's static_cast<table_impl*>(this)->move_assign_buckets(x);
// elements, assigning to them if possible, and deleting
// any that are left over.
move_assign_nodes<table> node_creator(*this);
node_holder<node_allocator> nodes(x);
static_cast<table_impl*>(this)->fill_buckets(nodes.begin(), node_creator);
} }
} }

36
include/boost/unordered/detail/unique.hpp
View File

@ -582,11 +582,39 @@ namespace boost { namespace unordered { namespace detail {
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// fill_buckets // fill_buckets
template <class NodeCreator> void copy_buckets(table const& src) {
void fill_buckets(iterator n, NodeCreator& creator) node_constructor constructor(this->node_alloc());
this->create_buckets(this->bucket_count_);
for(iterator n = src.begin(); n.node_; ++n) {
constructor.construct_with_value2(*n);
this->add_node(constructor, n.node_->hash_);
}
}
void move_buckets(table& src) {
node_constructor constructor(this->node_alloc());
this->create_buckets(this->bucket_count_);
for(iterator n = src.begin(); n.node_; ++n) {
constructor.construct_with_value2(boost::move(*n));
this->add_node(constructor, n.node_->hash_);
}
}
void assign_buckets(table const& src)
{ {
for (; n.node_; ++n) { node_holder<node_allocator> holder(*this);
this->add_node(creator.create(*n), n.node_->hash_); for(iterator n = src.begin(); n.node_; ++n) {
this->add_node(holder.copy_of(*n), n.node_->hash_);
}
}
void move_assign_buckets(table& src)
{
node_holder<node_allocator> holder(*this);
for(iterator n = src.begin(); n.node_; ++n) {
this->add_node(holder.move_copy_of(*n), n.node_->hash_);
} }
} }