gaspersic/solana
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Apple M1 compatibility (#16346)

Browse Source 
Co-authored-by: Christian Drappi <christiandrappi@Christians-MacBook-Pro.local>
This commit is contained in:
Christian Drappi
2021-04-09 20:21:01 -04:00
committed by GitHub
parent 8bc0bdd40b
commit 54a04bac3d
15 changed files with 47 additions and 269 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
measure/src/lib.rs
View File

@@ -1,11 +1,2 @@
#![allow(clippy::integer_arithmetic)]
pub mod measure;
pub mod thread_mem_usage;
#[cfg(unix)]
extern crate jemallocator;
#[cfg(not(feature = "no-jemalloc"))]
#[cfg(unix)]
#[global_allocator]
static ALLOC: jemallocator::Jemalloc = jemallocator::Jemalloc;

50
measure/src/thread_mem_usage.rs
View File

@@ -1,50 +0,0 @@
#[cfg(not(feature = "no-jemalloc"))]
#[cfg(unix)]
use jemalloc_ctl::thread;
pub fn datapoint(_name: &'static str) {
#[cfg(not(feature = "no-jemalloc"))]
#[cfg(unix)]
{
let allocated = thread::allocatedp::mib().unwrap();
let allocated = allocated.read().unwrap();
let mem = allocated.get();
solana_metrics::datapoint_debug!("thread-memory", (_name, mem as i64, i64));
}
}
pub struct Allocatedp {
#[cfg(not(feature = "no-jemalloc"))]
#[cfg(unix)]
allocated: thread::ThreadLocal<u64>,
}
impl Allocatedp {
pub fn default() -> Self {
#[cfg(not(feature = "no-jemalloc"))]
#[cfg(unix)]
{
let allocated = thread::allocatedp::mib().unwrap();
let allocated = allocated.read().unwrap();
Self { allocated }
}
#[cfg(any(feature = "no-jemalloc", not(unix)))]
Self {}
}
/// Return current thread heap usage
pub fn get(&self) -> u64 {
#[cfg(not(feature = "no-jemalloc"))]
#[cfg(unix)]
{
self.allocated.get()
}
#[cfg(any(feature = "no-jemalloc", not(unix)))]
0
}
/// Return the difference in thread heap usage since a previous `get()`
pub fn since(&self, previous: u64) -> i64 {
self.get() as i64 - previous as i64
}
}