Skip to content

Refactor duplicate CPU time calculation #381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
VolodymyrBg wants to merge 1 commit into from
Closed

Refactor duplicate CPU time calculation #381

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
33 changes: 10 additions & 23 deletions benchmarks/src/utils.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,14 @@ pub fn phase_start() -> (std::time::Instant, rusage, rusage) {
)
}

/// Calculate total CPU time (user + system) from a rusage struct
fn calculate_cpu_time(usage: &rusage) -> f64 {
usage.ru_utime.tv_sec as f64
+ usage.ru_utime.tv_usec as f64 / 1_000_000.0
+ usage.ru_stime.tv_sec as f64
+ usage.ru_stime.tv_usec as f64 / 1_000_000.0
}

/// End measuring a phase and return duration and metrics.
pub fn phase_end(
start_time: std::time::Instant,
Expand All @@ -191,29 +199,8 @@ pub fn phase_end(
getrusage(RUSAGE_CHILDREN, &mut final_children_usage);
};

let initial_cpu_time = {
let self_time = initial_self_usage.ru_utime.tv_sec as f64
+ initial_self_usage.ru_utime.tv_usec as f64 / 1_000_000.0
+ initial_self_usage.ru_stime.tv_sec as f64
+ initial_self_usage.ru_stime.tv_usec as f64 / 1_000_000.0;
let children_time = initial_children_usage.ru_utime.tv_sec as f64
+ initial_children_usage.ru_utime.tv_usec as f64 / 1_000_000.0
+ initial_children_usage.ru_stime.tv_sec as f64
+ initial_children_usage.ru_stime.tv_usec as f64 / 1_000_000.0;
self_time + children_time
};

let final_cpu_time = {
let self_time = final_self_usage.ru_utime.tv_sec as f64
+ final_self_usage.ru_utime.tv_usec as f64 / 1_000_000.0
+ final_self_usage.ru_stime.tv_sec as f64
+ final_self_usage.ru_stime.tv_usec as f64 / 1_000_000.0;
let children_time = final_children_usage.ru_utime.tv_sec as f64
+ final_children_usage.ru_utime.tv_usec as f64 / 1_000_000.0
+ final_children_usage.ru_stime.tv_sec as f64
+ final_children_usage.ru_stime.tv_usec as f64 / 1_000_000.0;
self_time + children_time
};
let initial_cpu_time = calculate_cpu_time(&initial_self_usage) + calculate_cpu_time(&initial_children_usage);
let final_cpu_time = calculate_cpu_time(&final_self_usage) + calculate_cpu_time(&final_children_usage);

let total_cpu_time = final_cpu_time - initial_cpu_time;
let duration = start_time.elapsed();
Expand Down
Loading