feat(memory): android & linux support (#4)

* memory: andorid & linux support

* Fix memory info on android&linux

* Fix ios compilation

---------

Co-authored-by: zhangli.pear <[email protected]>
Co-authored-by: heymind <[email protected]>
Co-authored-by: Liu Dingming <[email protected]>

Author: 4 people

Cargo.toml

@@ -14,9 +14,7 @@ keywords = ["perf", "statistics", "monitor", "performance"]
 
 
 [features]
-alloc_hook_prof = ["alloc_hook"]
-alloc_hook_switchable = ["alloc_hook"]
-alloc_hook = []
+allocation_counter = []
 darwin_private = []
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

src/fd/android_linux.rs

@@ -14,26 +14,30 @@ mod test {
 
     #[test]
     fn test_fd_count() {
-        let mut buf = vec![];
+        #[cfg(target_os = "linux")]
+        const TEMP_DIR: &str = "/tmp";
+        #[cfg(target_os = "android")]
+        const TEMP_DIR: &str = "/data/local/tmp";
+
         const NUM: usize = 100;
 
         // open some files and do not close them.
-        for i in 0..NUM {
-            let fname = format!("/tmp/tmpfile{}", i);
-            let file = std::fs::OpenOptions::new()
-                .write(true)
-                .create(true)
-                .open(fname);
-            buf.push(file);
-        }
+        let fds: Vec<_> = (0..NUM)
+            .map(|i| {
+                let fname = format!("{}/tmpfile{}", TEMP_DIR, i);
+                std::fs::File::create(fname).unwrap()
+            })
+            .collect();
         let count = fd_count_cur().unwrap();
 
-        assert!(NUM + 3 <= count);
+        dbg!(count);
+        assert!(count >= NUM);
+        let old_count = count;
 
-        // close files
-        while let Some(_) = buf.pop() {}
+        drop(fds);
         let count = fd_count_cur().unwrap();
-        assert!(3 <= count);
-        assert!(NUM > count);
+        // Though tests are run in multi-thread mode without using nextest, we
+        // assume NUM is big enough to make fd count lower in a short period.
+        assert!(count < old_count);
     }
 }

src/mem/mod.rs

@@ -13,9 +13,7 @@ mod allocation_counter;
 
 pub use allocation_counter::CountingAllocator;
 
-#[cfg(any(target_os = "macos", target_os = "windows"))]
 mod process_memory_info;
-#[cfg(any(target_os = "macos", target_os = "windows"))]
 pub use process_memory_info::{get_process_memory_info, ProcessMemoryInfo};
 
 #[cfg(target_os = "macos")]

src/mem/process_memory_info.rs

@@ -9,6 +9,8 @@ pub struct ProcessMemoryInfo {
     /// On Windows this is an alias for wset field and it matches "Mem Usage"
     /// column of taskmgr.exe.
     pub resident_set_size: u64,
+    #[cfg(not(any(target_os = "android", target_os = "linux")))]
+    #[cfg_attr(doc, doc(cfg(not(linux))))]
     pub resident_set_size_peak: u64,
 
     /// this is the total amount of virtual memory used by the process.
@@ -33,10 +35,12 @@ pub struct ProcessMemoryInfo {
     ///    + page_table
     ///
     /// details: <https://github.com/apple/darwin-xnu/blob/master/osfmk/kern/task.c>
-    #[cfg(target_os = "macos")]
+    #[cfg(any(target_os = "macos", target_os = "ios"))]
+    #[cfg_attr(doc, doc(macos))]
     pub phys_footprint: u64,
 
-    #[cfg(target_os = "macos")]
+    #[cfg(any(target_os = "macos", target_os = "ios"))]
+    #[cfg_attr(doc, doc(macos))]
     pub compressed: u64,
 }
 
@@ -68,7 +72,24 @@ fn get_process_memory_info_impl() -> Result<ProcessMemoryInfo> {
     })
 }
 
-#[cfg(target_os = "macos")]
+#[cfg(any(target_os = "linux", target_os = "android"))]
+fn get_process_memory_info_impl() -> Result<ProcessMemoryInfo> {
+    // https://www.kernel.org/doc/Documentation/filesystems/proc.txt
+    let statm = std::fs::read_to_string("/proc/self/statm")?;
+    let mut parts = statm.split(' ');
+    let Some(virtual_memory_size) = parts.next().and_then(|s| s.parse().ok()) else {
+        return Err(Error::new(std::io::ErrorKind::Other, "Invalid VmSize in /proc/self/statm"));
+    };
+    let Some(resident_set_size) = parts.next().and_then(|s| s.parse().ok()) else {
+        return Err(Error::new(std::io::ErrorKind::Other, "Invalid VmRSS in /proc/self/statm"));
+    };
+    Ok(ProcessMemoryInfo {
+        virtual_memory_size,
+        resident_set_size,
+    })
+}
+
+#[cfg(any(target_os = "macos", target_os = "ios"))]
 fn get_process_memory_info_impl() -> Result<ProcessMemoryInfo> {
     use crate::bindings::task_vm_info;
     use mach::{