itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-10-01 11:31:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19239 from LuuuXXX/add-support-for-ohos

Browse Source 
Cofigurate out ohos target to avoid compilation crashes
This commit is contained in:
Laurențiu Nicola 2025-02-27 10:19:23 +00:00 committed by GitHub
commit d69e2e7297
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crates/profile/Cargo.toml
View File

@ -17,7 +17,7 @@ cfg-if = "1.0.0"
libc.workspace = true libc.workspace = true
jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true } jemalloc-ctl = { version = "0.5.0", package = "tikv-jemalloc-ctl", optional = true }
[target.'cfg(target_os = "linux")'.dependencies] [target.'cfg(all(target_os = "linux", not(target_env = "ohos")))'.dependencies]
perf-event = "=0.4.7" perf-event = "=0.4.7"
[target.'cfg(windows)'.dependencies] [target.'cfg(windows)'.dependencies]

10
crates/profile/src/stop_watch.rs
View File

@ -11,7 +11,7 @@ use crate::MemoryUsage;
pub struct StopWatch { pub struct StopWatch {
time: Instant, time: Instant,
#[cfg(target_os = "linux")] #[cfg(all(target_os = "linux", not(target_env = "ohos")))]
counter: Option<perf_event::Counter>, counter: Option<perf_event::Counter>,
memory: MemoryUsage, memory: MemoryUsage,
} }
@ -24,7 +24,7 @@ pub struct StopWatchSpan {
impl StopWatch { impl StopWatch {
pub fn start() -> StopWatch { pub fn start() -> StopWatch {
#[cfg(target_os = "linux")] #[cfg(all(target_os = "linux", not(target_env = "ohos")))]
let counter = { let counter = {
// When debugging rust-analyzer using rr, the perf-related syscalls cause it to abort. // 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`. // We allow disabling perf by setting the env var `RA_DISABLE_PERF`.
@ -51,7 +51,7 @@ impl StopWatch {
let time = Instant::now(); let time = Instant::now();
StopWatch { StopWatch {
time, time,
#[cfg(target_os = "linux")] #[cfg(all(target_os = "linux", not(target_env = "ohos")))]
counter, counter,
memory, memory,
} }
@ -60,10 +60,12 @@ impl StopWatch {
pub fn elapsed(&mut self) -> StopWatchSpan { pub fn elapsed(&mut self) -> StopWatchSpan {
let time = self.time.elapsed(); let time = self.time.elapsed();
#[cfg(target_os = "linux")] #[cfg(all(target_os = "linux", not(target_env = "ohos")))]
let instructions = self.counter.as_mut().and_then(|it| { let instructions = self.counter.as_mut().and_then(|it| {
it.read().map_err(|err| eprintln!("Failed to read perf counter: {err}")).ok() 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(target_os = "linux"))]
let instructions = None; let instructions = None;