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

wrap create executor timings datapoint in a module

This commit is contained in:
Trent Nelson 2022-01-08 20:06:47 -07:00 committed by mergify[bot]
parent 3b4aad9df1
commit 428575f9ae
1 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
programs/bpf_loader/src/lib.rs
View File

@ -82,6 +82,28 @@ fn map_ebpf_error(invoke_context: &InvokeContext, e: EbpfError<BpfError>) -> Ins
InstructionError::InvalidAccountData InstructionError::InvalidAccountData
} }
mod executor_metrics {
#[derive(Debug, Default)]
pub struct CreateMetrics {
pub program_id: String,
pub load_elf_us: u64,
pub verify_code_us: u64,
pub jit_compile_us: u64,
}
impl CreateMetrics {
pub fn submit_datapoint(&self) {
datapoint_trace!(
"create_executor_trace",
("program_id", self.program_id, String),
("load_elf_us", self.load_elf_us, i64),
("verify_code_us", self.verify_code_us, i64),
("jit_compile_us", self.jit_compile_us, i64),
);
}
}
}
pub fn create_executor( pub fn create_executor(
programdata_account_index: usize, programdata_account_index: usize,
programdata_offset: usize, programdata_offset: usize,
@ -124,14 +146,11 @@ pub fn create_executor(
.is_active(&reject_all_elf_rw::id()), .is_active(&reject_all_elf_rw::id()),
..Config::default() ..Config::default()
}; };
let program_id; let mut create_executor_metrics = executor_metrics::CreateMetrics::default();
let load_elf_us: u64;
let verify_elf_us: u64;
let mut jit_compile_us = 0u64;
let mut executable = { let mut executable = {
let keyed_accounts = invoke_context.get_keyed_accounts()?; let keyed_accounts = invoke_context.get_keyed_accounts()?;
let programdata = keyed_account_at_index(keyed_accounts, programdata_account_index)?; let programdata = keyed_account_at_index(keyed_accounts, programdata_account_index)?;
program_id = *programdata.unsigned_key(); create_executor_metrics.program_id = programdata.unsigned_key().to_string();
let mut load_elf_time = Measure::start("load_elf_time"); let mut load_elf_time = Measure::start("load_elf_time");
let executable = Executable::<BpfError, ThisInstructionMeter>::from_elf( let executable = Executable::<BpfError, ThisInstructionMeter>::from_elf(
&programdata.try_account_ref()?.data()[programdata_offset..], &programdata.try_account_ref()?.data()[programdata_offset..],
@ -140,11 +159,11 @@ pub fn create_executor(
syscall_registry, syscall_registry,
); );
load_elf_time.stop(); load_elf_time.stop();
load_elf_us = load_elf_time.as_us(); create_executor_metrics.load_elf_us = load_elf_time.as_us();
invoke_context.timings.create_executor_load_elf_us = invoke_context invoke_context.timings.create_executor_load_elf_us = invoke_context
.timings .timings
.create_executor_load_elf_us .create_executor_load_elf_us
.saturating_add(load_elf_us); .saturating_add(create_executor_metrics.load_elf_us);
executable executable
} }
.map_err(|e| map_ebpf_error(invoke_context, e))?; .map_err(|e| map_ebpf_error(invoke_context, e))?;
@ -153,33 +172,27 @@ pub fn create_executor(
verifier::check(text_bytes, &config) verifier::check(text_bytes, &config)
.map_err(|e| map_ebpf_error(invoke_context, EbpfError::UserError(e.into())))?; .map_err(|e| map_ebpf_error(invoke_context, EbpfError::UserError(e.into())))?;
verify_code_time.stop(); verify_code_time.stop();
verify_elf_us = verify_code_time.as_us(); create_executor_metrics.verify_code_us = verify_code_time.as_us();
invoke_context.timings.create_executor_verify_code_us = invoke_context invoke_context.timings.create_executor_verify_code_us = invoke_context
.timings .timings
.create_executor_verify_code_us .create_executor_verify_code_us
.saturating_add(verify_elf_us); .saturating_add(create_executor_metrics.verify_code_us);
if use_jit { if use_jit {
let mut jit_compile_time = Measure::start("jit_compile_time"); let mut jit_compile_time = Measure::start("jit_compile_time");
let jit_compile_result = let jit_compile_result =
Executable::<BpfError, ThisInstructionMeter>::jit_compile(&mut executable); Executable::<BpfError, ThisInstructionMeter>::jit_compile(&mut executable);
jit_compile_time.stop(); jit_compile_time.stop();
jit_compile_us = jit_compile_time.as_us(); create_executor_metrics.jit_compile_us = jit_compile_time.as_us();
invoke_context.timings.create_executor_jit_compile_us = invoke_context invoke_context.timings.create_executor_jit_compile_us = invoke_context
.timings .timings
.create_executor_jit_compile_us .create_executor_jit_compile_us
.saturating_add(jit_compile_us); .saturating_add(create_executor_metrics.jit_compile_us);
if let Err(err) = jit_compile_result { if let Err(err) = jit_compile_result {
ic_msg!(invoke_context, "Failed to compile program {:?}", err); ic_msg!(invoke_context, "Failed to compile program {:?}", err);
return Err(InstructionError::ProgramFailedToCompile); return Err(InstructionError::ProgramFailedToCompile);
} }
} }
datapoint_trace!( create_executor_metrics.submit_datapoint();
"create_executor_trace",
("program_id", program_id.to_string(), String),
("load_elf_us", load_elf_us, i64),
("verify_elf_us", verify_elf_us, i64),
("jit_compile_us", jit_compile_us, i64),
);
Ok(Arc::new(BpfExecutor { executable })) Ok(Arc::new(BpfExecutor { executable }))
} }