Merge pull request #109591 from mihe/no-async-physics-while-processing

Pause physics command queue during physics processing

Author: Repiteo

servers/physics_server_2d_wrap_mt.cpp

@@ -42,10 +42,17 @@ void PhysicsServer2DWrapMT::_thread_exit() {
 void PhysicsServer2DWrapMT::_thread_loop() {
 	while (!exit) {
 		WorkerThreadPool::get_singleton()->yield();
-		command_queue.flush_all();
+
+		if (!doing_sync.is_set()) {
+			command_queue.flush_all();
+		}
 	}
 }
 
+void PhysicsServer2DWrapMT::_thread_sync() {
+	doing_sync.set();
+}
+
 /* EVENT QUEUING */
 
 void PhysicsServer2DWrapMT::step(real_t p_step) {
@@ -58,7 +65,7 @@ void PhysicsServer2DWrapMT::step(real_t p_step) {
 
 void PhysicsServer2DWrapMT::sync() {
 	if (create_thread) {
-		command_queue.sync();
+		command_queue.push_and_sync(this, &PhysicsServer2DWrapMT::_thread_sync);
 	} else {
 		command_queue.flush_all(); // Flush all pending from other threads.
 	}
@@ -71,6 +78,10 @@ void PhysicsServer2DWrapMT::flush_queries() {
 
 void PhysicsServer2DWrapMT::end_sync() {
 	physics_server_2d->end_sync();
+
+	if (create_thread) {
+		doing_sync.clear();
+	}
 }
 
 void PhysicsServer2DWrapMT::init() {

servers/physics_server_2d_wrap_mt.h

@@ -35,6 +35,10 @@
 #include "core/templates/command_queue_mt.h"
 #include "servers/physics_server_2d.h"
 
+#define ASYNC_COND_PUSH (Thread::get_caller_id() != server_thread)
+#define ASYNC_COND_PUSH_AND_RET (Thread::get_caller_id() != server_thread && !(doing_sync.is_set() && Thread::is_main_thread()))
+#define ASYNC_COND_PUSH_AND_SYNC (Thread::get_caller_id() != server_thread && !(doing_sync.is_set() && Thread::is_main_thread()))
+
 #ifdef DEBUG_SYNC
 #define SYNC_DEBUG print_line("sync on: " + String(__FUNCTION__));
 #else
@@ -58,10 +62,12 @@ class PhysicsServer2DWrapMT : public PhysicsServer2D {
 	WorkerThreadPool::TaskID server_task_id = WorkerThreadPool::INVALID_TASK_ID;
 	bool exit = false;
 	bool create_thread = false;
+	SafeFlag doing_sync;
 
 	void _assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id);
 	void _thread_exit();
 	void _thread_loop();
+	void _thread_sync();
 
 public:
 #define ServerName PhysicsServer2D

servers/physics_server_3d_wrap_mt.cpp

@@ -42,10 +42,17 @@ void PhysicsServer3DWrapMT::_thread_exit() {
 void PhysicsServer3DWrapMT::_thread_loop() {
 	while (!exit) {
 		WorkerThreadPool::get_singleton()->yield();
-		command_queue.flush_all();
+
+		if (!doing_sync.is_set()) {
+			command_queue.flush_all();
+		}
 	}
 }
 
+void PhysicsServer3DWrapMT::_thread_sync() {
+	doing_sync.set();
+}
+
 /* EVENT QUEUING */
 
 void PhysicsServer3DWrapMT::step(real_t p_step) {
@@ -58,7 +65,7 @@ void PhysicsServer3DWrapMT::step(real_t p_step) {
 
 void PhysicsServer3DWrapMT::sync() {
 	if (create_thread) {
-		command_queue.sync();
+		command_queue.push_and_sync(this, &PhysicsServer3DWrapMT::_thread_sync);
 	} else {
 		command_queue.flush_all(); // Flush all pending from other threads.
 	}
@@ -71,6 +78,10 @@ void PhysicsServer3DWrapMT::flush_queries() {
 
 void PhysicsServer3DWrapMT::end_sync() {
 	physics_server_3d->end_sync();
+
+	if (create_thread) {
+		doing_sync.clear();
+	}
 }
 
 void PhysicsServer3DWrapMT::init() {

servers/physics_server_3d_wrap_mt.h

@@ -36,6 +36,10 @@
 #include "core/templates/command_queue_mt.h"
 #include "servers/physics_server_3d.h"
 
+#define ASYNC_COND_PUSH (Thread::get_caller_id() != server_thread)
+#define ASYNC_COND_PUSH_AND_RET (Thread::get_caller_id() != server_thread && !(doing_sync.is_set() && Thread::is_main_thread()))
+#define ASYNC_COND_PUSH_AND_SYNC (Thread::get_caller_id() != server_thread && !(doing_sync.is_set() && Thread::is_main_thread()))
+
 #ifdef DEBUG_SYNC
 #define SYNC_DEBUG print_line("sync on: " + String(__FUNCTION__));
 #else
@@ -59,11 +63,13 @@ class PhysicsServer3DWrapMT : public PhysicsServer3D {
 	WorkerThreadPool::TaskID server_task_id = WorkerThreadPool::INVALID_TASK_ID;
 	bool exit = false;
 	bool create_thread = false;
+	SafeFlag doing_sync;
 
 	void _assign_mt_ids(WorkerThreadPool::TaskID p_pump_task_id);
 	void _thread_exit();
 	void _thread_step(real_t p_delta);
 	void _thread_loop();
+	void _thread_sync();
 
 public:
 #define ServerName PhysicsServer3D

servers/rendering/rendering_server_default.h

@@ -109,6 +109,9 @@ class RenderingServerDefault : public RenderingServer {
 #endif
 
 #define WRITE_ACTION redraw_request();
+#define ASYNC_COND_PUSH (Thread::get_caller_id() != server_thread)
+#define ASYNC_COND_PUSH_AND_RET (Thread::get_caller_id() != server_thread)
+#define ASYNC_COND_PUSH_AND_SYNC (Thread::get_caller_id() != server_thread)
 
 #ifdef DEBUG_SYNC
 #define SYNC_DEBUG print_line("sync on: " + String(__FUNCTION__));