Skip to content

Try default xperf.exe location if not in path; increase buffer size #354

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

Merged
merged 2 commits into from
Oct 4, 2024
Merged

Try default xperf.exe location if not in path; increase buffer size #354

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1fbf3c5
Try default xperf.exe location if not in path; increase buffer size
vvuk Sep 9, 2024
e53382d
Merge branch 'main' into xperf-misc
mstange Oct 4, 2024
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
21 changes: 20 additions & 1 deletion samply/src/windows/xperf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,16 @@ impl Xperf {
if let Some(p) = self.xperf_path.clone() {
return Ok(p);
}
let xperf_path = which::which("xperf").map_err(|_| XPERF_NOT_FOUND_ERROR_MSG)?;
let xperf_path = which::which("xperf").or_else(|_| {
let pf = std::env::var("ProgramFiles(x86)").map_err(|_| XPERF_NOT_FOUND_ERROR_MSG)?;
let xperf_install_path =
PathBuf::from(pf).join("Windows Kits/10/Windows Performance Toolkit/xperf.exe");
if xperf_install_path.exists() {
Ok(xperf_install_path)
} else {
Err(XPERF_NOT_FOUND_ERROR_MSG)
}
})?;
self.xperf_path = Some(xperf_path.clone());
Ok(xperf_path)
}
Expand Down Expand Up @@ -99,6 +108,11 @@ impl Xperf {
xperf.arg("-f");
xperf.arg(&kernel_etl_file);

// 1MB buffers. Default is 64Kb; 1MB is max. Default minimum buffer count
// is 64, max is 320, which seems totally reasonable for modern systems.
xperf.arg("-BufferSize");
xperf.arg("1024");

let user_etl_file = if !user_providers.is_empty() {
let mut user_etl_file = output_path.to_owned();
if user_etl_file.extension() == Some(OsStr::new("gz")) {
Expand All @@ -115,6 +129,11 @@ impl Xperf {
xperf.arg("-f");
xperf.arg(&user_etl_file);

// 1MB buffers. Default is 64Kb; 1MB is max. Default minimum buffer count
// is 64, max is 320, which seems totally reasonable for modern systems.
xperf.arg("-BufferSize");
xperf.arg("1024");

Some(user_etl_file)
} else {
None
Expand Down