Skip to content

armgit / ente

Public Imported from GitHub
0

πŸ’š End-to-end encrypted cloud for everything.

Release unused Android heap pages after LLM teardown

laurenspriemb2e10a5bc7c6
diff --git a/rust/apps/ensu/src-tauri/src/main.rs b/rust/apps/ensu/src-tauri/src/main.rs
index 9c4878819e..49f32afcc0 100644
--- a/rust/apps/ensu/src-tauri/src/main.rs
+++ b/rust/apps/ensu/src-tauri/src/main.rs
@@ -4,6 +4,7 @@ use tauri::{Manager, RunEvent, async_runtime};
mod commands;
mod logging;
+#[path = "../../../../crates/ensu/src/platform.rs"]
mod platform;
#[cfg(any(windows, target_os = "linux"))]
mod single_instance;
diff --git a/rust/checks/lint-exceptions/suppressions.json b/rust/checks/lint-exceptions/suppressions.json
index fd3b617f69..e9bbdb9e9a 100644
--- a/rust/checks/lint-exceptions/suppressions.json
+++ b/rust/checks/lint-exceptions/suppressions.json
@@ -4,8 +4,6 @@
],
"rust/apps/cli/src/sync/download.rs": ["clippy::expect_used"],
"rust/apps/cli/tests/sync.rs": ["dead_code"],
- "rust/apps/ensu/src-tauri/src/commands/notes/source.rs": ["unsafe_code"],
- "rust/apps/ensu/src-tauri/src/commands/system.rs": ["unsafe_code"],
"rust/apps/ensu/src-tauri/src/logging.rs": ["clippy::expect_used"],
"rust/bindings/frb/locker/src/lib.rs": [
"clippy::allow_attributes",
@@ -33,10 +31,9 @@
"rust/crates/ensu/src/config.rs": ["clippy::expect_used"],
"rust/crates/ensu/src/config/knowledge.rs": ["clippy::expect_used"],
"rust/crates/ensu/src/conversation/lookup.rs": ["clippy::expect_used"],
- "rust/crates/ensu/src/llm/context.rs": ["unsafe_code"],
"rust/crates/ensu/src/llm/generate.rs": ["clippy::expect_used"],
"rust/crates/ensu/src/model/mod.rs": ["clippy::expect_used"],
- "rust/crates/ensu/src/retrieval/index.rs": ["unsafe_code"],
+ "rust/crates/ensu/src/platform.rs": ["unsafe_code"],
"rust/crates/ensu/src/transcription/text.rs": ["clippy::expect_used"],
"rust/crates/exif/src/isobmff.rs": ["clippy::expect_used"],
"rust/crates/image/src/color_management.rs": ["clippy::expect_used"],
diff --git a/rust/crates/ensu/src/lib.rs b/rust/crates/ensu/src/lib.rs
index ad8e4cc6f0..9cfb5e7919 100644
--- a/rust/crates/ensu/src/lib.rs
+++ b/rust/crates/ensu/src/lib.rs
@@ -7,5 +7,8 @@ pub mod model;
pub mod notes;
pub mod retrieval;
+#[cfg(target_os = "android")]
+mod platform;
+
#[cfg(feature = "transcription")]
pub mod transcription;
diff --git a/rust/crates/ensu/src/llm/worker.rs b/rust/crates/ensu/src/llm/worker.rs
index 5f6cc03396..920e60d706 100644
--- a/rust/crates/ensu/src/llm/worker.rs
+++ b/rust/crates/ensu/src/llm/worker.rs
@@ -79,6 +79,8 @@ impl<T> Drop for Worker<T> {
self.sender.take();
if let Some(thread) = self.thread.take() {
let _ = thread.join();
+ #[cfg(target_os = "android")]
+ crate::platform::release_unused_memory();
}
}
}
diff --git a/rust/apps/ensu/src-tauri/src/platform.rs b/rust/crates/ensu/src/platform.rs
similarity index 66%
rename from rust/apps/ensu/src-tauri/src/platform.rs
rename to rust/crates/ensu/src/platform.rs
index 4f89110096..a2320fbe69 100644
--- a/rust/apps/ensu/src-tauri/src/platform.rs
+++ b/rust/crates/ensu/src/platform.rs
@@ -1,4 +1,4 @@
-#[cfg(unix)]
+#[cfg(all(unix, not(target_os = "android")))]
#[expect(
unsafe_code,
reason = "sysconf reads process-independent constants without caller-owned pointers"
@@ -68,3 +68,38 @@ pub(crate) fn final_handle_path(file: &std::fs::File) -> std::io::Result<std::pa
&buffer[..written as usize],
)))
}
+
+#[cfg(target_os = "android")]
+#[expect(
+ unsafe_code,
+ reason = "The optional libc mallopt symbol is called with its C signature while its library handle is live; M_PURGE releases only unused allocations"
+)]
+pub(crate) fn release_unused_memory() {
+ use std::ffi::{c_char, c_int, c_void};
+
+ #[link(name = "dl")]
+ unsafe extern "C" {
+ fn dlopen(filename: *const c_char, flags: c_int) -> *mut c_void;
+ fn dlsym(handle: *mut c_void, symbol: *const c_char) -> *mut c_void;
+ fn dlclose(handle: *mut c_void) -> c_int;
+ }
+
+ #[cfg(target_pointer_width = "64")]
+ const RTLD_NOW: c_int = 2;
+ #[cfg(target_pointer_width = "32")]
+ const RTLD_NOW: c_int = 0;
+ const M_PURGE: c_int = -101;
+
+ let handle = unsafe { dlopen(c"libc.so".as_ptr(), RTLD_NOW) };
+ if handle.is_null() {
+ return;
+ }
+ let symbol = unsafe { dlsym(handle, c"mallopt".as_ptr()) };
+ if !symbol.is_null() {
+ let mallopt = unsafe {
+ std::mem::transmute::<*mut c_void, unsafe extern "C" fn(c_int, c_int) -> c_int>(symbol)
+ };
+ unsafe { mallopt(M_PURGE, 0) };
+ }
+ unsafe { dlclose(handle) };
+}