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

reduce space_distance_samples from int64_6 to uint32_t

Browse source
This commit is contained in:
Jason Lu 2022-10-14 09:43:41 -07:00
parent 6c052bf926
commit a716d766a9
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Dict.h
View file

@ -70,7 +70,7 @@ constexpr int MIN_SPACE_DISTANCE_SAMPLES = 128;
constexpr uint8_t DEFAULT_DICT_SIZE = 0; constexpr uint8_t DEFAULT_DICT_SIZE = 0;
// When log2_buckets > DICT_THRESHOLD_BITS, DICT_LOAD_FACTOR_BITS becomes effective. // When log2_buckets > DICT_THRESHOLD_BITS, DICT_LOAD_FACTOR_BITS becomes effective.
// Basically if dict size < 2^DICT_THRESHOLD_BITS + n, we size up only if necessary. // Basically if dict size < 2^DICT_THRESHOLD_BITS + DICT_THRESHOLD_BITS, we size up only if necessary.
constexpr uint8_t DICT_THRESHOLD_BITS = 3; constexpr uint8_t DICT_THRESHOLD_BITS = 3;
// The value of an iteration cookie is the bucket and offset within the // The value of an iteration cookie is the bucket and offset within the
@ -653,7 +653,7 @@ public:
// if space_distance is too great, performance decreases. we need to sizeup for // if space_distance is too great, performance decreases. we need to sizeup for
// performance. // performance.
else if ( space_distance_samples > detail::MIN_SPACE_DISTANCE_SAMPLES && else if ( space_distance_samples > detail::MIN_SPACE_DISTANCE_SAMPLES &&
space_distance_sum > space_distance_samples * detail::SPACE_DISTANCE_THRESHOLD && space_distance_sum > uint64_t(space_distance_samples) * detail::SPACE_DISTANCE_THRESHOLD &&
int(num_entries) > detail::MIN_DICT_LOAD_FACTOR_100 * Capacity() / 100 ) int(num_entries) > detail::MIN_DICT_LOAD_FACTOR_100 * Capacity() / 100 )
{ {
SizeUp(); SizeUp();
@ -1071,12 +1071,12 @@ private:
uint32_t ThresholdEntries() const uint32_t ThresholdEntries() const
{ {
// Increase the size of the dictionary when it is 75% full. However, when the dictionary // Increase the size of the dictionary when it is 75% full. However, when the dictionary
// is small ( <= 20 elements ), only resize it when it's 100% full. The dictionary will // is small ( bucket_capacity <= 2^3+3=11 elements ), only resize it when it's 100% full. The dictionary will
// always resize when the current insertion causes it to be full. This ensures that the // always resize when the current insertion causes it to be full. This ensures that the
// current insertion should always be successful. // current insertion should always be successful.
int capacity = Capacity(); int capacity = Capacity();
if ( log2_buckets <= detail::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;
return capacity * detail::DICT_LOAD_FACTOR_100 / 100; return capacity * detail::DICT_LOAD_FACTOR_100 / 100;
} }
@ -1672,7 +1672,7 @@ private:
uint32_t num_entries = 0; uint32_t num_entries = 0;
uint32_t max_entries = 0; uint32_t max_entries = 0;
uint64_t cum_entries = 0; uint64_t cum_entries = 0;
int64_t space_distance_samples = 0; uint32_t space_distance_samples = 0;
// how far the space is // how far the space is
int64_t space_distance_sum = 0; int64_t space_distance_sum = 0;