80486DX2-66/86Box-fork
1
0
Fork 0
Code Issues Pull Requests Activity

Merge pull request #2506 from ts-korhonen/fix-mutex-crash

Browse Source 
Fix crash at exit due to a unreleased mutex
This commit is contained in:
David Hrdlička
2022-07-25 13:31:37 +02:00
committed by GitHub
parent 681127e521 80e5470006
commit 301e1ffb11
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/qt/qt_platform.cpp
View File

@@ -54,6 +54,7 @@ QElapsedTimer elapsed_timer;
static std::atomic_int blitmx_contention = 0; static std::atomic_int blitmx_contention = 0;
static std::recursive_mutex blitmx; static std::recursive_mutex blitmx;
static thread_local std::unique_lock blit_lock { blitmx, std::defer_lock };
class CharPointer { class CharPointer {
public: public:
@@ -468,17 +469,17 @@ void dynld_close(void *handle)
void startblit() void startblit()
{ {
blitmx_contention++; blitmx_contention++;
if (blitmx.try_lock()) { if (blit_lock.try_lock()) {
return; return;
} }
blitmx.lock(); blit_lock.lock();
} }
void endblit() void endblit()
{ {
blitmx_contention--; blitmx_contention--;
blitmx.unlock(); blit_lock.unlock();
if (blitmx_contention > 0) { if (blitmx_contention > 0) {
// a deadlock has been observed on linux when toggling via video_toggle_option // a deadlock has been observed on linux when toggling via video_toggle_option
// because the mutex is typically unfair on linux // because the mutex is typically unfair on linux