From c9df037dae1046c5091178815f4ff5261c8f2798 Mon Sep 17 00:00:00 2001
From: "mergify[bot]" <37929162+mergify[bot]@users.noreply.github.com>
Date: Wed, 19 Jan 2022 01:52:30 +0000
Subject: [PATCH] Track discard time of excess packets in sigverify (#22554)
 (#22570)

* discard time histogram

* closer to the if

* update

(cherry picked from commit e616a7ebfc16f88abf66a0329a9ff0d526a46a6a)

Co-authored-by: anatoly yakovenko <anatoly@solana.com>
---
 core/src/sigverify_stage.rs | 30 +++++++++++++++++++++++++++++-
 1 file changed, 29 insertions(+), 1 deletion(-)

diff --git a/core/src/sigverify_stage.rs b/core/src/sigverify_stage.rs
index 33bf468eb09c69..005d1a46e7ddda 100644
--- a/core/src/sigverify_stage.rs
+++ b/core/src/sigverify_stage.rs
@@ -49,6 +49,7 @@ pub struct DisabledSigVerifier {}
 struct SigVerifierStats {
     recv_batches_us_hist: histogram::Histogram, // time to call recv_batch
     verify_batches_pp_us_hist: histogram::Histogram, // per-packet time to call verify_batch
+    discard_packets_pp_us_hist: histogram::Histogram, // per-packet time to call verify_batch
     batches_hist: histogram::Histogram,         // number of packet batches per verify call
     packets_hist: histogram::Histogram,         // number of packets per verify call
     total_batches: usize,
@@ -99,6 +100,28 @@ impl SigVerifierStats {
                 self.verify_batches_pp_us_hist.mean().unwrap_or(0),
                 i64
             ),
+            (
+                "discard_packets_pp_us_90pct",
+                self.discard_packets_pp_us_hist
+                    .percentile(90.0)
+                    .unwrap_or(0),
+                i64
+            ),
+            (
+                "discard_packets_pp_us_min",
+                self.discard_packets_pp_us_hist.minimum().unwrap_or(0),
+                i64
+            ),
+            (
+                "discard_packets_pp_us_max",
+                self.discard_packets_pp_us_hist.maximum().unwrap_or(0),
+                i64
+            ),
+            (
+                "discard_packets_pp_us_mean",
+                self.discard_packets_pp_us_hist.mean().unwrap_or(0),
+                i64
+            ),
             (
                 "batches_90pct",
                 self.batches_hist.percentile(90.0).unwrap_or(0),
@@ -184,10 +207,11 @@ impl SigVerifyStage {
             timing::timestamp(),
             num_packets,
         );
+        let mut discard_time = Measure::start("sigverify_discard_time");
         if num_packets > MAX_SIGVERIFY_BATCH {
             Self::discard_excess_packets(&mut batches, MAX_SIGVERIFY_BATCH);
         }
-
+        discard_time.stop();
         let mut verify_batch_time = Measure::start("sigverify_batch_time");
         sendr.send(verifier.verify_batches(batches))?;
         verify_batch_time.stop();
@@ -209,6 +233,10 @@ impl SigVerifyStage {
             .verify_batches_pp_us_hist
             .increment(verify_batch_time.as_us() / (num_packets as u64))
             .unwrap();
+        stats
+            .discard_packets_pp_us_hist
+            .increment(discard_time.as_us() / (num_packets as u64))
+            .unwrap();
         stats.batches_hist.increment(batches_len as u64).unwrap();
         stats.packets_hist.increment(num_packets as u64).unwrap();
         stats.total_batches += batches_len;