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

used pointers rather than positions in the garbage collector

Browse Source
This commit is contained in:
joaquintides
2023-12-18 13:38:57 +01:00
parent b55a13c6b6
commit 4cd3cd5ac2
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -881,8 +881,7 @@ public:
auto pc=reinterpret_cast<unsigned char*>(pg)+n; auto pc=reinterpret_cast<unsigned char*>(pg)+n;
auto mco=group_type::maybe_caused_overflow(pc); auto mco=group_type::maybe_caused_overflow(pc);
if(reinterpret_cast<std::atomic<unsigned char>*>(pc)->exchange(1)!=1){ if(reinterpret_cast<std::atomic<unsigned char>*>(pc)->exchange(1)!=1){
retire_element( retire_element(p,mco);
static_cast<std::size_t>(p-this->arrays.elements()),mco);
res=1; res=1;
} }
} }
@ -1932,8 +1931,8 @@ private:
retired_element()=default; retired_element()=default;
retired_element(const retired_element&){} retired_element(const retired_element&){}
std::atomic<std::size_t> epoch=available_; std::atomic<std::size_t> epoch=available_;
std::atomic<std::size_t> pos; std::atomic<element_type*> p;
}; };
struct garbage_vector struct garbage_vector
{ {
@ -1973,7 +1972,7 @@ private:
} }
BOOST_FORCEINLINE void BOOST_FORCEINLINE void
retire_element(std::size_t pos,bool mco) retire_element(element_type* p,bool mco)
{ {
auto& v=local_garbage_vector(); auto& v=local_garbage_vector();
std::size_t wpos=v.wpos; std::size_t wpos=v.wpos;
@ -1981,7 +1980,7 @@ private:
for(;;){ for(;;){
auto& e=v.retired_elements[wpos%v.garbage_vector::N]; auto& e=v.retired_elements[wpos%v.garbage_vector::N];
if(e.epoch.compare_exchange_strong(expected,retired_element::reserved_)){ if(e.epoch.compare_exchange_strong(expected,retired_element::reserved_)){
e.pos=pos; e.p=p;
e.epoch=v.epoch.load(); e.epoch=v.epoch.load();
++v.wpos; ++v.wpos;
--v.size; --v.size;
@ -2029,8 +2028,10 @@ private:
auto& e=v.retired_elements[rpos%v.garbage_vector::N]; auto& e=v.retired_elements[rpos%v.garbage_vector::N];
if(e.epoch>max_epoch)break; if(e.epoch>max_epoch)break;
//++garbage_collected; //++garbage_collected;
this->destroy_element(this->arrays.elements()+e.pos); auto p=e.p.load();
this->arrays.groups()[e.pos/N].reset(e.pos%N); this->destroy_element(p);
auto pos=static_cast<std::size_t>(e.p-this->arrays.elements());
this->arrays.groups()[pos/N].reset(pos%N);
e.epoch=retired_element::available_; e.epoch=retired_element::available_;
++rpos; ++rpos;
} }