Skip to content

Fix jemalloc-ctl compilation errors: enable stats feature and fix error handling #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Itsusinn merged 3 commits into from
Feb 1, 2026
Merged

Fix jemalloc-ctl compilation errors: enable stats feature and fix error handling #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
851a705
Initial plan
Copilot Feb 1, 2026
ac56f96
Fix jemalloc-ctl stats feature and error handling
Copilot Feb 1, 2026
cf129d4
Use Display formatting for better error messages
Copilot Feb 1, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion uniffi/clash-android-ffi/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +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" }
jemalloc-ctl = { package = "tikv-jemalloc-ctl", optional = true, version = "0.6.1", features = ["stats"] }
rustls-platform-verifier = "0.6.2" # sync with gradle/libs.versions.toml

[dependencies.clash-lib]
Expand Down
7 changes: 4 additions & 3 deletions uniffi/clash-android-ffi/src/controller.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,15 +206,16 @@ impl ClashController {
{
use jemalloc_ctl::{epoch, stats};
// Advance the epoch to update statistics
epoch::advance().wrap_err("Failed to advance jemalloc epoch")?;
epoch::advance()
.map_err(|e| eyre::eyre!("Failed to advance jemalloc epoch: {}", e))?;

// Read allocated memory in bytes
let allocated = stats::allocated::read()
.wrap_err("Failed to read allocated memory")?;
.map_err(|e| eyre::eyre!("Failed to read allocated memory: {}", e))?;

// Read resident memory in bytes
let resident = stats::resident::read()
.wrap_err("Failed to read resident memory")?;
.map_err(|e| eyre::eyre!("Failed to read resident memory: {}", e))?;

Ok(MemoryResponse {
inuse: allocated as i64,
Expand Down
Loading