studio/tuwunel
2
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

reduce roomid_mutex_federation

Browse Source 
Signed-off-by: Jason Volk <jason@zemos.net>
This commit is contained in:
Jason Volk
2024-06-14 21:39:37 +00:00
parent 22272bdc16
commit 539aa27815
5 changed files with 25 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/api/server/send.rs
View File

@@ -1,4 +1,4 @@
use std::{collections::BTreeMap, sync::Arc, time::Instant};
use std::{collections::BTreeMap, time::Instant};
use axum_client_ip::InsecureClientIp;
use conduit::debug_warn;
@@ -107,16 +107,11 @@ pub(crate) async fn send_transaction_message_route(
let mut resolved_map = BTreeMap::new();
for (event_id, value, room_id) in parsed_pdus {
let pdu_start_time = Instant::now();
let mutex = Arc::clone(
services()
.globals
.roomid_mutex_federation
.write()
.await
.entry(room_id.clone())
.or_default(),
);
let mutex_lock = mutex.lock().await;
let mutex_lock = services()
.globals
.roomid_mutex_federation
.lock(&room_id)
.await;
resolved_map.insert(
event_id.clone(),
services()

17
src/api/server/send_join.rs
View File

@@ -1,6 +1,6 @@
#![allow(deprecated)]
use std::{collections::BTreeMap, sync::Arc};
use std::collections::BTreeMap;
use ruma::{
api::{client::error::ErrorKind, federation::membership::create_join_event},
@@ -148,16 +148,11 @@ async fn create_join_event(
.fetch_required_signing_keys([&value], &pub_key_map)
.await?;
let mutex = Arc::clone(
services()
.globals
.roomid_mutex_federation
.write()
.await
.entry(room_id.to_owned())
.or_default(),
);
let mutex_lock = mutex.lock().await;
let mutex_lock = services()
.globals
.roomid_mutex_federation
.lock(room_id)
.await;
let pdu_id: Vec<u8> = services()
.rooms
.event_handler

17
src/api/server/send_leave.rs
View File

@@ -1,6 +1,6 @@
#![allow(deprecated)]
use std::{collections::BTreeMap, sync::Arc};
use std::collections::BTreeMap;
use ruma::{
api::{client::error::ErrorKind, federation::membership::create_leave_event},
@@ -154,16 +154,11 @@ async fn create_leave_event(origin: &ServerName, room_id: &RoomId, pdu: &RawJson
.fetch_required_signing_keys([&value], &pub_key_map)
.await?;
let mutex = Arc::clone(
services()
.globals
.roomid_mutex_federation
.write()
.await
.entry(room_id.to_owned())
.or_default(),
);
let mutex_lock = mutex.lock().await;
let mutex_lock = services()
.globals
.roomid_mutex_federation
.lock(room_id)
.await;
let pdu_id: Vec<u8> = services()
.rooms
.event_handler