From 45a34f637b7905e642bdc979c2a646aed24a184f Mon Sep 17 00:00:00 2001
From: "Jeff Washington (jwash)" <jeff.washington@solana.com>
Date: Fri, 24 Feb 2023 16:05:39 -0600
Subject: [PATCH] move BankCreationFreezingProgress to its own file (#30510)

---
 runtime/src/accounts_db.rs                    | 38 +----------------
 .../src/bank_creation_freezing_progress.rs    | 41 +++++++++++++++++++
 runtime/src/lib.rs                            |  1 +
 3 files changed, 44 insertions(+), 36 deletions(-)
 create mode 100644 runtime/src/bank_creation_freezing_progress.rs

diff --git a/runtime/src/accounts_db.rs b/runtime/src/accounts_db.rs
index 48f0bc739c..5baecc2235 100644
--- a/runtime/src/accounts_db.rs
+++ b/runtime/src/accounts_db.rs
@@ -53,6 +53,7 @@ use {
             aligned_stored_size, AppendVec, MatchAccountOwnerError, APPEND_VEC_MMAPPED_FILES_OPEN,
             STORE_META_OVERHEAD,
         },
+        bank_creation_freezing_progress::BankCreationFreezingProgress,
         cache_hash_data::{CacheHashData, CacheHashDataFile},
         contains::Contains,
         epoch_accounts_hash::EpochAccountsHashManager,
@@ -1493,42 +1494,7 @@ pub struct AccountsDb {
     /// Thus, the state of all accounts on a validator is known to be correct at least once per epoch.
     pub epoch_accounts_hash_manager: EpochAccountsHashManager,
 
-    pub bank_progress: BankCreationFreezingProgress,
-}
-
-impl BankCreationFreezingProgress {
-    fn report(&self) {
-        if self.last_report.should_update(60_000) {
-            datapoint_info!(
-                "bank_progress",
-                (
-                    "difference",
-                    self.bank_creation_count
-                        .load(Ordering::Acquire)
-                        .wrapping_sub(
-                            self.bank_freeze_or_destruction_count
-                                .load(Ordering::Acquire)
-                        ),
-                    i64
-                )
-            );
-        }
-    }
-}
-
-#[derive(Debug, Default)]
-/// Keeps track of when all banks that were started as of a known point in time have been frozen or otherwise destroyed.
-/// When 'bank_freeze_or_destruction_count' exceeds a prior value of 'bank_creation_count',
-/// this means that we can know all banks that began loading accounts have completed as of the prior value of 'bank_creation_count'.
-pub struct BankCreationFreezingProgress {
-    /// Incremented each time a bank is created.
-    /// Starting now, this bank could be finding accounts in the index and loading them from accounts db.
-    pub bank_creation_count: AtomicU32,
-    /// Incremented each time a bank is frozen or destroyed.
-    /// At this point, this bank has completed all account loading.
-    pub bank_freeze_or_destruction_count: AtomicU32,
-
-    last_report: AtomicInterval,
+    pub(crate) bank_progress: BankCreationFreezingProgress,
 }
 
 #[derive(Debug, Default)]
diff --git a/runtime/src/bank_creation_freezing_progress.rs b/runtime/src/bank_creation_freezing_progress.rs
new file mode 100644
index 0000000000..1aad2acb4e
--- /dev/null
+++ b/runtime/src/bank_creation_freezing_progress.rs
@@ -0,0 +1,41 @@
+//! Keep track of how many banks have been created and how many have been frozen or dropped.
+//! This is useful to track foreground progress to understand expected access to accounts db.
+use {
+    solana_sdk::timing::AtomicInterval,
+    std::sync::atomic::{AtomicU32, Ordering},
+};
+
+#[derive(Debug, Default)]
+/// Keeps track of when all banks that were started as of a known point in time have been frozen or otherwise destroyed.
+/// When 'bank_freeze_or_destruction_count' exceeds a prior value of 'bank_creation_count',
+/// this means that we can know all banks that began loading accounts have completed as of the prior value of 'bank_creation_count'.
+pub(crate) struct BankCreationFreezingProgress {
+    /// Incremented each time a bank is created.
+    /// Starting now, this bank could be finding accounts in the index and loading them from accounts db.
+    pub(crate) bank_creation_count: AtomicU32,
+    /// Incremented each time a bank is frozen or destroyed.
+    /// At this point, this bank has completed all account loading.
+    pub(crate) bank_freeze_or_destruction_count: AtomicU32,
+
+    last_report: AtomicInterval,
+}
+
+impl BankCreationFreezingProgress {
+    pub(crate) fn report(&self) {
+        if self.last_report.should_update(60_000) {
+            datapoint_info!(
+                "bank_progress",
+                (
+                    "difference",
+                    self.bank_creation_count
+                        .load(Ordering::Acquire)
+                        .wrapping_sub(
+                            self.bank_freeze_or_destruction_count
+                                .load(Ordering::Acquire)
+                        ),
+                    i64
+                )
+            );
+        }
+    }
+}
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 0ca6807cde..8a5bf2b051 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -23,6 +23,7 @@ mod ancient_append_vecs;
 pub mod append_vec;
 pub mod bank;
 pub mod bank_client;
+mod bank_creation_freezing_progress;
 pub mod bank_forks;
 pub mod bank_utils;
 pub mod block_cost_limits;