MASSIVE CRASHFIX! Remove audio deadlock.

TeamHypersomnia · Mar 15, 2024 · e405d43 · e405d43
1 parent efe7af2
commit e405d43
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/src/augs/audio/audio_command_buffers.h b/src/augs/audio/audio_command_buffers.h
@@ -8,7 +8,7 @@
 #include "augs/audio/audio_command.h"
 #include "augs/audio/audio_backend.h"
 
-static constexpr int num_audio_buffers_v = 4;
+static constexpr int num_audio_buffers_v = 10;
 
 namespace augs {
 	class audio_command_buffers {
@@ -73,10 +73,16 @@ namespace augs {
 		}
 
 		void report_completion() {
-			auto lk = lock_queue();
-			read_index = next_to(read_index);
+			bool finished = false;
+
+			{
+				auto lk = lock_queue();
+				read_index = next_to(read_index);
+
+				finished = has_finished();
+			}
 
-			if (has_finished()) {
+			if (finished) {
 				for_completion.notify_all();
 				pool_to_help_when_idle.help_until_no_tasks();
 			}

diff --git a/src/augs/templates/thread_pool.h b/src/augs/templates/thread_pool.h
@@ -32,13 +32,17 @@ namespace augs {
 		}
 
 		void register_completion() {
+			bool completed = false;
+
 			{
 				auto lock = lock_completion();
 				++tasks_completed;
 
-				if (tasks_completed == tasks_posted) {
-					completion_variable.notify_all();
-				}
+				completed = tasks_completed == tasks_posted;
+			}
+
+			if (completed) {
+				completion_variable.notify_all();
 			}
 		}