vsndrg/hyperfine
1
0 Fork 0
mirror of https://github.com/sharkdp/hyperfine.git synced 2026-11-03 09:23:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify

Browse Source
This commit is contained in:
David Peter committed 2022-02-22 13:01:39 +01:00
1 parent 5f4cddf138
commit cd5067eda1
1 file changed
+7 -20
Download Patch File Download Diff File Expand all files Collapse all files
src/benchmark/executor.rs
+7 -20
View File
@@ -40,14 +40,6 @@ pub struct ShellExecutor<'a> {
} }
impl<'a> ShellExecutor<'a> { impl<'a> ShellExecutor<'a> {
fn subtract_shell_spawning_time(&self, time: Second, shell_spawning_time: Second) -> Second {
if time < shell_spawning_time {
0.0
} else {
time - shell_spawning_time
}
}
pub fn new(shell: &'a Shell, options: &'a Options) -> Self { pub fn new(shell: &'a Shell, options: &'a Options) -> Self {
ShellExecutor { ShellExecutor {
shell, shell,
@@ -77,14 +69,9 @@ impl<'a> Executor for ShellExecutor<'a> {
.arg(if cfg!(windows) { "/C" } else { "-c" }) .arg(if cfg!(windows) { "/C" } else { "-c" })
.arg(command.get_command_line()); .arg(command.get_command_line());
let result = execute_and_measure(command_builder) let mut result = execute_and_measure(command_builder)
.with_context(|| format!("Failed to run command '{}'", command.get_command_line()))?; .with_context(|| format!("Failed to run command '{}'", command.get_command_line()))?;
let mut time_real = result.time_real;
let mut time_user = result.time_user;
let mut time_system = result.time_system;
if command_failure_action.unwrap_or(self.options.command_failure_action) if command_failure_action.unwrap_or(self.options.command_failure_action)
== CmdFailureAction::RaiseError == CmdFailureAction::RaiseError
&& !result.status.success() && !result.status.success()
@@ -101,16 +88,16 @@ impl<'a> Executor for ShellExecutor<'a> {
// Subtract shell spawning time // Subtract shell spawning time
if let Some(spawning_time) = self.shell_spawning_time { if let Some(spawning_time) = self.shell_spawning_time {
time_real = self.subtract_shell_spawning_time(time_real, spawning_time.time_real); result.time_real = (result.time_real - spawning_time.time_real).max(0.0);
time_user = self.subtract_shell_spawning_time(time_user, spawning_time.time_user); result.time_user = (result.time_user - spawning_time.time_user).max(0.0);
time_system = self.subtract_shell_spawning_time(time_system, spawning_time.time_system); result.time_system = (result.time_system - spawning_time.time_system).max(0.0);
} }
Ok(( Ok((
TimingResult { TimingResult {
time_real, time_real: result.time_real,
time_user, time_user: result.time_user,
time_system, time_system: result.time_system,
}, },
result.status, result.status,
)) ))