feedc0de/boost_unordered
1
0
Fork 0
forked from boostorg/unordered
Code Pull Requests Activity

fixed is_reserved

Browse Source
This commit is contained in:
joaquintides
2023-12-26 18:11:22 +01:00
parent 0a6da6979f
commit 8365ccb78a
1 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1579,24 +1579,24 @@ private:
} }
} }
static bool is_reserved(group_type* pg,std::size_t pos) static bool is_really_occupied(group_type* pg,std::size_t pos)
{ {
return is_reserved( return is_really_occupied(
std::integral_constant<bool,group_type::regular_layout>{},pg,pos); std::integral_constant<bool,group_type::regular_layout>{},pg,pos);
} }
static bool is_reserved( static bool is_really_occupied(
std::true_type, /* regular layout */ /* regular layout, almost-latch-free insertion -> spurious non-zeros */
group_type* pg,std::size_t pos) std::true_type,group_type* pg,std::size_t pos)
{ {
return reinterpret_cast<std::atomic<unsigned char>*>(pg)[pos]==1; return reinterpret_cast<std::atomic<unsigned char>*>(pg)[pos]>1;
} }
static bool is_reserved( static bool is_really_occupied(
std::false_type, /* non-regular layout, never reserved */ /* non-regular layout, latched insertion -> no false positives */
group_type*,std::size_t) std::false_type,group_type*,std::size_t)
{ {
return false; return true;
} }
template<typename GroupAccessMode,typename F> template<typename GroupAccessMode,typename F>
@@ -1636,7 +1636,7 @@ private:
auto mask=this->match_really_occupied(pg,last); auto mask=this->match_really_occupied(pg,last);
while(mask){ while(mask){
auto n=unchecked_countr_zero(mask); auto n=unchecked_countr_zero(mask);
if(BOOST_LIKELY(!is_reserved(pg,n))&&!f(pg,n,p+n))return false; if(BOOST_LIKELY(is_really_occupied(pg,n))&&!f(pg,n,p+n))return false;
mask&=mask-1; mask&=mask-1;
} }
} }
@@ -1671,7 +1671,7 @@ private:
auto mask=this->match_really_occupied(&g,last); auto mask=this->match_really_occupied(&g,last);
while(mask){ while(mask){
auto n=unchecked_countr_zero(mask); auto n=unchecked_countr_zero(mask);
if(BOOST_LIKELY(!is_reserved(&g,n)))f(&g,n,p+n); if(BOOST_LIKELY(is_really_occupied(&g,n)))f(&g,n,p+n);
mask&=mask-1; mask&=mask-1;
} }
} }
@@ -1693,7 +1693,7 @@ private:
auto mask=this->match_really_occupied(&g,last); auto mask=this->match_really_occupied(&g,last);
while(mask){ while(mask){
auto n=unchecked_countr_zero(mask); auto n=unchecked_countr_zero(mask);
if(BOOST_LIKELY(!is_reserved(&g,n))&&!f(p+n))return false; if(BOOST_LIKELY(is_really_occupied(&g,n))&&!f(p+n))return false;
mask&=mask-1; mask&=mask-1;
} }
return true; return true;