Custom debug impl for LoadedPrograms cache (solana-labs#33808)

Bunkr-2FA · Oct 22, 2023 · abf3b3e · abf3b3e
1 parent 8260ffc
commit abf3b3e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/program-runtime/src/loaded_programs.rs b/program-runtime/src/loaded_programs.rs
@@ -443,7 +443,6 @@ impl Default for ProgramRuntimeEnvironments {
     }
 }
 
-#[derive(Debug)]
 pub struct LoadedPrograms<FG: ForkGraph> {
     /// A two level index:
     ///
@@ -459,6 +458,17 @@ pub struct LoadedPrograms<FG: ForkGraph> {
     fork_graph: Option<Arc<RwLock<FG>>>,
 }
 
+impl<FG: ForkGraph> Debug for LoadedPrograms<FG> {
+    fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
+        f.debug_struct("LoadedPrograms")
+            .field("root slot", &self.latest_root_slot)
+            .field("root epoch", &self.latest_root_epoch)
+            .field("stats", &self.stats)
+            .field("cache", &self.entries)
+            .finish()
+    }
+}
+
 impl<FG: ForkGraph> Default for LoadedPrograms<FG> {
     fn default() -> Self {
         Self {

diff --git a/runtime/src/bank_forks.rs b/runtime/src/bank_forks.rs
@@ -56,7 +56,6 @@ struct SetRootTimings {
     prune_remove_ms: i64,
 }
 
-#[derive(Debug)]
 pub struct BankForks {
     banks: HashMap<Slot, BankWithScheduler>,
     descendants: HashMap<Slot, HashSet<Slot>>,