boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-31 20:04:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

hardened non-embedded group_access

Browse Source
This commit is contained in:
joaquintides
2023-03-18 12:58:17 +01:00
committed by Christian Mazakas
parent d66ceaf7fe
commit 96562f4c3b
1 changed files with 32 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
include/boost/unordered/detail/foa/concurrent_table.hpp
View File

@@ -183,6 +183,19 @@ struct concurrent_group:Group,group_access
}; };
}; };
template<std::size_t Size>
group_access* dummy_group_accesses()
{
/* TODO: describe
*/
static constexpr group_access::dummy_group_access_type
storage[Size]={typename group_access::dummy_group_access_type(),};
return reinterpret_cast<group_access*>(
const_cast<typename group_access::dummy_group_access_type*>(storage));
}
template<typename Value,typename Group,typename SizePolicy> template<typename Value,typename Group,typename SizePolicy>
struct concurrent_table_arrays:table_arrays<Value,Group,SizePolicy> struct concurrent_table_arrays:table_arrays<Value,Group,SizePolicy>
{ {
@@ -192,29 +205,38 @@ struct concurrent_table_arrays:table_arrays<Value,Group,SizePolicy>
static concurrent_table_arrays new_(Allocator& al,std::size_t n) static concurrent_table_arrays new_(Allocator& al,std::size_t n)
{ {
concurrent_table_arrays arrays={super::new_(al,n),nullptr}; concurrent_table_arrays arrays={super::new_(al,n),nullptr};
//if(arrays.elements){ if(!arrays.elements){
arrays.group_accesses=dummy_group_accesses<SizePolicy::min_size()>();
}
else{
using access_alloc= using access_alloc=
typename boost::allocator_rebind<Allocator,group_access>::type; typename boost::allocator_rebind<Allocator,group_access>::type;
using access_traits=boost::allocator_traits<access_alloc>; using access_traits=boost::allocator_traits<access_alloc>;
using pointer=typename access_traits::pointer; using pointer=typename access_traits::pointer;
using pointer_traits=boost::pointer_traits<pointer>; using pointer_traits=boost::pointer_traits<pointer>;
// TODO: protect with BOOST_TRY BOOST_TRY{
auto aal=access_alloc(al); auto aal=access_alloc(al);
arrays.group_accesses=boost::to_address( arrays.group_accesses=boost::to_address(
access_traits::allocate(aal,arrays.groups_size_mask+1)); access_traits::allocate(aal,arrays.groups_size_mask+1));
for(std::size_t n=0;n<arrays.groups_size_mask+1;++n){ for(std::size_t n=0;n<arrays.groups_size_mask+1;++n){
new(arrays.group_accesses+n) group_access(); new(arrays.group_accesses+n) group_access();
}
} }
//} BOOST_CATCH(...){
super::delete_(al,arrays);
BOOST_RETHROW
}
BOOST_CATCH_END
}
return arrays; return arrays;
} }
template<typename Allocator> template<typename Allocator>
static void delete_(Allocator& al,concurrent_table_arrays& arrays)noexcept static void delete_(Allocator& al,concurrent_table_arrays& arrays)noexcept
{ {
//if(arrays.elements){ if(arrays.elements){
using access_alloc= using access_alloc=
typename boost::allocator_rebind<Allocator,group_access>::type; typename boost::allocator_rebind<Allocator,group_access>::type;
using access_traits=boost::allocator_traits<access_alloc>; using access_traits=boost::allocator_traits<access_alloc>;
@@ -225,7 +247,7 @@ struct concurrent_table_arrays:table_arrays<Value,Group,SizePolicy>
access_traits::deallocate( access_traits::deallocate(
aal,pointer_traits::pointer_to(*arrays.group_accesses), aal,pointer_traits::pointer_to(*arrays.group_accesses),
arrays.groups_size_mask+1); arrays.groups_size_mask+1);
//} }
} }
group_access *group_accesses; group_access *group_accesses;