Skip to content

Bump perf-event from 0.4.7. to 0.4.8 #21502

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

Open
robertoaloi wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Bump perf-event from 0.4.7. to 0.4.8 #21502

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions crates/profile/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ doctest = false
cfg-if = "1.0.1"
jemalloc-ctl = { version = "0.5.4", package = "tikv-jemalloc-ctl", optional = true }

[target.'cfg(all(target_os = "linux", not(target_env = "ohos")))'.dependencies]
perf-event = "=0.4.7"
[target.'cfg(all(target_os = "linux", not(target_env = "ohos"), any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")))'.dependencies]
perf-event = "=0.4.8"

[target.'cfg(all(target_os = "linux", target_env = "gnu"))'.dependencies]
libc.workspace = true
Expand Down
32 changes: 25 additions & 7 deletions crates/profile/src/stop_watch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,11 @@ use crate::MemoryUsage;

pub struct StopWatch {
time: Instant,
#[cfg(all(target_os = "linux", not(target_env = "ohos")))]
#[cfg(all(
target_os = "linux",
not(target_env = "ohos"),
any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")
))]
counter: Option<perf_event::Counter>,
memory: MemoryUsage,
}
Expand All @@ -24,7 +28,11 @@ pub struct StopWatchSpan {

impl StopWatch {
pub fn start() -> StopWatch {
#[cfg(all(target_os = "linux", not(target_env = "ohos")))]
#[cfg(all(
target_os = "linux",
not(target_env = "ohos"),
any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")
))]
let counter = {
// When debugging rust-analyzer using rr, the perf-related syscalls cause it to abort.
// We allow disabling perf by setting the env var `RA_DISABLE_PERF`.
Expand All @@ -51,7 +59,11 @@ impl StopWatch {
let time = Instant::now();
StopWatch {
time,
#[cfg(all(target_os = "linux", not(target_env = "ohos")))]
#[cfg(all(
target_os = "linux",
not(target_env = "ohos"),
any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")
))]
counter,
memory,
}
Expand All @@ -60,13 +72,19 @@ impl StopWatch {
pub fn elapsed(&mut self) -> StopWatchSpan {
let time = self.time.elapsed();

#[cfg(all(target_os = "linux", not(target_env = "ohos")))]
#[cfg(all(
target_os = "linux",
not(target_env = "ohos"),
any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")
))]
let instructions = self.counter.as_mut().and_then(|it| {
it.read().map_err(|err| eprintln!("Failed to read perf counter: {err}")).ok()
});
#[cfg(all(target_os = "linux", target_env = "ohos"))]
let instructions = None;
#[cfg(not(target_os = "linux"))]
#[cfg(not(all(
target_os = "linux",
not(target_env = "ohos"),
any(target_arch = "x86", target_arch = "x86_64", target_arch = "aarch64")
)))]
let instructions = None;

let memory = MemoryUsage::now() - self.memory;
Expand Down