mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-17 08:11:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix freezes on Linux (#2632)

Browse Source
This commit is contained in:
Ivan 2017-04-04 23:27:16 +03:00 committed by GitHub
parent 65488078a4
commit 1ae334e500
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Utilities/mutex.cpp
View File

@ -21,9 +21,12 @@ void shared_mutex::imp_lock_shared(s64 _old)
// Acquire writer lock // Acquire writer lock
imp_wait(m_value.load()); imp_wait(m_value.load());
// Convert value // Convert to reader lock
s64 value = m_value.fetch_add(c_one - c_min); s64 value = m_value.fetch_add(c_one - c_min);
// Proceed exclusively
return;
if (value != 0) if (value != 0)
{ {
imp_unlock(value); imp_unlock(value);
@ -35,7 +38,14 @@ void shared_mutex::imp_lock_shared(s64 _old)
NtWaitForKeyedEvent(nullptr, (int*)&m_value + 1, false, nullptr); NtWaitForKeyedEvent(nullptr, (int*)&m_value + 1, false, nullptr);
} }
#else #else
while (true) // Acquire writer lock
imp_wait(0);
// Convert to reader lock
m_value += c_one - c_min;
// Disabled code
while (false)
{ {
const s64 value0 = m_value.fetch_op([](s64& value) const s64 value0 = m_value.fetch_op([](s64& value)
{ {
@ -63,13 +73,13 @@ void shared_mutex::imp_lock_shared(s64 _old)
value1 += c_one - c_min; value1 += c_one - c_min;
if (value1 >= 0) if (value1 > 0)
{ {
return; return;
} }
// Wait as a reader if necessary // Wait as a reader if necessary
while (futex((int*)&m_value.raw() + IS_LE_MACHINE, FUTEX_WAIT_PRIVATE, int(value1 >> 32), nullptr, nullptr, 0)) while (futex((int*)&m_value.raw() + IS_LE_MACHINE, FUTEX_WAIT_BITSET_PRIVATE, int(value1 >> 32), nullptr, nullptr, INT_MIN))
{ {
value1 = m_value.load(); value1 = m_value.load();
@ -110,7 +120,7 @@ void shared_mutex::imp_unlock_shared(s64 _old)
#else #else
m_value -= c_sig; m_value -= c_sig;
futex((int*)&m_value.raw() + IS_BE_MACHINE, FUTEX_WAKE_PRIVATE, 1, nullptr, nullptr, 0); futex((int*)&m_value.raw() + IS_LE_MACHINE, FUTEX_WAKE_BITSET_PRIVATE, 1, nullptr, nullptr, u32(c_sig >> 32));
#endif #endif
} }
} }
@ -145,7 +155,7 @@ void shared_mutex::imp_wait(s64)
return; return;
} }
futex((int*)&m_value.raw() + IS_BE_MACHINE, FUTEX_WAIT_PRIVATE, int(value), nullptr, nullptr, 0); futex((int*)&m_value.raw() + IS_LE_MACHINE, FUTEX_WAIT_BITSET_PRIVATE, int(value >> 32), nullptr, nullptr, u32(c_sig >> 32));
} }
#endif #endif
} }
@ -180,8 +190,9 @@ void shared_mutex::imp_unlock(s64 _old)
{ {
NtReleaseKeyedEvent(nullptr, &m_value, false, nullptr); NtReleaseKeyedEvent(nullptr, &m_value, false, nullptr);
} }
else if (s64 count = -_old / c_min) else if (s64 count = -_old / c_min * 0)
{ {
// Disabled code
while (count--) while (count--)
{ {
NtReleaseKeyedEvent(nullptr, (int*)&m_value + 1, false, nullptr); NtReleaseKeyedEvent(nullptr, (int*)&m_value + 1, false, nullptr);
@ -192,11 +203,12 @@ void shared_mutex::imp_unlock(s64 _old)
{ {
m_value -= c_sig; m_value -= c_sig;
futex((int*)&m_value.raw() + IS_BE_MACHINE, FUTEX_WAKE_PRIVATE, 1, nullptr, nullptr, 0); futex((int*)&m_value.raw() + IS_LE_MACHINE, FUTEX_WAKE_BITSET_PRIVATE, 1, nullptr, nullptr, u32(c_sig >> 32));
} }
else if (s64 count = -_old / c_min) else if (false)
{ {
futex((int*)&m_value.raw() + IS_LE_MACHINE, FUTEX_WAKE_PRIVATE, INT_MAX, nullptr, nullptr, 0); // Disabled code
futex((int*)&m_value.raw() + IS_LE_MACHINE, FUTEX_WAKE_BITSET_PRIVATE, INT_MAX, nullptr, nullptr, INT_MIN);
} }
#endif #endif
} }