Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 05:00:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Use mallinfo only on target_env=gnu (#32772)

Browse source 
mallinfo isn't available on musl, causing linking issues on build;
make sure related functions are built only for GNU Libc

Signed-off-by: Patrycja Rosa <git@ptrcnull.me>
This commit is contained in:
Patrycja 2024-07-14 09:20:52 +02:00 • committed by GitHub
parent cd394af018
commit 3118542a9e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/profile/mem.rs
View file

@ -394,7 +394,7 @@ mod system_reporter {
#[cfg(not(any(target_os = "windows", target_env = "ohos")))] #[cfg(not(any(target_os = "windows", target_env = "ohos")))]
use std::ptr::null_mut; use std::ptr::null_mut;
#[cfg(target_os = "linux")] #[cfg(all(target_os = "linux", target_env = "gnu"))]
use libc::c_int; use libc::c_int;
#[cfg(not(any(target_os = "windows", target_env = "ohos")))] #[cfg(not(any(target_os = "windows", target_env = "ohos")))]
use libc::{c_void, size_t}; use libc::{c_void, size_t};
@ -455,12 +455,12 @@ mod system_reporter {
request.reports_channel.send(reports); request.reports_channel.send(reports);
} }
#[cfg(target_os = "linux")] #[cfg(all(target_os = "linux", target_env = "gnu"))]
extern "C" { extern "C" {
fn mallinfo() -> struct_mallinfo; fn mallinfo() -> struct_mallinfo;
} }
#[cfg(target_os = "linux")] #[cfg(all(target_os = "linux", target_env = "gnu"))]
#[repr(C)] #[repr(C)]
pub struct struct_mallinfo { pub struct struct_mallinfo {
arena: c_int, arena: c_int,
@ -475,7 +475,7 @@ mod system_reporter {
keepcost: c_int, keepcost: c_int,
} }
#[cfg(target_os = "linux")] #[cfg(all(target_os = "linux", target_env = "gnu"))]
fn system_heap_allocated() -> Option<usize> { fn system_heap_allocated() -> Option<usize> {
let info: struct_mallinfo = unsafe { mallinfo() }; let info: struct_mallinfo = unsafe { mallinfo() };
@ -494,7 +494,7 @@ mod system_reporter {
} }
} }
#[cfg(not(target_os = "linux"))] #[cfg(not(all(target_os = "linux", target_env = "gnu")))]
fn system_heap_allocated() -> Option<usize> { fn system_heap_allocated() -> Option<usize> {
None None
} }