Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-17 14:08:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Move Dict constants to detail namespace

Browse source
This commit is contained in:
Tim Wojtulewicz 2020-08-11 10:17:16 -07:00
parent c795f2014f
commit 47f3eb69fa
2 changed files with 12 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/Dict.cc
View file

@ -253,16 +253,16 @@ int Dictionary::ThresholdEntries() const
// always resize when the current insertion causes it to be full. This ensures that the
// current insertion should always be successful.
int capacity = Capacity();
if ( log2_buckets <= DICT_THRESHOLD_BITS )
if ( log2_buckets <= detail::DICT_THRESHOLD_BITS )
return capacity; //20 or less elements, 1.0, only size up when necessary.
return capacity - ( capacity>>DICT_LOAD_FACTOR_BITS );
return capacity - ( capacity >> detail::DICT_LOAD_FACTOR_BITS );
}
zeek::detail::hash_t Dictionary::FibHash(zeek::detail::hash_t h) const
{
//GoldenRatio phi = (sqrt(5)+1)/2 = 1.6180339887...
//1/phi = phi - 1
h &= HASH_MASK;
h &= detail::HASH_MASK;
h *= 11400714819323198485llu; //2^64/phi
return h;
}
@ -967,7 +967,7 @@ void Dictionary::Remap()
if ( num_iterators )
return;
int left = DICT_REMAP_ENTRIES;
int left = detail::DICT_REMAP_ENTRIES;
while ( remap_end >= 0 && left > 0 )
{
if ( ! table[remap_end].Empty() && Remap(remap_end) )