jacob/fomo-reducer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: jacob:eb17c0a33bd0e1e8e0201bf8ff0374f237f29656
Branches Tags
jacob:main
...
compare: jacob:20bb0e4c31d6b3e195b93845deaaa4fda64d3544
Branches Tags
jacob:main

2 Commits
eb17c0a33b ... 20bb0e4c31

Author SHA1 Message Date
Jacob
20bb0e4c31 fix: switch to async read-write lock instead of sync mutex in call handler to try to prevent deadlock 2026-05-29 22:22:55 -04:00
Jacob
c6aa8e5d13 fix: scope borrow in heat seeking to try to prevent deadlock 2026-05-29 22:22:15 -04:00
2 changed files with 51 additions and 49 deletions
Expand all files Collapse all files

15
src/call.rs
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();

85
src/heat_seek.rs
View File

@@ -30,48 +30,53 @@ pub async fn heat_seek(state: State) {
let mut vcs_in_guild_senders = BTreeMap::default(); let mut vcs_in_guild_senders = BTreeMap::default();
loop { loop {
for (&guild_id, vcs_in_guild) in &*vcs_watcher.borrow() { {
let vcs_in_guild_sender = vcs_in_guild_senders.entry(guild_id).or_insert_with(|| { for (&guild_id, vcs_in_guild) in &*vcs_watcher.borrow() {
let (vcs_in_guild_sender, vcs_in_guild_watcher) = let vcs_in_guild_sender =
watch::channel(Default::default()); vcs_in_guild_senders.entry(guild_id).or_insert_with(|| {
let (channel_heat_sender, channel_heat_watcher) = let (vcs_in_guild_sender, vcs_in_guild_watcher) =
watch::channel(Default::default()); watch::channel(Default::default());
let (heat_map_sender, heat_map_watcher) = watch::channel(Default::default()); let (channel_heat_sender, channel_heat_watcher) =
let (hottest_vc_sender, hottest_vc_watcher) = watch::channel(Default::default()); watch::channel(Default::default());
let (heat_map_sender, heat_map_watcher) =
watch::channel(Default::default());
let (hottest_vc_sender, hottest_vc_watcher) =
watch::channel(Default::default());
tokio::spawn( tokio::spawn(
evaluate_heat() evaluate_heat()
.bot_manager(state.bot_manager.clone()) .bot_manager(state.bot_manager.clone())
.bot_owner_user_id(state.discord_bot_owner_user_id) .bot_owner_user_id(state.discord_bot_owner_user_id)
.bot_user_id(state.discord_user_id) .bot_user_id(state.discord_user_id)
.cancellation_token(state.cancellation_token.clone()) .cancellation_token(state.cancellation_token.clone())
.channel_heat_sender(channel_heat_sender) .channel_heat_sender(channel_heat_sender)
.vcs_in_guild_watcher(vcs_in_guild_watcher) .vcs_in_guild_watcher(vcs_in_guild_watcher)
.call(), .call(),
); );
tokio::spawn( tokio::spawn(
map_heat() map_heat()
.cancellation_token(state.cancellation_token.clone()) .cancellation_token(state.cancellation_token.clone())
.channel_heat_watcher(channel_heat_watcher) .channel_heat_watcher(channel_heat_watcher)
.heat_map_sender(heat_map_sender) .heat_map_sender(heat_map_sender)
.call(), .call(),
); );
tokio::spawn( tokio::spawn(
track_hottest_vc() track_hottest_vc()
.cancellation_token(state.cancellation_token.clone()) .cancellation_token(state.cancellation_token.clone())
.heat_map_watcher(heat_map_watcher) .heat_map_watcher(heat_map_watcher)
.hottest_vc_sender(hottest_vc_sender) .hottest_vc_sender(hottest_vc_sender)
.call(), .call(),
); );
tokio::spawn(follow_hottest_vc( tokio::spawn(follow_hottest_vc(
state.clone(), state.clone(),
guild_id, guild_id,
hottest_vc_watcher, hottest_vc_watcher,
)); ));
vcs_in_guild_sender vcs_in_guild_sender
}); });
vcs_in_guild_sender.send_replace(Arc::new(vcs_in_guild.clone())); vcs_in_guild_sender.send_replace(Arc::new(vcs_in_guild.clone()));
}
} }
if matches!( if matches!(