diff options
author | bunnei <bunneidev@gmail.com> | 2023-06-06 02:15:19 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-06 02:15:19 +0200 |
commit | db7b106f1d9d559dadfd9ed070a8b0986609ec57 (patch) | |
tree | 164b97da4aa0f7db44ac1a9bb6f1068aa1114465 /src/audio_core/renderer/adsp/audio_renderer.cpp | |
parent | Merge pull request #10594 from liamwhite/double-patch (diff) | |
parent | audio_renderer: resolve adsp thread deadlock shutdown (diff) | |
download | yuzu-db7b106f1d9d559dadfd9ed070a8b0986609ec57.tar yuzu-db7b106f1d9d559dadfd9ed070a8b0986609ec57.tar.gz yuzu-db7b106f1d9d559dadfd9ed070a8b0986609ec57.tar.bz2 yuzu-db7b106f1d9d559dadfd9ed070a8b0986609ec57.tar.lz yuzu-db7b106f1d9d559dadfd9ed070a8b0986609ec57.tar.xz yuzu-db7b106f1d9d559dadfd9ed070a8b0986609ec57.tar.zst yuzu-db7b106f1d9d559dadfd9ed070a8b0986609ec57.zip |
Diffstat (limited to '')
-rw-r--r-- | src/audio_core/renderer/adsp/audio_renderer.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/audio_core/renderer/adsp/audio_renderer.cpp b/src/audio_core/renderer/adsp/audio_renderer.cpp index 1cbeed302..8bc39f9f9 100644 --- a/src/audio_core/renderer/adsp/audio_renderer.cpp +++ b/src/audio_core/renderer/adsp/audio_renderer.cpp @@ -105,7 +105,7 @@ void AudioRenderer::Start(AudioRenderer_Mailbox* mailbox_) { } mailbox = mailbox_; - thread = std::thread(&AudioRenderer::ThreadFunc, this); + thread = std::jthread([this](std::stop_token stop_token) { ThreadFunc(stop_token); }); running = true; } @@ -131,7 +131,7 @@ void AudioRenderer::CreateSinkStreams() { } } -void AudioRenderer::ThreadFunc() { +void AudioRenderer::ThreadFunc(std::stop_token stop_token) { static constexpr char name[]{"AudioRenderer"}; MicroProfileOnThreadCreate(name); Common::SetCurrentThreadName(name); @@ -146,7 +146,7 @@ void AudioRenderer::ThreadFunc() { constexpr u64 max_process_time{2'304'000ULL}; - while (true) { + while (!stop_token.stop_requested()) { auto message{mailbox->ADSPWaitMessage()}; switch (message) { case RenderMessage::AudioRenderer_Shutdown: @@ -194,7 +194,7 @@ void AudioRenderer::ThreadFunc() { max_time = std::min(command_buffer.time_limit, max_time); command_list_processor.SetProcessTimeMax(max_time); - streams[index]->WaitFreeSpace(); + streams[index]->WaitFreeSpace(stop_token); // Process the command list { |