godotengine/godot
1
0
Fork 0
mirror of https://github.com/godotengine/godot.git synced 2026-01-01 05:49:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #108495 from simpkins/deadlock_comments

Browse Source 
Document some deadlocks in the physics server code
This commit is contained in:
Thaddeus Crews
2025-07-18 11:05:12 -05:00
parent 6e0671e1c5 cb25b933e7
commit 8c0900450c
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/godot_physics_3d/godot_soft_body_3d.cpp
View File

@@ -136,6 +136,10 @@ void GodotSoftBody3D::set_mesh(RID p_mesh) {
return;
}
// TODO: calling RenderingServer::mesh_surface_get_arrays() from the physics thread
// is not safe and can deadlock when physics/3d/run_on_separate_thread is enabled.
// This method blocks on the main thread to return data, but the main thread may be
// blocked waiting on us in PhysicsServer3D::sync().
Array arrays = RenderingServer::get_singleton()->mesh_surface_get_arrays(soft_mesh, 0);
ERR_FAIL_COND(arrays.is_empty());

4
modules/jolt_physics/objects/jolt_soft_body_3d.cpp
View File

@@ -128,6 +128,10 @@ bool JoltSoftBody3D::_ref_shared_data() {
if (iter_shared_data == mesh_to_shared.end()) {
RenderingServer *rendering = RenderingServer::get_singleton();
// TODO: calling RenderingServer::mesh_surface_get_arrays() from the physics thread
// is not safe and can deadlock when physics/3d/run_on_separate_thread is enabled.
// This method blocks on the main thread to return data, but the main thread may be
// blocked waiting on us in PhysicsServer3D::sync().
const Array mesh_data = rendering->mesh_surface_get_arrays(mesh, 0);
ERR_FAIL_COND_V(mesh_data.is_empty(), false);