2021-12-03 09:00:31 -08:00
|
|
|
use {solana_sdk::pubkey::Pubkey, std::collections::HashMap};
|
2021-11-30 23:54:42 -08:00
|
|
|
|
2022-01-03 13:33:54 -08:00
|
|
|
#[derive(Default, Debug, PartialEq)]
|
2021-11-30 23:54:42 -08:00
|
|
|
pub struct ProgramTiming {
|
|
|
|
pub accumulated_us: u64,
|
|
|
|
pub accumulated_units: u64,
|
|
|
|
pub count: u32,
|
2021-12-30 18:21:42 -08:00
|
|
|
pub errored_txs_compute_consumed: Vec<u64>,
|
2022-01-03 13:33:54 -08:00
|
|
|
// Sum of all units in `errored_txs_compute_consumed`
|
|
|
|
pub total_errored_units: u64,
|
2021-12-30 18:21:42 -08:00
|
|
|
}
|
|
|
|
|
|
|
|
impl ProgramTiming {
|
|
|
|
pub fn coalesce_error_timings(&mut self, current_estimated_program_cost: u64) {
|
|
|
|
for tx_error_compute_consumed in self.errored_txs_compute_consumed.drain(..) {
|
|
|
|
let compute_units_update =
|
|
|
|
std::cmp::max(current_estimated_program_cost, tx_error_compute_consumed);
|
|
|
|
self.accumulated_units = self.accumulated_units.saturating_add(compute_units_update);
|
|
|
|
self.count = self.count.saturating_add(1);
|
|
|
|
}
|
|
|
|
}
|
2022-01-03 13:33:54 -08:00
|
|
|
|
|
|
|
pub fn accumulate_program_timings(&mut self, other: &ProgramTiming) {
|
|
|
|
self.accumulated_us = self.accumulated_us.saturating_add(other.accumulated_us);
|
|
|
|
self.accumulated_units = self
|
|
|
|
.accumulated_units
|
|
|
|
.saturating_add(other.accumulated_units);
|
|
|
|
self.count = self.count.saturating_add(other.count);
|
|
|
|
// Clones the entire vector, maybe not great...
|
|
|
|
self.errored_txs_compute_consumed
|
|
|
|
.extend(other.errored_txs_compute_consumed.clone());
|
|
|
|
self.total_errored_units = self
|
|
|
|
.total_errored_units
|
|
|
|
.saturating_add(other.total_errored_units);
|
|
|
|
}
|
2021-11-30 23:54:42 -08:00
|
|
|
}
|
|
|
|
|
2022-01-04 00:23:56 -08:00
|
|
|
#[derive(Default, Debug)]
|
|
|
|
pub struct ExecuteTimings {
|
|
|
|
pub check_us: u64,
|
|
|
|
pub load_us: u64,
|
|
|
|
pub execute_us: u64,
|
|
|
|
pub store_us: u64,
|
|
|
|
pub update_stakes_cache_us: u64,
|
|
|
|
pub total_batches_len: usize,
|
|
|
|
pub num_execute_batches: u64,
|
|
|
|
pub collect_logs_us: u64,
|
|
|
|
pub details: ExecuteDetailsTimings,
|
|
|
|
}
|
|
|
|
|
|
|
|
impl ExecuteTimings {
|
|
|
|
pub fn accumulate(&mut self, other: &ExecuteTimings) {
|
|
|
|
self.check_us = self.check_us.saturating_add(other.check_us);
|
|
|
|
self.load_us = self.load_us.saturating_add(other.load_us);
|
|
|
|
self.execute_us = self.execute_us.saturating_add(other.execute_us);
|
|
|
|
self.store_us = self.store_us.saturating_add(other.store_us);
|
|
|
|
self.update_stakes_cache_us = self
|
|
|
|
.update_stakes_cache_us
|
|
|
|
.saturating_add(other.update_stakes_cache_us);
|
|
|
|
self.total_batches_len = self
|
|
|
|
.total_batches_len
|
|
|
|
.saturating_add(other.total_batches_len);
|
|
|
|
self.num_execute_batches = self
|
|
|
|
.num_execute_batches
|
|
|
|
.saturating_add(other.num_execute_batches);
|
|
|
|
self.collect_logs_us = self.collect_logs_us.saturating_add(other.collect_logs_us);
|
|
|
|
self.details.accumulate(&other.details);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2022-01-03 13:33:54 -08:00
|
|
|
#[derive(Default, Debug, PartialEq)]
|
2021-11-30 23:54:42 -08:00
|
|
|
pub struct ExecuteDetailsTimings {
|
|
|
|
pub serialize_us: u64,
|
|
|
|
pub create_vm_us: u64,
|
|
|
|
pub execute_us: u64,
|
|
|
|
pub deserialize_us: u64,
|
|
|
|
pub changed_account_count: u64,
|
|
|
|
pub total_account_count: u64,
|
|
|
|
pub total_data_size: usize,
|
|
|
|
pub data_size_changed: usize,
|
|
|
|
pub per_program_timings: HashMap<Pubkey, ProgramTiming>,
|
|
|
|
}
|
|
|
|
impl ExecuteDetailsTimings {
|
|
|
|
pub fn accumulate(&mut self, other: &ExecuteDetailsTimings) {
|
|
|
|
self.serialize_us = self.serialize_us.saturating_add(other.serialize_us);
|
|
|
|
self.create_vm_us = self.create_vm_us.saturating_add(other.create_vm_us);
|
|
|
|
self.execute_us = self.execute_us.saturating_add(other.execute_us);
|
|
|
|
self.deserialize_us = self.deserialize_us.saturating_add(other.deserialize_us);
|
|
|
|
self.changed_account_count = self
|
|
|
|
.changed_account_count
|
|
|
|
.saturating_add(other.changed_account_count);
|
|
|
|
self.total_account_count = self
|
|
|
|
.total_account_count
|
|
|
|
.saturating_add(other.total_account_count);
|
|
|
|
self.total_data_size = self.total_data_size.saturating_add(other.total_data_size);
|
|
|
|
self.data_size_changed = self
|
|
|
|
.data_size_changed
|
|
|
|
.saturating_add(other.data_size_changed);
|
|
|
|
for (id, other) in &other.per_program_timings {
|
|
|
|
let program_timing = self.per_program_timings.entry(*id).or_default();
|
2022-01-03 13:33:54 -08:00
|
|
|
program_timing.accumulate_program_timings(other);
|
2021-11-30 23:54:42 -08:00
|
|
|
}
|
|
|
|
}
|
2022-01-03 13:33:54 -08:00
|
|
|
|
2021-12-30 18:21:42 -08:00
|
|
|
pub fn accumulate_program(
|
|
|
|
&mut self,
|
|
|
|
program_id: &Pubkey,
|
|
|
|
us: u64,
|
|
|
|
compute_units_consumed: u64,
|
|
|
|
is_error: bool,
|
|
|
|
) {
|
2021-11-30 23:54:42 -08:00
|
|
|
let program_timing = self.per_program_timings.entry(*program_id).or_default();
|
|
|
|
program_timing.accumulated_us = program_timing.accumulated_us.saturating_add(us);
|
2021-12-30 18:21:42 -08:00
|
|
|
if is_error {
|
|
|
|
program_timing
|
|
|
|
.errored_txs_compute_consumed
|
|
|
|
.push(compute_units_consumed);
|
2022-01-03 13:33:54 -08:00
|
|
|
program_timing.total_errored_units = program_timing
|
|
|
|
.total_errored_units
|
|
|
|
.saturating_add(compute_units_consumed);
|
2021-12-30 18:21:42 -08:00
|
|
|
} else {
|
|
|
|
program_timing.accumulated_units = program_timing
|
|
|
|
.accumulated_units
|
|
|
|
.saturating_add(compute_units_consumed);
|
|
|
|
program_timing.count = program_timing.count.saturating_add(1);
|
|
|
|
};
|
2021-11-30 23:54:42 -08:00
|
|
|
}
|
|
|
|
}
|
2022-01-03 13:33:54 -08:00
|
|
|
|
|
|
|
#[cfg(test)]
|
|
|
|
mod tests {
|
|
|
|
use super::*;
|
|
|
|
|
|
|
|
fn construct_execute_timings_with_program(
|
|
|
|
program_id: &Pubkey,
|
|
|
|
us: u64,
|
|
|
|
compute_units_consumed: u64,
|
|
|
|
) -> ExecuteDetailsTimings {
|
|
|
|
let mut execute_details_timings = ExecuteDetailsTimings::default();
|
|
|
|
|
|
|
|
// Accumulate an erroring transaction
|
|
|
|
let is_error = true;
|
|
|
|
execute_details_timings.accumulate_program(
|
|
|
|
program_id,
|
|
|
|
us,
|
|
|
|
compute_units_consumed,
|
|
|
|
is_error,
|
|
|
|
);
|
|
|
|
|
|
|
|
// Accumulate a non-erroring transaction
|
|
|
|
let is_error = false;
|
|
|
|
execute_details_timings.accumulate_program(
|
|
|
|
program_id,
|
|
|
|
us,
|
|
|
|
compute_units_consumed,
|
|
|
|
is_error,
|
|
|
|
);
|
|
|
|
|
|
|
|
let program_timings = execute_details_timings
|
|
|
|
.per_program_timings
|
|
|
|
.get(program_id)
|
|
|
|
.unwrap();
|
|
|
|
|
|
|
|
// Both error and success transactions count towards `accumulated_us`
|
|
|
|
assert_eq!(program_timings.accumulated_us, us.saturating_mul(2));
|
|
|
|
assert_eq!(program_timings.accumulated_units, compute_units_consumed);
|
|
|
|
assert_eq!(program_timings.count, 1,);
|
|
|
|
assert_eq!(
|
|
|
|
program_timings.errored_txs_compute_consumed,
|
|
|
|
vec![compute_units_consumed]
|
|
|
|
);
|
|
|
|
assert_eq!(program_timings.total_errored_units, compute_units_consumed,);
|
|
|
|
|
|
|
|
execute_details_timings
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_execute_details_timing_acumulate_program() {
|
|
|
|
// Acumulate an erroring transaction
|
|
|
|
let program_id = Pubkey::new_unique();
|
|
|
|
let us = 100;
|
|
|
|
let compute_units_consumed = 1;
|
|
|
|
construct_execute_timings_with_program(&program_id, us, compute_units_consumed);
|
|
|
|
}
|
|
|
|
|
|
|
|
#[test]
|
|
|
|
fn test_execute_details_timing_acumulate() {
|
|
|
|
// Acumulate an erroring transaction
|
|
|
|
let program_id = Pubkey::new_unique();
|
|
|
|
let us = 100;
|
|
|
|
let compute_units_consumed = 1;
|
|
|
|
let mut execute_details_timings = ExecuteDetailsTimings::default();
|
|
|
|
|
|
|
|
// Construct another separate instance of ExecuteDetailsTimings with non default fields
|
|
|
|
let mut other_execute_details_timings =
|
|
|
|
construct_execute_timings_with_program(&program_id, us, compute_units_consumed);
|
|
|
|
let account_count = 1;
|
|
|
|
let data_size_changed = 1;
|
|
|
|
other_execute_details_timings.serialize_us = us;
|
|
|
|
other_execute_details_timings.create_vm_us = us;
|
|
|
|
other_execute_details_timings.execute_us = us;
|
|
|
|
other_execute_details_timings.deserialize_us = us;
|
|
|
|
other_execute_details_timings.changed_account_count = account_count;
|
|
|
|
other_execute_details_timings.total_account_count = account_count;
|
|
|
|
other_execute_details_timings.total_data_size = data_size_changed;
|
|
|
|
other_execute_details_timings.data_size_changed = data_size_changed;
|
|
|
|
|
|
|
|
// Accumulate the other instance into the current instance
|
|
|
|
execute_details_timings.accumulate(&other_execute_details_timings);
|
|
|
|
|
|
|
|
// Check that the two instances are equal
|
|
|
|
assert_eq!(execute_details_timings, other_execute_details_timings);
|
|
|
|
}
|
|
|
|
}
|