boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-08-01 12:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

reverted "added bulk_visit2"

Browse Source
This commit is contained in:
joaquintides
2023-09-30 09:43:19 +02:00
parent 379b3047ee
commit e21e321bcf
2 changed files with 10 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
include/boost/unordered/concurrent_flat_map.hpp
View File

@@ -252,14 +252,6 @@ namespace boost {
return table_.bulk_visit(keys, f); return table_.bulk_visit(keys, f);
} }
template<std::size_t M,typename F>
BOOST_FORCEINLINE
std::size_t bulk_visit2(const std::array<key_type,M>& keys,F f)const
{
BOOST_UNORDERED_STATIC_ASSERT_CONST_INVOCABLE(F)
return table_.bulk_visit2(keys, f);
}
template <class K, class F> template <class K, class F>
BOOST_FORCEINLINE typename std::enable_if< BOOST_FORCEINLINE typename std::enable_if<
detail::are_transparent<K, hasher, key_equal>::value, size_type>::type detail::are_transparent<K, hasher, key_equal>::value, size_type>::type

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

@@ -565,6 +565,7 @@ public:
return visit(x,std::forward<F>(f)); return visit(x,std::forward<F>(f));
} }
#if 1
template<typename Key,std::size_t M,typename F> template<typename Key,std::size_t M,typename F>
BOOST_FORCEINLINE BOOST_FORCEINLINE
std::size_t bulk_visit(const std::array<Key,M>& keys,F&& f)const std::size_t bulk_visit(const std::array<Key,M>& keys,F&& f)const
@@ -634,30 +635,30 @@ public:
} }
return res; return res;
} }
#else
template<typename Key,std::size_t M,typename F> template<typename Key,std::size_t M,typename F>
BOOST_FORCEINLINE BOOST_FORCEINLINE
std::size_t bulk_visit2(const std::array<Key,M>& keys,F&& f)const std::size_t bulk_visit(const std::array<Key,M>& keys,F&& f)const
{ {
auto lck=shared_access(); auto lck=shared_access();
std::size_t res=0, std::size_t res=0,
hashes[M], hashes[M];
positions[M];
for(std::size_t i=0;i<M;++i){ for(std::size_t i=0;i<M;++i){
hashes[i]=this->hash_for(keys[i]); hashes[i]=this->hash_for(keys[i]);
auto pos=positions[i]=this->position_for(hashes[i]); auto pos=this->position_for(hashes[i]);
BOOST_UNORDERED_PREFETCH(this->arrays.groups()+pos); BOOST_UNORDERED_PREFETCH(this->arrays.groups+pos);
BOOST_UNORDERED_PREFETCH(this->arrays.group_accesses()+pos); BOOST_UNORDERED_PREFETCH(this->arrays.group_accesses+pos);
BOOST_UNORDERED_PREFETCH_ELEMENTS(this->arrays.elements()+pos*N,N); BOOST_UNORDERED_PREFETCH_ELEMENTS(this->arrays.elements+pos*N,N);
} }
for(std::size_t i=0;i<M;++i){ for(std::size_t i=0;i<M;++i){
res+=unprotected_visit( res+=unprotected_visit(
group_shared{},keys[i],positions[i],hashes[i], group_shared{},keys[i],this->position_for(hashes[i]),hashes[i],
std::forward<F>(f)); std::forward<F>(f));
} }
return res; return res;
} }
#endif
template<typename F> std::size_t visit_all(F&& f) template<typename F> std::size_t visit_all(F&& f)
{ {