Skip to content
This repository was archived by the owner on Jan 22, 2025. It is now read-only.

Increment execution timings on errors as well (backport #22053) #22072

Merged
mergify merged 1 commit into from
Dec 22, 2021
Merged

Increment execution timings on errors as well (backport #22053) #22072

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
51 changes: 29 additions & 22 deletions programs/bpf_loader/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -995,7 +995,7 @@ impl Executor for BpfExecutor {
serialize_time.stop();
let mut create_vm_time = Measure::start("create_vm");
let mut execute_time;
{
let execution_result = {
let mut vm = match create_vm(
&self.executable,
parameter_bytes.as_slice_mut(),
Expand Down Expand Up @@ -1040,12 +1040,10 @@ impl Executor for BpfExecutor {
stable_log::program_return(&log_collector, &program_id, return_data);
}
match result {
Ok(status) => {
if status != SUCCESS {
let error: InstructionError = status.into();
stable_log::program_failure(&log_collector, &program_id, &error);
return Err(error);
}
Ok(status) if status != SUCCESS => {
let error: InstructionError = status.into();
stable_log::program_failure(&log_collector, &program_id, &error);
Err(error)
}
Err(error) => {
let error = match error {
Expand All @@ -1058,32 +1056,41 @@ impl Executor for BpfExecutor {
}
};
stable_log::program_failure(&log_collector, &program_id, &error);
return Err(error);
Err(error)
}
_ => Ok(()),
}
execute_time.stop();
}
};
execute_time.stop();

let mut deserialize_time = Measure::start("deserialize");
let keyed_accounts = invoke_context.get_keyed_accounts()?;
deserialize_parameters(
&loader_id,
&keyed_accounts[first_instruction_account + 1..],
parameter_bytes.as_slice(),
&account_lengths,
invoke_context
.feature_set
.is_active(&do_support_realloc::id()),
)?;
let execute_or_deserialize_result = execution_result.and_then(|_| {
let keyed_accounts = invoke_context.get_keyed_accounts()?;
deserialize_parameters(
&loader_id,
&keyed_accounts[first_instruction_account + 1..],
parameter_bytes.as_slice(),
&account_lengths,
invoke_context
.feature_set
.is_active(&do_support_realloc::id()),
)
});
deserialize_time.stop();

// Update the timings
let timings = &mut invoke_context.timings;
timings.serialize_us = timings.serialize_us.saturating_add(serialize_time.as_us());
timings.create_vm_us = timings.create_vm_us.saturating_add(create_vm_time.as_us());
timings.execute_us = timings.execute_us.saturating_add(execute_time.as_us());
timings.deserialize_us = timings
.deserialize_us
.saturating_add(deserialize_time.as_us());
stable_log::program_success(&log_collector, &program_id);
Ok(())

if execute_or_deserialize_result.is_ok() {
stable_log::program_success(&log_collector, &program_id);
}
execute_or_deserialize_result
}
}

Expand Down