reduce roomid_mutex_insert

Signed-off-by: Jason Volk <jason@zemos.net>

src/service/globals/mod.rs

@@ -14,6 +14,7 @@ use std::{
 };
 
 use base64::{engine::general_purpose, Engine as _};
+use conduit::utils;
 use data::Data;
 use hickory_resolver::TokioAsyncResolver;
 use ipaddress::IPAddress;
@@ -33,6 +34,7 @@ use tokio::{
 };
 use tracing::{error, trace};
 use url::Url;
+use utils::MutexMap;
 
 use crate::{services, Config, Result};
 
@@ -52,7 +54,7 @@ pub struct Service {
 	pub bad_event_ratelimiter: Arc<RwLock<HashMap<OwnedEventId, RateLimitState>>>,
 	pub bad_signature_ratelimiter: Arc<RwLock<HashMap<Vec<String>, RateLimitState>>>,
 	pub bad_query_ratelimiter: Arc<RwLock<HashMap<OwnedServerName, RateLimitState>>>,
-	pub roomid_mutex_insert: RwLock<HashMap<OwnedRoomId, Arc<Mutex<()>>>>,
+	pub roomid_mutex_insert: MutexMap<OwnedRoomId, ()>,
 	pub roomid_mutex_state: RwLock<HashMap<OwnedRoomId, Arc<Mutex<()>>>>,
 	pub roomid_mutex_federation: RwLock<HashMap<OwnedRoomId, Arc<Mutex<()>>>>, // this lock will be held longer
 	pub roomid_federationhandletime: RwLock<HashMap<OwnedRoomId, (OwnedEventId, Instant)>>,
@@ -115,7 +117,7 @@ impl Service {
 			bad_signature_ratelimiter: Arc::new(RwLock::new(HashMap::new())),
 			bad_query_ratelimiter: Arc::new(RwLock::new(HashMap::new())),
 			roomid_mutex_state: RwLock::new(HashMap::new()),
-			roomid_mutex_insert: RwLock::new(HashMap::new()),
+			roomid_mutex_insert: MutexMap::<OwnedRoomId, ()>::new(),
 			roomid_mutex_federation: RwLock::new(HashMap::new()),
 			roomid_federationhandletime: RwLock::new(HashMap::new()),
 			updates_handle: Mutex::new(None),