git-mirrors/continuwuity
1
0
Fork 0
mirror of https://forgejo.ellis.link/continuwuation/continuwuity.git synced 2025-09-12 01:53:02 +02:00
Code Issues Projects Releases Packages Wiki Activity

cleanup on drop for utils::mutex_map.

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-09 20:04:43 +00:00
commit 2d251eb19c
10 changed files with 131 additions and 54 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/service/rooms/state/mod.rs
View file

@ -5,10 +5,7 @@ use std::{
sync::Arc,
};
use conduit::{
utils::{calculate_hash, mutex_map},
warn, Error, Result,
};
use conduit::{utils::calculate_hash, warn, Error, Result};
use data::Data;
use ruma::{
api::client::error::ErrorKind,
@ -22,7 +19,7 @@ use ruma::{
};
use super::state_compressor::CompressedStateEvent;
use crate::{services, PduEvent};
use crate::{globals::RoomMutexGuard, services, PduEvent};
pub struct Service {
db: Data,
@ -46,7 +43,7 @@ impl Service {
shortstatehash: u64,
statediffnew: Arc<HashSet<CompressedStateEvent>>,
_statediffremoved: Arc<HashSet<CompressedStateEvent>>,
state_lock: &mutex_map::Guard<()>, // Take mutex guard to make sure users get the room state mutex
state_lock: &RoomMutexGuard, // Take mutex guard to make sure users get the room state mutex
) -> Result<()> {
for event_id in statediffnew.iter().filter_map(|new| {
services()
@ -318,7 +315,7 @@ impl Service {
&self,
room_id: &RoomId,
shortstatehash: u64,
mutex_lock: &mutex_map::Guard<()>, // Take mutex guard to make sure users get the room state mutex
mutex_lock: &RoomMutexGuard, // Take mutex guard to make sure users get the room state mutex
) -> Result<()> {
self.db.set_room_state(room_id, shortstatehash, mutex_lock)
}
@ -358,7 +355,7 @@ impl Service {
&self,
room_id: &RoomId,
event_ids: Vec<OwnedEventId>,
state_lock: &mutex_map::Guard<()>, // Take mutex guard to make sure users get the room state mutex
state_lock: &RoomMutexGuard, // Take mutex guard to make sure users get the room state mutex
) -> Result<()> {
self.db
.set_forward_extremities(room_id, event_ids, state_lock)