Azahar-Mirror/mcl
1
0
Fork 0
mirror of https://github.com/azahar-emu/mcl synced 2025-11-06 23:20:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

mcl: hmap: Bugfix skip_empty_or_tombstone

Browse Source
This commit is contained in:
Merry 2022-05-01 18:26:17 +01:00
parent 689f393f74
commit 322a221f07
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
include/mcl/container/hmap.hpp
View File

@ -280,15 +280,14 @@ private:
if (!mb_ptr) if (!mb_ptr)
return; return;
while (!is_full(*mb_ptr)) { while (*mb_ptr == detail::meta_byte::empty || *mb_ptr == detail::meta_byte::tombstone) {
++mb_ptr; ++mb_ptr;
++slot_ptr; ++slot_ptr;
}
if (*mb_ptr == detail::meta_byte::end_sentinel) { if (*mb_ptr == detail::meta_byte::end_sentinel) {
mb_ptr = nullptr; mb_ptr = nullptr;
slot_ptr = nullptr; slot_ptr = nullptr;
return;
}
} }
} }
@ -320,6 +319,7 @@ private:
static_assert(!std::is_reference_v<mapped_type>); static_assert(!std::is_reference_v<mapped_type>);
static constexpr size_t group_size{16}; static constexpr size_t group_size{16};
static constexpr size_t average_max_group_load{group_size - 2};
public: public:
hmap() hmap()
@ -637,7 +637,7 @@ private:
initialize_members(new_group_count); initialize_members(new_group_count);
for (; iter != iterator{}; ++iter) { for (; iter != end(); ++iter) {
const size_t hash{hasher{}(iter->first)}; const size_t hash{hasher{}(iter->first)};
const size_t item_index{find_empty_slot_to_insert(hash)}; const size_t item_index{find_empty_slot_to_insert(hash)};
@ -661,7 +661,7 @@ private:
{ {
const size_t group_count{group_index_mask + 1}; const size_t group_count{group_index_mask + 1};
empty_slots = group_count * group_size * 7 / 8; empty_slots = group_count * average_max_group_load;
full_slots = 0; full_slots = 0;
std::memset(mbs.get(), static_cast<int>(detail::meta_byte::empty), group_count * group_size); std::memset(mbs.get(), static_cast<int>(detail::meta_byte::empty), group_count * group_size);