Skip to content

[WIP] Experimental FD lock support #2813

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

Closed
neekolas wants to merge 1 commit into from
Closed

[WIP] Experimental FD lock support #2813

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
387 changes: 0 additions & 387 deletions 2025-11-19 17:05:08.json
View file
Open in desktop

This file was deleted.

24 changes: 18 additions & 6 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions xmtp_mls/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,6 +135,7 @@ tokio = { workspace = true, features = [
] }
chrono = { workspace = true, features = ["clock"] }
dyn-clone.workspace = true
fd-lock = "4.0"
openmls.workspace = true

[target.'cfg(all(target_family = "wasm", target_os = "unknown"))'.dependencies]
Expand Down
11 changes: 10 additions & 1 deletion xmtp_mls/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,15 @@ impl<ApiClient, S, Db> ClientBuilder<ApiClient, S, Db> {
let (worker_tx, _) = broadcast::channel(32);
let (events, _) = broadcast::channel(32);
let mut workers = WorkerRunner::new();

// Create the commit lock with db_path and installation_id
let db_path = match store.opts() {
xmtp_db::StorageOption::Persistent(path) => std::path::PathBuf::from(path),
xmtp_db::StorageOption::Ephemeral => std::env::temp_dir().join("xmtp_ephemeral"),
};
let installation_id = hex::encode(identity.installation_keys.public_bytes());
let mls_commit_lock = Arc::new(GroupCommitLock::new(db_path, &installation_id));

let context = Arc::new(XmtpMlsLocalContext {
identity,
mls_storage,
Expand All @@ -302,7 +311,7 @@ impl<ApiClient, S, Db> ClientBuilder<ApiClient, S, Db> {
version_info,
scw_verifier: Arc::new(scw_verifier),
mutexes: MutexRegistry::new(),
mls_commit_lock: Arc::new(GroupCommitLock::new()),
mls_commit_lock,
local_events: local_events.clone(),
worker_events: worker_tx.clone(),
events,
Expand Down
Loading
Loading