SaveStates/ZSTD: Improve termination and file handling

rpcs3/util/serialization_ext.cpp

@@ -814,7 +814,7 @@ void compressed_zstd_serialization_file_handler::initialize(utils::serial& ar)
 
 		// Make sure at least one thread is free
 		// Limit thread count in order to make sure memory limits are under control (TODO: scale with RAM size)
-		const usz thread_count = std::min<u32>(std::max<u32>(utils::get_thread_count(), 2) - 1, 16);
+		const usz thread_count = std::min<u32>(std::max<u32>(utils::get_thread_count(), 2) - 1, 32);
 
 		for (usz i = 0; i < thread_count; i++)
 		{
@@ -1142,42 +1142,38 @@ void compressed_zstd_serialization_file_handler::finalize(utils::serial& ar)
 		}
 	}
 
+	usz pending_threads = 0;
+
+	do 
+	{
+		pending_threads = 0;
+
 		for (auto& context : m_compression_threads)
 		{
-		// Notify to abort
+			// Try to notify all in bulk
-		while (!context.notified)
+			if (!context.notified && !context.m_input && context.m_input.compare_and_swap_test(null_ptr, empty_data))
-		{
-			const auto data = context.m_input.compare_and_swap(null_ptr, empty_data);
-
-			if (!data)
 			{
 				context.notified = true;
 				context.m_input.notify_one();
-				break;
-			}
-
-			// Wait until valid input is processed
-			thread_ctrl::wait_for(1000);
 			}
 		}
 
 		for (auto& context : m_compression_threads)
 		{
-		// Wait for notification to be consumed
+			// Wait for notification to be sent
-		while (context.m_input)
+			// And wait for data to be written to be read by the thread
+			if (context.m_output || !context.notified)
 			{
-			thread_ctrl::wait_for(1000);
+				pending_threads++;
 			}
 		}
 
-	for (auto& context : m_compression_threads)
+		if (pending_threads)
 		{
-		// Wait for data to be writen to be read by the thread
+			thread_ctrl::wait_for(500);
-		while (context.m_output)
-		{
-			thread_ctrl::wait_for(1000);
 		}
 	}
+	while (pending_threads);
 
 	for (usz idx = m_output_buffer_index;;)
 	{