From f6206641b97363591836fc016a91a868f18108ab Mon Sep 17 00:00:00 2001
From: GroovieGermanikus <groovie@mango.markets>
Date: Fri, 10 May 2024 18:21:57 +0200
Subject: [PATCH] fix ordering of slot change

---
 examples/bench_geyser_grpc_accounts.rs | 26 ++++++++++++++------------
 1 file changed, 14 insertions(+), 12 deletions(-)

diff --git a/examples/bench_geyser_grpc_accounts.rs b/examples/bench_geyser_grpc_accounts.rs
index d3fa11a..1f0dda3 100644
--- a/examples/bench_geyser_grpc_accounts.rs
+++ b/examples/bench_geyser_grpc_accounts.rs
@@ -190,15 +190,6 @@ fn start_tracking_account_consumer(mut geyser_messages_rx: Receiver<Message>, cu
                         let slot = update.slot;
                         let account_receive_time = get_epoch_sec();
 
-                        let latest_slot = current_processed_slot.load(Ordering::Relaxed);
-
-                        if latest_slot != 0 {
-                            // the perfect is value "-1"
-                            let delta = (latest_slot as i64) - (slot as i64);
-                            if debouncer.can_fire() {
-                                debug!("Account info for upcoming slot {} was {} behind current processed slot", slot, delta);
-                            }
-                        }
 
                         // if account_info.data.len() > 1000 {
                         //     trace!("got account update!!! {} - {:?} - {} bytes",
@@ -221,13 +212,13 @@ fn start_tracking_account_consumer(mut geyser_messages_rx: Receiver<Message>, cu
 
                             info!("Slot: {} - num of update messages: {}", slot, updates_per_slot.get(&current_slot).unwrap());
 
-                            let counters = wallclock_updates_per_slot_account.iter()
+                            let per_account_updates = wallclock_updates_per_slot_account.iter()
                                 .filter(|((slot, _pubkey), _)| slot == &current_slot)
                                 .map(|((_slot, _pubkey), updates)| updates.len() as f64)
                                 .sorted_by(|a, b| a.partial_cmp(b).unwrap())
                                 .collect_vec();
-                            let count_histogram = histogram_percentiles::calculate_percentiles(&counters);
-                            info!("Count histogram: {}", count_histogram);
+                            let per_account_updates_histogram = histogram_percentiles::calculate_percentiles(&per_account_updates);
+                            info!("Per-account updates histogram: {}", per_account_updates_histogram);
 
                             if let Some(actual_block_time) = block_time_per_slot.get(&current_slot) {
                                 info!("Block time for slot {}: delta {} seconds", current_slot, account_receive_time - *actual_block_time);
@@ -247,6 +238,17 @@ fn start_tracking_account_consumer(mut geyser_messages_rx: Receiver<Message>, cu
                         } // -- slot changed
                         current_slot = slot;
 
+
+                        let latest_slot = current_processed_slot.load(Ordering::Relaxed);
+
+                        if latest_slot != 0 {
+                            // the perfect is value "-1"
+                            let delta = (latest_slot as i64) - (slot as i64);
+                            if debouncer.can_fire() {
+                                debug!("Account info for upcoming slot {} was {} behind current processed slot", slot, delta);
+                            }
+                        }
+
                     }
                     None => {}
                     _ => {}