Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-26 13:03:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge #5588

Browse source 
5588: Print errors when failing to create a perf counter r=matklad a=matklad



bors r+
🤖

Co-authored-by: Aleksey Kladov <aleksey.kladov@gmail.com>
This commit is contained in:
bors[bot] 2020-07-30 12:34:38 +00:00 committed by GitHub
commit 96c3ff1c57
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
crates/ra_prof/src/stop_watch.rs
View file

@ -23,9 +23,14 @@ impl StopWatch {
pub fn start() -> StopWatch { pub fn start() -> StopWatch {
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
let counter = { let counter = {
let mut counter = perf_event::Builder::new().build().ok(); let mut counter = perf_event::Builder::new()
.build()
.map_err(|err| eprintln!("Failed to create perf counter: {}", err))
.ok();
if let Some(counter) = &mut counter { if let Some(counter) = &mut counter {
let _ = counter.enable(); if let Err(err) = counter.enable() {
eprintln!("Failed to start perf counter: {}", err)
}
} }
counter counter
}; };
@ -47,7 +52,9 @@ impl StopWatch {
let time = self.time.elapsed(); let time = self.time.elapsed();
#[cfg(target_os = "linux")] #[cfg(target_os = "linux")]
let instructions = self.counter.as_mut().and_then(|it| it.read().ok()); let instructions = self.counter.as_mut().and_then(|it| {
it.read().map_err(|err| eprintln!("Failed to read perf counter: {}", err)).ok()
});
#[cfg(not(target_os = "linux"))] #[cfg(not(target_os = "linux"))]
let instructions = None; let instructions = None;