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

fixed erase_if on sentinels, implemented one-access non-constant visitation

Browse Source
This commit is contained in:
joaquintides
2024-02-12 13:41:20 +01:00
parent bad10788ff
commit b22c09700d
1 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -553,7 +553,7 @@ public:
#if defined(BOOST_UNORDERED_LATCH_FREE) #if defined(BOOST_UNORDERED_LATCH_FREE)
~concurrent_table(){ ~concurrent_table(){
std::cout std::cout
<<"version: 2024/02/12 12:00; " <<"version: 2024/02/12 13:40; "
<<"lf: "<<(double)size()/capacity()<<"; " <<"lf: "<<(double)size()/capacity()<<"; "
<<"size: "<<size()<<", " <<"size: "<<size()<<", "
<<"capacity: "<<capacity()<<"; " <<"capacity: "<<capacity()<<"; "
@@ -872,7 +872,8 @@ public:
if(f(cast_for(group_shared{},type_policy::value_from(*p)))){ if(f(cast_for(group_shared{},type_policy::value_from(*p)))){
//pg->reset(n); //pg->reset(n);
auto pc=reinterpret_cast<std::atomic<unsigned char>*>(pg)+n; auto pc=reinterpret_cast<std::atomic<unsigned char>*>(pg)+n;
if(pc->exchange(0)!=0){ auto c=pc->load(std::memory_order_relaxed);
if(c>1&&pc->compare_exchange_strong(c,0,std::memory_order_acq_rel)){
auto& sc=local_size_ctrl(); auto& sc=local_size_ctrl();
sc.size.fetch_sub(1,std::memory_order_relaxed); sc.size.fetch_sub(1,std::memory_order_relaxed);
sc.mcos.fetch_add( sc.mcos.fetch_add(
@@ -1313,7 +1314,7 @@ private:
BOOST_FORCEINLINE bool save_access(std::size_t pos,boost::uint32_t n,F f)const BOOST_FORCEINLINE bool save_access(std::size_t pos,boost::uint32_t n,F f)const
{ {
auto& acnt=access_counter(pos); auto& acnt=access_counter(pos);
if(!acnt.compare_exchange_strong(n,n+1,std::memory_order_release)){ if(!acnt.compare_exchange_strong(n,n+1,std::memory_order_acq_rel)){
return false; return false;
} }
std::atomic_thread_fence(std::memory_order_release); std::atomic_thread_fence(std::memory_order_release);
@@ -1354,20 +1355,38 @@ private:
BOOST_UNORDERED_PREFETCH_ELEMENTS(p,N); BOOST_UNORDERED_PREFETCH_ELEMENTS(p,N);
do{ do{
auto n=unchecked_countr_zero(mask); auto n=unchecked_countr_zero(mask);
if(BOOST_LIKELY(pg->is_occupied(n))){ #if 0
auto [e,acnt]=load_access(pos,[&]{return *(p+n);}); auto [e,acnt]=load_access(pos,[&]{return *(p+n);});
if(BOOST_LIKELY(this->pred()(x,this->key_from(e)))){ if(BOOST_LIKELY(this->pred()(x,this->key_from(e)))){
if constexpr(std::is_same<GroupAccessMode,group_exclusive>::value){ if constexpr(std::is_same<GroupAccessMode,group_exclusive>::value){
// ALTERNATIVE: offline f(pg,n,&e) // ALTERNATIVE: offline f(pg,n,&e)
if(!save_access(pos,acnt,[&]{f(pg,n,p+n);}))goto startover; if(!save_access(pos,acnt,[&]{f(pg,n,p+n);}))goto startover;
return 1; return 1;
}else{ }else{
f(pg,n,&e); f(pg,n,&e);
return 1; return 1;
}
} }
} }
#else
if constexpr(std::is_same<GroupAccessMode,group_exclusive>::value){
bool res=false;
save_access(pos,[&]{
if(BOOST_LIKELY(this->pred()(x,this->key_from(p[n])))){
f(pg,n,p+n);
res=true;
}
});
if(res)return 1;
}
else{
auto [e,acnt]=load_access(pos,[&]{return *(p+n);});
if(BOOST_LIKELY(this->pred()(x,this->key_from(e)))){
f(pg,n,&e);
return 1;
}
}
#endif
mask&=mask-1; mask&=mask-1;
}while(mask); }while(mask);
} }