mirrors/citra
1
0
Fork 0
Code Issues Pull requests Releases Activity

Avoid deadlock when stopping video dumping (#5407)

Browse source 
* Avoid deadlock when stopping video dumping

* Use static_cast, make quit atomic

* One more atomic load

* Use suggested lock instead of atomic

* Fix locking
This commit is contained in:
xperia64 2020-06-18 18:20:57 -04:00 committed by GitHub
parent 2e24183e53
commit 1504018a56
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 31 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/video_core/renderer_opengl/renderer_opengl.cpp
View file

@ -41,6 +41,11 @@ namespace OpenGL {
// number but 9 swap textures at 60FPS presentation allows for 800% speed so thats probably fine // number but 9 swap textures at 60FPS presentation allows for 800% speed so thats probably fine
constexpr std::size_t SWAP_CHAIN_SIZE = 9; constexpr std::size_t SWAP_CHAIN_SIZE = 9;
class OGLTextureMailboxException : public std::runtime_error {
public:
using std::runtime_error::runtime_error;
};
class OGLTextureMailbox : public Frontend::TextureMailbox { class OGLTextureMailbox : public Frontend::TextureMailbox {
public: public:
std::mutex swap_chain_lock; std::mutex swap_chain_lock;
@ -168,18 +173,23 @@ public:
/// This mailbox is different in that it will never discard rendered frames /// This mailbox is different in that it will never discard rendered frames
class OGLVideoDumpingMailbox : public OGLTextureMailbox { class OGLVideoDumpingMailbox : public OGLTextureMailbox {
public: public:
bool quit = false;
Frontend::Frame* GetRenderFrame() override { Frontend::Frame* GetRenderFrame() override {
std::unique_lock<std::mutex> lock(swap_chain_lock); std::unique_lock<std::mutex> lock(swap_chain_lock);
// If theres no free frames, we will wait until one shows up // If theres no free frames, we will wait until one shows up
if (free_queue.empty()) { if (free_queue.empty()) {
free_cv.wait(lock, [&] { return !free_queue.empty(); }); free_cv.wait(lock, [&] { return (!free_queue.empty() || quit); });
if (quit) {
throw OGLTextureMailboxException("VideoDumpingMailbox quitting");
} }
if (free_queue.empty()) { if (free_queue.empty()) {
LOG_CRITICAL(Render_OpenGL, "Could not get free frame"); LOG_CRITICAL(Render_OpenGL, "Could not get free frame");
return nullptr; return nullptr;
} }
}
Frontend::Frame* frame = free_queue.front(); Frontend::Frame* frame = free_queue.front();
free_queue.pop(); free_queue.pop();
@ -372,7 +382,11 @@ void RendererOpenGL::SwapBuffers() {
RenderToMailbox(layout, render_window.mailbox, false); RenderToMailbox(layout, render_window.mailbox, false);
if (frame_dumper.IsDumping()) { if (frame_dumper.IsDumping()) {
try {
RenderToMailbox(frame_dumper.GetLayout(), frame_dumper.mailbox, true); RenderToMailbox(frame_dumper.GetLayout(), frame_dumper.mailbox, true);
} catch(const OGLTextureMailboxException& exception) {
LOG_DEBUG(Render_OpenGL, "Frame dumper exception caught: {}", exception.what());
}
} }
m_current_frame++; m_current_frame++;
@ -1090,11 +1104,22 @@ void RendererOpenGL::TryPresent(int timeout_ms) {
void RendererOpenGL::UpdateFramerate() {} void RendererOpenGL::UpdateFramerate() {}
void RendererOpenGL::PrepareVideoDumping() { void RendererOpenGL::PrepareVideoDumping() {
auto* mailbox = static_cast<OGLVideoDumpingMailbox*>(frame_dumper.mailbox.get());
{
std::unique_lock lock(mailbox->swap_chain_lock);
mailbox->quit = false;
}
frame_dumper.StartDumping(); frame_dumper.StartDumping();
} }
void RendererOpenGL::CleanupVideoDumping() { void RendererOpenGL::CleanupVideoDumping() {
frame_dumper.StopDumping(); frame_dumper.StopDumping();
auto* mailbox = static_cast<OGLVideoDumpingMailbox*>(frame_dumper.mailbox.get());
{
std::unique_lock lock(mailbox->swap_chain_lock);
mailbox->quit = true;
}
mailbox->free_cv.notify_one();
} }
static const char* GetSource(GLenum source) { static const char* GetSource(GLenum source) {