fix: switch to async read-write lock instead of sync mutex in call handler to try to prevent deadlock

This commit is contained in:
2026-05-29 22:22:55 -04:00
parent c6aa8e5d13
commit 20bb0e4c31

View File

@@ -11,11 +11,9 @@ use songbird::{
CoreEvent, Event, EventContext, EventHandler, Songbird, CoreEvent, Event, EventContext, EventHandler, Songbird,
driver::{Channels, SampleRate}, driver::{Channels, SampleRate},
}; };
use std::{ use std::{sync::Arc, time::Instant};
sync::{Arc, Mutex},
time::Instant,
};
use time::UtcDateTime; use time::UtcDateTime;
use tokio::sync::RwLock;
use twilight_model::id::{ use twilight_model::id::{
Id, Id,
marker::{ChannelMarker, GuildMarker, UserMarker}, marker::{ChannelMarker, GuildMarker, UserMarker},
@@ -31,7 +29,7 @@ struct Handler {
guild_id: Id<GuildMarker>, guild_id: Id<GuildMarker>,
channel_id: Id<ChannelMarker>, channel_id: Id<ChannelMarker>,
known_ssrcs: Arc<Mutex<OneToManyUniqueBTreeMap<Id<UserMarker>, u32>>>, known_ssrcs: Arc<RwLock<OneToManyUniqueBTreeMap<Id<UserMarker>, u32>>>,
audio_channels: u16, audio_channels: u16,
audio_sample_rate: u32, audio_sample_rate: u32,
@@ -53,15 +51,15 @@ impl EventHandler for Handler {
let user_id = Id::new(user_id.0); let user_id = Id::new(user_id.0);
self.known_ssrcs self.known_ssrcs
.lock() .write()
.unwrap() .await
.insert(user_id, speaking.ssrc); .insert(user_id, speaking.ssrc);
} }
} }
EventContext::VoiceTick(voice_tick) => { EventContext::VoiceTick(voice_tick) => {
for (ssrc, voice_data) in &voice_tick.speaking { for (ssrc, voice_data) in &voice_tick.speaking {
let user_id = { let user_id = {
let known_ssrcs = self.known_ssrcs.lock().unwrap(); let known_ssrcs = self.known_ssrcs.read().await;
known_ssrcs.get_left_for(ssrc).cloned() known_ssrcs.get_left_for(ssrc).cloned()
}; };
@@ -126,7 +124,6 @@ impl EventHandler for Handler {
let channels = self.audio_channels; let channels = self.audio_channels;
let sample_rate = self.audio_sample_rate; let sample_rate = self.audio_sample_rate;
let recording_manager = self.recording_manager.clone(); let recording_manager = self.recording_manager.clone();
let samples = pcm.clone(); let samples = pcm.clone();