ErrorNoInternet/ErrorNoWatcher
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(events): manipulate listeners in a task to avoid deadlocks

Browse Source
This commit is contained in:
Ryan 2025-02-23 02:49:35 -05:00
parent 168ac1bb46
commit 2ea7ec9e7e
Signed by: ErrorNoInternet
GPG Key ID: 2486BFB7B1E6A4A3
1 changed files with 26 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
src/lua/events.rs
View File

@ -9,18 +9,19 @@ pub async fn register_functions(lua: &Lua, globals: &Table, state: State) -> Res
"add_listener", "add_listener",
lua.create_function( lua.create_function(
move |_, (event_type, callback, id): (String, Function, Option<String>)| { move |_, (event_type, callback, id): (String, Function, Option<String>)| {
let mut l = block_on(l.lock()); let l = l.clone();
tokio::spawn(async move {
l.entry(event_type).or_default().push(( l.lock().await.entry(event_type).or_default().push((
id.unwrap_or(callback.info().name.unwrap_or(format!( id.unwrap_or(callback.info().name.unwrap_or(format!(
"anonymous @ {}", "anonymous @ {}",
SystemTime::now() SystemTime::now()
.duration_since(UNIX_EPOCH) .duration_since(UNIX_EPOCH)
.unwrap_or_default() .unwrap_or_default()
.as_millis() .as_millis()
))), ))),
callback, callback,
)); ));
});
Ok(()) Ok(())
}, },
)?, )?,
@ -30,18 +31,19 @@ pub async fn register_functions(lua: &Lua, globals: &Table, state: State) -> Res
globals.set( globals.set(
"remove_listener", "remove_listener",
lua.create_function(move |_, (event_type, target_id): (String, String)| { lua.create_function(move |_, (event_type, target_id): (String, String)| {
let mut l = block_on(l.lock()); let l = l.clone();
tokio::spawn(async move {
let empty = if let Some(listeners) = l.get_mut(&event_type) { let mut l = l.lock().await;
listeners.retain(|(id, _)| target_id != *id); let empty = if let Some(listeners) = l.get_mut(&event_type) {
listeners.is_empty() listeners.retain(|(id, _)| target_id != *id);
} else { listeners.is_empty()
false } else {
}; false
if empty { };
l.remove(&event_type); if empty {
} l.remove(&event_type);
}
});
Ok(()) Ok(())
})?, })?,
)?; )?;