refactor: 使用 jemalloc-ctl 获取堆内存用

Author: Itsusinn

.gitignore

@@ -28,12 +28,12 @@ replay_pid*
 
 *.iml
 .gradle
-/local.properties
-/.idea/*
+.idea
 .DS_Store
-/build
+build
 /captures
 .externalNativeBuild
 .cxx
+
 local.properties
 signing.properties

.vscode/settings.json

@@ -1,8 +1,22 @@
 {
+    "rust-analyzer.linkedProjects": [
+        "uniffi/Cargo.toml"
+    ],
     "rust-analyzer.cargo.target": "aarch64-linux-android",
     "rust-analyzer.check.allTargets": false,
-    "rust-analyzer.checkOnSave.allTargets": false,
+    // use `cargo ndk-env --json` to generate the below environment variables
     "rust-analyzer.server.extraEnv": {
-        "CARGO_BUILD_TARGET": "aarch64-linux-android"
+        "CARGO_BUILD_TARGET": "aarch64-linux-android",
+        "AR_aarch64-linux-android": "C:\\Workspace\\AndroidSDK\\ndk\\29.0.14206865\\toolchains\\llvm\\prebuilt\\windows-x86_64\\bin\\llvm-ar",
+        "CARGO_NDK_SYSROOT_LIBS_PATH": "C:\\Workspace\\AndroidSDK\\ndk\\29.0.14206865\\toolchains\\llvm\\prebuilt\\windows-x86_64\\sysroot\\usr\\lib\\aarch64-linux-android",
+        "CARGO_NDK_SYSROOT_PATH": "C:\\Workspace\\AndroidSDK\\ndk\\29.0.14206865\\toolchains\\llvm\\prebuilt\\windows-x86_64\\sysroot",
+        "CARGO_NDK_SYSROOT_TARGET": "aarch64-linux-android",
+        "CARGO_TARGET_AARCH64_LINUX_ANDROID_AR": "C:\\Workspace\\AndroidSDK\\ndk\\29.0.14206865\\toolchains\\llvm\\prebuilt\\windows-x86_64\\bin\\llvm-ar",
+        "CARGO_TARGET_AARCH64_LINUX_ANDROID_LINKER": "\\\\?\\C:\\Users\\iHsin\\.cargo\\bin\\cargo-ndk",
+        "CC_aarch64-linux-android": "C:\\Workspace\\AndroidSDK\\ndk\\29.0.14206865\\toolchains\\llvm\\prebuilt\\windows-x86_64\\bin\\clang",
+        "CFLAGS_aarch64-linux-android": "--target=aarch64-linux-android21 --target=aarch64-linux-android21",
+        "CXXFLAGS_aarch64-linux-android": "--target=aarch64-linux-android21 --target=aarch64-linux-android21",
+        "CXX_aarch64-linux-android": "C:\\Workspace\\AndroidSDK\\ndk\\29.0.14206865\\toolchains\\llvm\\prebuilt\\windows-x86_64\\bin\\clang++",
+        "RANLIB_aarch64-linux-android": "C:\\Workspace\\AndroidSDK\\ndk\\29.0.14206865\\toolchains\\llvm\\prebuilt\\windows-x86_64\\bin\\llvm-ranlib"
     }
-}
+}

uniffi/.vscode/settings.json

@@ -9,8 +9,9 @@ edition.workspace = true
 crate-type = ["cdylib"]
 
 [features]
+default = []
 ffi-trace = ["uniffi/ffi-trace"]
-jemallocator = ["dep:tikv-jemallocator"]
+jemallocator = ["dep:tikv-jemallocator", "dep:jemalloc-ctl"]
 
 [dependencies]
 uniffi.workspace = true
@@ -48,6 +49,7 @@ reqwest = { version = "0.13", default-features = false, features = ["rustls", "s
 tokio-stream = "0.1"
 # Memory allocator
 tikv-jemallocator = { version = "0.6", optional = true }
+jemalloc-ctl = { package = "tikv-jemalloc-ctl", optional = true, version = "0.6.1" }
 rustls-platform-verifier = "0.6.2" # sync with gradle/libs.versions.toml
 
 [dependencies.clash-lib]

uniffi/Cargo.lock

@@ -202,7 +202,30 @@ impl ClashController {
 
     /// Get memory statistics
     pub async fn get_memory(&self) -> Result<MemoryResponse, EyreError> {
-        self.request("GET", "/memory", None).await
+        #[cfg(feature = "jemallocator")]
+        {
+            use jemalloc_ctl::{epoch, stats};
+            // Advance the epoch to update statistics
+            epoch::advance().context("Failed to advance jemalloc epoch")?;
+            
+            // Read allocated memory in bytes
+            let allocated = stats::allocated::read()
+                .context("Failed to read allocated memory")?;
+            
+            // Read resident memory in bytes
+            let resident = stats::resident::read()
+                .context("Failed to read resident memory")?;
+            
+            Ok(MemoryResponse {
+                inuse: allocated as i64,
+                oslimit: resident as i64,
+            })
+        }
+        
+        #[cfg(not(feature = "jemallocator"))]
+        {
+            self.request("GET", "/memory", None).await
+        }
     }
 
     /// Get active connections