From 93c1de59ed43a67b426a8e45e3cfe4bfa2238cb7 Mon Sep 17 00:00:00 2001
From: Brooks Prumo <brooks@solana.com>
Date: Thu, 16 Sep 2021 16:18:29 -0500
Subject: [PATCH] move stats in bucket_stats

---
 bucket_map/src/bucket_map.rs     |  2 +-
 bucket_map/src/bucket_stats.rs   | 18 ++++++++++++++++++
 bucket_map/src/bucket_storage.rs | 17 +----------------
 bucket_map/src/lib.rs            |  1 +
 4 files changed, 21 insertions(+), 17 deletions(-)
 create mode 100644 bucket_map/src/bucket_stats.rs

diff --git a/bucket_map/src/bucket_map.rs b/bucket_map/src/bucket_map.rs
index 12a3da78a1..eee0c40723 100644
--- a/bucket_map/src/bucket_map.rs
+++ b/bucket_map/src/bucket_map.rs
@@ -1,7 +1,7 @@
 //! BucketMap is a mostly contention free concurrent map backed by MmapMut
 
 use crate::bucket::Bucket;
-use crate::data_bucket::BucketMapStats;
+use crate::bucket_stats::BucketMapStats;
 use solana_sdk::pubkey::Pubkey;
 use std::convert::TryInto;
 use std::fmt::Debug;
diff --git a/bucket_map/src/bucket_stats.rs b/bucket_map/src/bucket_stats.rs
new file mode 100644
index 0000000000..9de4fbdb37
--- /dev/null
+++ b/bucket_map/src/bucket_stats.rs
@@ -0,0 +1,18 @@
+use std::sync::Arc;
+use std::sync::{atomic::AtomicU64, Mutex};
+
+#[derive(Debug, Default)]
+pub struct BucketStats {
+    pub resizes: AtomicU64,
+    pub max_size: Mutex<u64>,
+    pub resize_us: AtomicU64,
+    pub new_file_us: AtomicU64,
+    pub flush_file_us: AtomicU64,
+    pub mmap_us: AtomicU64,
+}
+
+#[derive(Debug, Default, Clone)]
+pub struct BucketMapStats {
+    pub index: Arc<BucketStats>,
+    pub data: Arc<BucketStats>,
+}
diff --git a/bucket_map/src/bucket_storage.rs b/bucket_map/src/bucket_storage.rs
index cb64b45b96..ddefe0f00d 100644
--- a/bucket_map/src/bucket_storage.rs
+++ b/bucket_map/src/bucket_storage.rs
@@ -1,4 +1,5 @@
 use crate::bucket_map::MaxSearch;
+use crate::bucket_stats::BucketStats;
 use memmap2::MmapMut;
 use rand::{thread_rng, Rng};
 use solana_measure::measure::Measure;
@@ -10,24 +11,8 @@ use std::path::PathBuf;
 use std::sync::Arc;
 use std::sync::{
     atomic::{AtomicU64, Ordering},
-    Mutex,
 };
 
-#[derive(Debug, Default)]
-pub struct BucketStats {
-    pub resizes: AtomicU64,
-    pub max_size: Mutex<u64>,
-    pub resize_us: AtomicU64,
-    pub new_file_us: AtomicU64,
-    pub flush_file_us: AtomicU64,
-    pub mmap_us: AtomicU64,
-}
-
-#[derive(Debug, Default, Clone)]
-pub struct BucketMapStats {
-    pub index: Arc<BucketStats>,
-    pub data: Arc<BucketStats>,
-}
 
 /*
 1	2
diff --git a/bucket_map/src/lib.rs b/bucket_map/src/lib.rs
index 1fa3fa9706..18f5778bc8 100644
--- a/bucket_map/src/lib.rs
+++ b/bucket_map/src/lib.rs
@@ -3,5 +3,6 @@
 #![allow(clippy::mut_from_ref)]
 mod bucket;
 pub mod bucket_map;
+mod bucket_stats;
 mod bucket_storage;
 mod index_entry;