blockworks-foundation
/
solana-with-rpc-optimizations
mirror of https://github.com/blockworks-foundation/solana-with-rpc-optimizations.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

records num data shreds obtained from serializing entries (#26888)

This commit is contained in:
behzad nouri 2022-08-03 17:07:40 +00:00 committed by GitHub
parent 4c29750095
commit 403b2e4841
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
ledger/src/shred/stats.rs
View File

@ -1,5 +1,4 @@
use { use {
crate::shred::MAX_DATA_SHREDS_PER_FEC_BLOCK,
solana_sdk::clock::Slot, solana_sdk::clock::Slot,
std::{ std::{
ops::AddAssign, ops::AddAssign,
@ -18,9 +17,9 @@ pub struct ProcessShredsStats {
pub sign_coding_elapsed: u64, pub sign_coding_elapsed: u64,
pub coding_send_elapsed: u64, pub coding_send_elapsed: u64,
pub get_leader_schedule_elapsed: u64, pub get_leader_schedule_elapsed: u64,
// Number of data shreds from serializing ledger entries which do not make // Histogram count of num_data_shreds obtained from serializing entries
// a full batch of MAX_DATA_SHREDS_PER_FEC_BLOCK; counted in 4 buckets. // counted in 5 buckets.
num_residual_data_shreds: [usize; 4], num_data_shreds_hist: [usize; 5],
// If the blockstore already has shreds for the broadcast slot. // If the blockstore already has shreds for the broadcast slot.
pub num_extant_slots: u64, pub num_extant_slots: u64,
pub(crate) data_buffer_residual: usize, pub(crate) data_buffer_residual: usize,
@ -54,9 +53,10 @@ impl ProcessShredsStats {
let slot_broadcast_time = slot_broadcast_time let slot_broadcast_time = slot_broadcast_time
.map(|t| t.as_micros() as i64) .map(|t| t.as_micros() as i64)
.unwrap_or(-1); .unwrap_or(-1);
self.num_residual_data_shreds[1] += self.num_residual_data_shreds[0]; self.num_data_shreds_hist.iter_mut().fold(0, |acc, num| {
self.num_residual_data_shreds[2] += self.num_residual_data_shreds[1]; *num += acc;
self.num_residual_data_shreds[3] += self.num_residual_data_shreds[2]; *num
});
datapoint_info!( datapoint_info!(
name, name,
("slot", slot, i64), ("slot", slot, i64),
@ -76,34 +76,20 @@ impl ProcessShredsStats {
("coding_send_time", self.coding_send_elapsed, i64), ("coding_send_time", self.coding_send_elapsed, i64),
("num_extant_slots", self.num_extant_slots, i64), ("num_extant_slots", self.num_extant_slots, i64),
("data_buffer_residual", self.data_buffer_residual, i64), ("data_buffer_residual", self.data_buffer_residual, i64),
( ("num_data_shreds_07", self.num_data_shreds_hist[0], i64),
"residual_data_shreds_08", ("num_data_shreds_15", self.num_data_shreds_hist[1], i64),
self.num_residual_data_shreds[0], ("num_data_shreds_31", self.num_data_shreds_hist[2], i64),
i64 ("num_data_shreds_63", self.num_data_shreds_hist[3], i64),
), ("num_data_shreds_64", self.num_data_shreds_hist[4], i64),
(
"residual_data_shreds_16",
self.num_residual_data_shreds[1],
i64
),
(
"residual_data_shreds_24",
self.num_residual_data_shreds[2],
i64
),
(
"residual_data_shreds_32",
self.num_residual_data_shreds[3],
i64
),
); );
*self = Self::default(); *self = Self::default();
} }
pub(crate) fn record_num_residual_data_shreds(&mut self, num_data_shreds: usize) { pub(crate) fn record_num_data_shreds(&mut self, num_data_shreds: usize) {
const SIZE_OF_RESIDUAL_BUCKETS: usize = (MAX_DATA_SHREDS_PER_FEC_BLOCK as usize + 3) / 4; let index = usize::BITS - num_data_shreds.leading_zeros();
let residual = num_data_shreds % (MAX_DATA_SHREDS_PER_FEC_BLOCK as usize); let index = index.saturating_sub(3) as usize;
self.num_residual_data_shreds[residual / SIZE_OF_RESIDUAL_BUCKETS] += 1; let index = index.min(self.num_data_shreds_hist.len() - 1);
self.num_data_shreds_hist[index] += 1;
} }
} }
@ -146,7 +132,7 @@ impl AddAssign<ProcessShredsStats> for ProcessShredsStats {
sign_coding_elapsed, sign_coding_elapsed,
coding_send_elapsed, coding_send_elapsed,
get_leader_schedule_elapsed, get_leader_schedule_elapsed,
num_residual_data_shreds, num_data_shreds_hist,
num_extant_slots, num_extant_slots,
data_buffer_residual, data_buffer_residual,
} = rhs; } = rhs;
@ -160,8 +146,8 @@ impl AddAssign<ProcessShredsStats> for ProcessShredsStats {
self.get_leader_schedule_elapsed += get_leader_schedule_elapsed; self.get_leader_schedule_elapsed += get_leader_schedule_elapsed;
self.num_extant_slots += num_extant_slots; self.num_extant_slots += num_extant_slots;
self.data_buffer_residual += data_buffer_residual; self.data_buffer_residual += data_buffer_residual;
for (i, bucket) in self.num_residual_data_shreds.iter_mut().enumerate() { for (i, bucket) in self.num_data_shreds_hist.iter_mut().enumerate() {
*bucket += num_residual_data_shreds[i]; *bucket += num_data_shreds_hist[i];
} }
} }
} }

2
ledger/src/shredder.rs
View File

@ -157,7 +157,7 @@ impl Shredder {
process_stats.serialize_elapsed += serialize_time.as_us(); process_stats.serialize_elapsed += serialize_time.as_us();
process_stats.gen_data_elapsed += gen_data_time.as_us(); process_stats.gen_data_elapsed += gen_data_time.as_us();
process_stats.record_num_residual_data_shreds(data_shreds.len()); process_stats.record_num_data_shreds(data_shreds.len());
data_shreds data_shreds
} }