Skip to content

armgit / ente

Public Imported from GitHub
0

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

Remove parking_lot from Ensu

Manav Rathice23b61a11b8
diff --git a/rust/Cargo.lock b/rust/Cargo.lock
index 573ecbeea2..9ae6aca003 100644
--- a/rust/Cargo.lock
+++ b/rust/Cargo.lock
@@ -2381,7 +2381,6 @@ dependencies = [
"memmap2",
"ort",
"ort-sys",
- "parking_lot",
"regex",
"rubato",
"rusqlite",
diff --git a/rust/crates/ensu/Cargo.toml b/rust/crates/ensu/Cargo.toml
index d5899bff0c..23dda9264a 100644
--- a/rust/crates/ensu/Cargo.toml
+++ b/rust/crates/ensu/Cargo.toml
@@ -7,7 +7,6 @@ ente-core.workspace = true
ente-image.workspace = true
ente-model-download.workspace = true
memmap2 = "0.9.9"
-parking_lot = "0.12"
regex = { version = "1", optional = true }
rubato = { version = "0.16", optional = true }
rusqlite = { version = "0.38", features = ["bundled"], optional = true }
diff --git a/rust/crates/ensu/src/llm/context.rs b/rust/crates/ensu/src/llm/context.rs
index fdf3707573..eaace22f11 100644
--- a/rust/crates/ensu/src/llm/context.rs
+++ b/rust/crates/ensu/src/llm/context.rs
@@ -3,16 +3,15 @@ use llama_cpp_2::context::params::{LlamaContextParams, LlamaPoolingType};
use llama_cpp_2::model::LlamaModel;
use llama_cpp_2::mtmd::{MtmdContext, MtmdContextParams, mtmd_default_marker};
use llama_cpp_2::token::LlamaToken;
-use parking_lot::Mutex;
use self_cell::self_cell;
use serde::{Deserialize, Serialize};
use std::ffi::CString;
use std::num::NonZeroU32;
use std::path::Path;
-use std::sync::Arc;
+use std::sync::{Arc, Mutex};
use super::model::ModelRef;
-use super::{Error, backend, format_error};
+use super::{Error, backend, format_error, lock};
#[derive(Debug, Clone, Serialize, Deserialize)]
pub struct ContextParams {
@@ -91,7 +90,7 @@ impl Context {
&self,
func: impl for<'a, 'b> FnOnce(&'b mut LlamaContext<'a>, &'b mut Vec<LlamaToken>) -> R,
) -> R {
- let mut state = self.state.lock();
+ let mut state = lock(&self.state);
let ContextState {
cell,
cached_tokens,
@@ -117,7 +116,7 @@ impl Context {
}
let (key, params) = mtmd_cache_key_and_params(mmproj_path, marker)?;
- let mut guard = self.mtmd_context.lock();
+ let mut guard = lock(&self.mtmd_context);
if let Some(cached) = guard.as_ref()
&& cached.key == key
@@ -146,7 +145,7 @@ impl Context {
}
pub(super) fn invalidate_cache(&self) {
- self.state.lock().cached_tokens.clear();
+ lock(&self.state).cached_tokens.clear();
}
}
diff --git a/rust/crates/ensu/src/llm/generate.rs b/rust/crates/ensu/src/llm/generate.rs
index 48388812e4..63ebcdafa0 100644
--- a/rust/crates/ensu/src/llm/generate.rs
+++ b/rust/crates/ensu/src/llm/generate.rs
@@ -6,18 +6,17 @@ use llama_cpp_2::mtmd::{MtmdBitmap, MtmdInputText, mtmd_default_marker};
use llama_cpp_2::openai::OpenAIChatTemplateParams;
use llama_cpp_2::sampling::LlamaSampler;
use llama_cpp_2::token::LlamaToken;
-use parking_lot::Mutex;
use serde::{Deserialize, Serialize};
use std::collections::HashMap;
use std::panic::{AssertUnwindSafe, catch_unwind};
use std::path::Path;
use std::sync::atomic::{AtomicBool, AtomicI64, Ordering};
-use std::sync::{Arc, OnceLock};
+use std::sync::{Arc, Mutex, OnceLock};
use std::time::Instant;
use super::context::Context;
use super::event::{EventSink, GenerationEvent, GenerationSummary, JobId};
-use super::{Error, format_error};
+use super::{Error, format_error, lock};
static JOB_COUNTER: AtomicI64 = AtomicI64::new(1);
static CANCEL_FLAGS: OnceLock<Mutex<HashMap<JobId, Arc<AtomicBool>>>> = OnceLock::new();
@@ -31,12 +30,12 @@ fn cancel_flags() -> &'static Mutex<HashMap<JobId, Arc<AtomicBool>>> {
fn register_job() -> (JobId, Arc<AtomicBool>) {
let job_id = JOB_COUNTER.fetch_add(1, Ordering::Relaxed);
let flag = Arc::new(AtomicBool::new(false));
- cancel_flags().lock().insert(job_id, flag.clone());
+ lock(cancel_flags()).insert(job_id, flag.clone());
(job_id, flag)
}
fn cancel_all() {
- for flag in cancel_flags().lock().values() {
+ for flag in lock(cancel_flags()).values() {
flag.store(true, Ordering::Relaxed);
}
}
@@ -53,7 +52,7 @@ struct JobGuard(JobId);
impl Drop for JobGuard {
fn drop(&mut self) {
- cancel_flags().lock().remove(&self.0);
+ lock(cancel_flags()).remove(&self.0);
}
}
@@ -808,7 +807,7 @@ pub fn cancel(job_id: JobId) {
cancel_all();
return;
}
- if let Some(flag) = cancel_flags().lock().get(&job_id) {
+ if let Some(flag) = lock(cancel_flags()).get(&job_id) {
flag.store(true, Ordering::Relaxed);
}
}
diff --git a/rust/crates/ensu/src/llm/mod.rs b/rust/crates/ensu/src/llm/mod.rs
index d1de5f4042..cc33d652c6 100644
--- a/rust/crates/ensu/src/llm/mod.rs
+++ b/rust/crates/ensu/src/llm/mod.rs
@@ -10,7 +10,7 @@ pub use generate::*;
pub use model::*;
use llama_cpp_2::llama_backend::LlamaBackend;
-use std::sync::OnceLock;
+use std::sync::{Mutex, MutexGuard, OnceLock, PoisonError};
#[derive(Debug, thiserror::Error)]
pub enum Error {
@@ -32,6 +32,10 @@ pub enum Error {
static BACKEND: OnceLock<Result<LlamaBackend, String>> = OnceLock::new();
+fn lock<T>(mutex: &Mutex<T>) -> MutexGuard<'_, T> {
+ mutex.lock().unwrap_or_else(PoisonError::into_inner)
+}
+
fn backend() -> Result<&'static LlamaBackend, Error> {
match BACKEND.get_or_init(|| LlamaBackend::init().map_err(|err| err.to_string())) {
Ok(backend) => Ok(backend),