Merge pull request #129 from moka-rs/more-segments

Increase the num segments of the waiters hash table from 16 to 64
moka-rs · May 20, 2022 · 6236d44 · 6236d44
2 parents cde3a9c + 14dcdd8
commit 6236d44
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 4 deletions.
diff --git a/src/future/value_initializer.rs b/src/future/value_initializer.rs
@@ -7,6 +7,8 @@ use std::{
 };
 use triomphe::Arc as TrioArc;
 
+const WAITER_MAP_NUM_SEGMENTS: usize = 64;
+
 type ErrorObject = Arc<dyn Any + Send + Sync + 'static>;
 
 pub(crate) enum InitResult<V, E> {
@@ -102,7 +104,10 @@ where
 {
  pub(crate) fn with_hasher(hasher: S) -> Self {
  Self {
- waiters: crate::cht::SegmentedHashMap::with_num_segments_and_hasher(16, hasher),
+ waiters: crate::cht::SegmentedHashMap::with_num_segments_and_hasher(
+ WAITER_MAP_NUM_SEGMENTS,
+ hasher,
+ ),
  }
  }
 

diff --git a/src/sync/base_cache.rs b/src/sync/base_cache.rs
@@ -564,9 +564,9 @@ where
  let initial_capacity = initial_capacity
  .map(|cap| cap + WRITE_LOG_SIZE * 4)
  .unwrap_or_default();
- let num_segments = 64;
+ const NUM_SEGMENTS: usize = 64;
  let cache = crate::cht::SegmentedHashMap::with_num_segments_capacity_and_hasher(
- num_segments,
+ NUM_SEGMENTS,
  initial_capacity,
  build_hasher.clone(),
  );

diff --git a/src/sync/value_initializer.rs b/src/sync/value_initializer.rs
@@ -6,6 +6,8 @@ use std::{
 };
 use triomphe::Arc as TrioArc;
 
+const WAITER_MAP_NUM_SEGMENTS: usize = 64;
+
 type ErrorObject = Arc<dyn Any + Send + Sync + 'static>;
 type WaiterValue<V> = Option<Result<V, ErrorObject>>;
 type Waiter<V> = TrioArc<RwLock<WaiterValue<V>>>;
@@ -32,7 +34,10 @@ where
 {
  pub(crate) fn with_hasher(hasher: S) -> Self {
  Self {
- waiters: crate::cht::SegmentedHashMap::with_num_segments_and_hasher(16, hasher),
+ waiters: crate::cht::SegmentedHashMap::with_num_segments_and_hasher(
+ WAITER_MAP_NUM_SEGMENTS,
+ hasher,
+ ),
  }
  }