boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-30 03:17:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

reverted to epoch array of size 128 and to non-relaxed wait_for_epochs

Browse Source
This commit is contained in:
joaquintides
2023-12-03 19:51:26 +01:00
parent 7e495f4598
commit d6a8a4462c
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -973,7 +973,7 @@ private:
#if defined(BOOST_UNORDERED_LATCH_FREE) #if defined(BOOST_UNORDERED_LATCH_FREE)
using epoch_type=std::atomic<std::size_t>; using epoch_type=std::atomic<std::size_t>;
using epoch_array=cache_aligned_array<epoch_type,16>; // TODO: adapt 16 to the machine using epoch_array=cache_aligned_array<epoch_type,128>; // TODO: adapt 128 to the machine
#endif #endif
#if defined(BOOST_UNORDERED_LATCH_FREE) #if defined(BOOST_UNORDERED_LATCH_FREE)
@ -1825,10 +1825,10 @@ private:
static void wait_for_epochs() static void wait_for_epochs()
{ {
for(std::size_t i=0;i<epochs.size();++i){ for(std::size_t i=0;i<epochs.size();++i){
auto e=epochs[i].load(std::memory_order_relaxed), auto e=epochs[i].load(std::memory_order_acquire),
e1=e|1u; e1=e|1u;
while(e==e1){ while(e==e1){
e=epochs[i].load(std::memory_order_relaxed); e=epochs[i].load(std::memory_order_acquire);
} }
} }
} }
@ -1838,9 +1838,11 @@ private:
template<typename T,typename H,typename P,typename A> template<typename T,typename H,typename P,typename A>
std::atomic<std::size_t> concurrent_table<T,H,P,A>::thread_counter={}; std::atomic<std::size_t> concurrent_table<T,H,P,A>::thread_counter={};
#if defined(BOOST_UNORDERED_LATCH_FREE)
template<typename T,typename H,typename P,typename A> template<typename T,typename H,typename P,typename A>
typename concurrent_table<T,H,P,A>::epoch_array typename concurrent_table<T,H,P,A>::epoch_array
concurrent_table<T,H,P,A>::epochs={}; concurrent_table<T,H,P,A>::epochs={};
#endif
#if defined(BOOST_MSVC) #if defined(BOOST_MSVC)
#pragma warning(pop) /* C4714 */ #pragma warning(pop) /* C4714 */