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

fix: properly prevent deadlock on container cleanup

Browse Source 
`ecs` was being locked once in find_entities, and another time when
`ContainerRef::close()` called by the garbage collector from table.set.
This commit is contained in:
Ryan 2025-02-28 23:13:26 -05:00
parent 88141d74e7
commit 2fee108f62
Signed by: ErrorNoInternet
GPG Key ID: 2486BFB7B1E6A4A3
2 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/events.rs
View File

@ -14,8 +14,6 @@ use tokio::net::TcpListener;
#[allow(clippy::too_many_lines)]
pub async fn handle_event(client: Client, event: Event, state: State) -> anyhow::Result<()> {
state.lua.gc_stop();
match event {
Event::AddPlayer(player_info) => {
call_listeners(&state, "add_player", Player::from(player_info)).await;

47
src/lua/client/world.rs
View File

@ -53,11 +53,9 @@ pub async fn find_entities(
client: UserDataRef<Client>,
filter_fn: Function,
) -> Result<Vec<Table>> {
let mut entities = Vec::new();
{
let entities = {
let mut ecs = client.ecs.lock();
let mut query = ecs.query_filtered::<(
ecs.query_filtered::<(
&MinecraftEntityId,
&EntityUuid,
&EntityKind,
@ -65,25 +63,34 @@ pub async fn find_entities(
&AzaleaPosition,
&LookDirection,
&Pose,
), Without<Dead>>();
for (id, uuid, kind, custom_name, position, direction, pose) in query.iter(&ecs) {
let entity = lua.create_table()?;
entity.set("id", id.0)?;
entity.set("uuid", uuid.to_string())?;
entity.set("kind", kind.to_string())?;
entity.set("custom_name", custom_name.as_ref().map(ToString::to_string))?;
entity.set("position", Vec3::from(position))?;
entity.set("direction", Direction::from(direction))?;
entity.set("pose", *pose as u8)?;
entities.push(entity);
}
}
), Without<Dead>>()
.iter(&ecs)
.map(|(id, uuid, kind, custom_name, position, direction, pose)| {
(
id.0,
uuid.to_string(),
kind.to_string(),
custom_name.as_ref().map(ToString::to_string),
Vec3::from(position),
Direction::from(direction),
*pose as u8,
)
})
.collect::<Vec<_>>()
};
let mut matched = Vec::new();
for entity in entities {
for (id, uuid, kind, custom_name, position, direction, pose) in entities {
let entity = lua.create_table()?;
entity.set("id", id)?;
entity.set("uuid", uuid)?;
entity.set("kind", kind)?;
entity.set("custom_name", custom_name)?;
entity.set("position", position)?;
entity.set("direction", direction)?;
entity.set("pose", pose)?;
if filter_fn.call_async::<bool>(&entity).await? {
matched.push(entity)
matched.push(entity);
}
}
Ok(matched)