ShuriZma
/
pcsx2
mirror of https://github.com/PCSX2/pcsx2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Common: Avoid libstdc++ assert

This commit is contained in:
TellowKrinkle 2022-04-16 00:28:37 -05:00 committed by refractionpcsx2
parent 53bb0c508f
commit eb60e9aa9b
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/Semaphore.cpp
View File

@ -79,7 +79,8 @@ bool Threading::WorkSema::WaitForEmpty()
{ {
if (value < 0) if (value < 0)
return !IsDead(value); // STATE_SLEEPING or STATE_SPINNING, queue is empty! return !IsDead(value); // STATE_SLEEPING or STATE_SPINNING, queue is empty!
if (m_state.compare_exchange_weak(value, value | STATE_FLAG_WAITING_EMPTY, std::memory_order_relaxed, std::memory_order_acquire)) // Note: We technically only need memory_order_acquire on *failure* (because that's when we could leave without sleeping), but libstdc++ still asserts on failure < success
if (m_state.compare_exchange_weak(value, value | STATE_FLAG_WAITING_EMPTY, std::memory_order_acquire))
break; break;
} }
pxAssertDev(!(value & STATE_FLAG_WAITING_EMPTY), "Multiple threads attempted to wait for empty (not currently supported)"); pxAssertDev(!(value & STATE_FLAG_WAITING_EMPTY), "Multiple threads attempted to wait for empty (not currently supported)");
@ -95,7 +96,7 @@ bool Threading::WorkSema::WaitForEmptyWithSpin()
{ {
if (value < 0) if (value < 0)
return !IsDead(value); // STATE_SLEEPING or STATE_SPINNING, queue is empty! return !IsDead(value); // STATE_SLEEPING or STATE_SPINNING, queue is empty!
if (waited > SPIN_TIME_NS && m_state.compare_exchange_weak(value, value | STATE_FLAG_WAITING_EMPTY, std::memory_order_relaxed, std::memory_order_acquire)) if (waited > SPIN_TIME_NS && m_state.compare_exchange_weak(value, value | STATE_FLAG_WAITING_EMPTY, std::memory_order_acquire))
break; break;
waited += ShortSpin(); waited += ShortSpin();
value = m_state.load(std::memory_order_acquire); value = m_state.load(std::memory_order_acquire);