Skip to content
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

Jump to bottom

memory-store: release locks earlier to avoid deadlocks #3668

Merged
merged 1 commit into from
Jul 9, 2024
Merged

memory-store: release locks earlier to avoid deadlocks #3668

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
33 changes: 15 additions & 18 deletions crates/matrix-sdk-base/src/store/memory_store.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,21 +579,18 @@ impl StateStore for MemoryStore {
Some(state_events.values().cloned().map(to_enum).collect())
}

Ok(get_events(
&self.stripped_room_state.read().unwrap(),
room_id,
&event_type,
RawAnySyncOrStrippedState::Stripped,
)
.or_else(|| {
get_events(
&self.room_state.read().unwrap(),
room_id,
&event_type,
RawAnySyncOrStrippedState::Sync,
)
})
.unwrap_or_default())
let state_map = self.stripped_room_state.read().unwrap();
Ok(get_events(&state_map, room_id, &event_type, RawAnySyncOrStrippedState::Stripped)
.or_else(|| {
drop(state_map); // release the lock on stripped_room_state
get_events(
&self.room_state.read().unwrap(),
room_id,
&event_type,
RawAnySyncOrStrippedState::Sync,
)
})
.unwrap_or_default())
}

async fn get_state_events_for_keys(
Expand Down Expand Up @@ -702,12 +699,12 @@ impl StateStore for MemoryStore {
})
.unwrap_or_default()
}
trace!("getting stripped_members lock");
let v = get_user_ids_inner(&self.stripped_members.read().unwrap(), room_id, memberships);
let state_map = self.stripped_members.read().unwrap();
let v = get_user_ids_inner(&state_map, room_id, memberships);
if !v.is_empty() {
return Ok(v);
}
trace!("getting members lock");
drop(state_map); // release the stripped_members lock
Ok(get_user_ids_inner(&self.members.read().unwrap(), room_id, memberships))
}

Expand Down
Loading