use .index on wrapper type

solana-labs · Feb 20, 2022 · 48f58c2 · 48f58c2
1 parent be9e02d
commit 48f58c2
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 19 deletions.
diff --git a/core/src/progress_map.rs b/core/src/progress_map.rs
@@ -1,4 +1,5 @@
 use solana_program_runtime::timings::ExecuteTimingType;
+use std::ops::Index;
 
 use {
     crate::{
@@ -66,37 +67,58 @@ impl ReplaySlotStats {
             ("total_shreds", num_shreds as i64, i64),
             (
                 "check_us",
-                self.execute_timings.metrics[ExecuteTimingType::CheckUs],
+                *self
+                    .execute_timings
+                    .metrics
+                    .index(ExecuteTimingType::CheckUs),
                 i64
             ),
             (
                 "load_us",
-                self.execute_timings.metrics[ExecuteTimingType::LoadUs],
+                *self
+                    .execute_timings
+                    .metrics
+                    .index(ExecuteTimingType::LoadUs),
                 i64
             ),
             (
                 "execute_us",
-                self.execute_timings.metrics[ExecuteTimingType::ExecuteUs],
+                *self
+                    .execute_timings
+                    .metrics
+                    .index(ExecuteTimingType::ExecuteUs),
                 i64
             ),
             (
                 "store_us",
-                self.execute_timings.metrics[ExecuteTimingType::StoreUs],
+                *self
+                    .execute_timings
+                    .metrics
+                    .index(ExecuteTimingType::StoreUs),
                 i64
             ),
             (
                 "update_stakes_cache_us",
-                self.execute_timings.metrics[ExecuteTimingType::UpdateStakesCacheUs],
+                *self
+                    .execute_timings
+                    .metrics
+                    .index(ExecuteTimingType::UpdateStakesCacheUs),
                 i64
             ),
             (
                 "total_batches_len",
-                self.execute_timings.metrics[ExecuteTimingType::TotalBatchesLen],
+                *self
+                    .execute_timings
+                    .metrics
+                    .index(ExecuteTimingType::TotalBatchesLen),
                 i64
             ),
             (
                 "num_execute_batches",
-                self.execute_timings.metrics[ExecuteTimingType::NumExecuteBatches],
+                *self
+                    .execute_timings
+                    .metrics
+                    .index(ExecuteTimingType::NumExecuteBatches),
                 i64
             ),
             (

diff --git a/program-runtime/src/timings.rs b/program-runtime/src/timings.rs
@@ -56,17 +56,13 @@ pub struct Metrics([u64; ExecuteTimingType::VARIANT_COUNT]);
 impl Index<ExecuteTimingType> for Metrics {
     type Output = u64;
     fn index(&self, index: ExecuteTimingType) -> &Self::Output {
-        let idx = index as usize;
-        debug_assert!(idx < ExecuteTimingType::VARIANT_COUNT);
-        &(self.0[idx])
+        self.0.index(index as usize)
     }
 }
 
 impl IndexMut<ExecuteTimingType> for Metrics {
     fn index_mut(&mut self, index: ExecuteTimingType) -> &mut Self::Output {
-        let idx = index as usize;
-        debug_assert!(idx < ExecuteTimingType::VARIANT_COUNT);
-        self.0.index_mut(idx)
+        self.0.index_mut(index as usize)
     }
 }
 
@@ -101,9 +97,12 @@ impl ExecuteTimings {
 
     pub fn saturating_add_in_place(&mut self, timing_type: ExecuteTimingType, value_to_add: u64) {
         let idx = timing_type as usize;
-        debug_assert!(idx < ExecuteTimingType::VARIANT_COUNT);
-        if let Some(elem) = self.metrics.0.get_mut(idx) {
-            *elem = elem.saturating_add(value_to_add);
+        match self.metrics.0.get_mut(idx) {
+            Some(elem) => *elem = elem.saturating_add(value_to_add),
+            None => debug_assert!(
+                idx < ExecuteTimingType::VARIANT_COUNT,
+                "Index out of bounds"
+            ),
         }
     }
 }
@@ -320,14 +319,14 @@ mod tests {
     }
 
     #[test]
-    fn execute_timings_saturating_add() {
+    fn execute_timings_saturating_add_in_place() {
         let mut timings = ExecuteTimings::default();
         timings.saturating_add_in_place(ExecuteTimingType::CheckUs, 1);
         let check_us = timings.metrics.index(ExecuteTimingType::CheckUs);
         assert_eq!(1, *check_us);
 
-        timings.saturating_add_in_place(ExecuteTimingType::CheckUs, 1);
+        timings.saturating_add_in_place(ExecuteTimingType::CheckUs, 2);
         let check_us = timings.metrics.index(ExecuteTimingType::CheckUs);
-        assert_eq!(2, *check_us);
+        assert_eq!(3, *check_us);
     }
 }