magmaus3/continuwuity
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

move mutex maps out of globals into respective service

Browse source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk 2024-07-09 21:10:14 +00:00
parent 2d251eb19c
commit 271f720286
23 changed files with 93 additions and 121 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/service/rooms/state/data.rs
View file

@ -4,7 +4,7 @@ use conduit::{utils, Error, Result};
use database::{Database, Map};
use ruma::{EventId, OwnedEventId, RoomId};
use crate::globals::RoomMutexGuard;
use super::RoomMutexGuard;
pub(super) struct Data {
shorteventid_shortstatehash: Arc<Map>,

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

@ -5,7 +5,10 @@ use std::{
sync::Arc,
};
use conduit::{utils::calculate_hash, warn, Error, Result};
use conduit::{
utils::{calculate_hash, MutexMap, MutexMapGuard},
warn, Error, Result,
};
use data::Data;
use ruma::{
api::client::error::ErrorKind,
@ -15,20 +18,25 @@ use ruma::{
},
serde::Raw,
state_res::{self, StateMap},
EventId, OwnedEventId, RoomId, RoomVersionId, UserId,
EventId, OwnedEventId, OwnedRoomId, RoomId, RoomVersionId, UserId,
};
use super::state_compressor::CompressedStateEvent;
use crate::{globals::RoomMutexGuard, services, PduEvent};
use crate::{services, PduEvent};
pub struct Service {
db: Data,
pub mutex: RoomMutexMap,
}
type RoomMutexMap = MutexMap<OwnedRoomId, ()>;
pub type RoomMutexGuard = MutexMapGuard<OwnedRoomId, ()>;
impl crate::Service for Service {
fn build(args: crate::Args<'_>) -> Result<Arc<Self>> {
Ok(Arc::new(Self {
db: Data::new(args.db),
mutex: RoomMutexMap::new(),
}))
}