tdlight-team/tdlight
tdlight-team/tdlight
1
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move static functions out of FlatHashTable.

Browse Source
This commit is contained in:
levlam 2022-03-09 17:00:22 +03:00
parent 44b844eeeb
commit 15520c5ddd
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tdutils/td/utils/FlatHashMapLinear.h
View File

@ -21,6 +21,16 @@
namespace td { namespace td {
namespace detail {
inline uint32 normalize_flat_hash_table_size(uint32 size) {
return td::max(static_cast<uint32>(1) << (32 - count_leading_zeroes32(size)), static_cast<uint32>(8));
}
inline uint32 get_random_flat_hash_table_bucket(uint32 bucket_count_mask) {
return Random::fast_uint32() & bucket_count_mask;
}
} // namespace detail
template <class NodeT, class HashT, class EqT> template <class NodeT, class HashT, class EqT>
class FlatHashTable { class FlatHashTable {
static constexpr uint32 INVALID_BUCKET = 0xFFFFFFFF; static constexpr uint32 INVALID_BUCKET = 0xFFFFFFFF;
@ -233,7 +243,7 @@ class FlatHashTable {
return end(); return end();
} }
if (begin_bucket_ == INVALID_BUCKET) { if (begin_bucket_ == INVALID_BUCKET) {
begin_bucket_ = Random::fast_uint32() & bucket_count_mask_; begin_bucket_ = detail::get_random_flat_hash_table_bucket(bucket_count_mask_);
while (nodes_[begin_bucket_].empty()) { while (nodes_[begin_bucket_].empty()) {
next_bucket(begin_bucket_); next_bucket(begin_bucket_);
} }
@ -256,7 +266,7 @@ class FlatHashTable {
return; return;
} }
CHECK(size <= (1u << 29)); CHECK(size <= (1u << 29));
uint32 want_size = normalize(static_cast<uint32>(size) * 5 / 3 + 1); uint32 want_size = detail::normalize_flat_hash_table_size(static_cast<uint32>(size) * 5 / 3 + 1);
if (want_size > bucket_count()) { if (want_size > bucket_count()) {
resize(want_size); resize(want_size);
} }
@ -404,15 +414,11 @@ class FlatHashTable {
void try_shrink() { void try_shrink() {
DCHECK(nodes_ != nullptr); DCHECK(nodes_ != nullptr);
if (unlikely(used_node_count_ * 10 < bucket_count_mask_ && bucket_count_mask_ > 7)) { if (unlikely(used_node_count_ * 10 < bucket_count_mask_ && bucket_count_mask_ > 7)) {
resize(normalize((used_node_count_ + 1) * 5 / 3 + 1)); resize(detail::normalize_flat_hash_table_size((used_node_count_ + 1) * 5 / 3 + 1));
} }
invalidate_iterators(); invalidate_iterators();
} }
static uint32 normalize(uint32 size) {
return td::max(static_cast<uint32>(1) << (32 - count_leading_zeroes32(size)), static_cast<uint32>(8));
}
uint32 calc_bucket(const KeyT &key) const { uint32 calc_bucket(const KeyT &key) const {
return randomize_hash(HashT()(key)) & bucket_count_mask_; return randomize_hash(HashT()(key)) & bucket_count_mask_;
} }