RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

Use atomic wait in shared_mutex and semaphore

Browse Source
This commit is contained in:
Nekotekina 2019-07-27 17:08:45 +03:00
parent f63e89f9b4
commit 8886414013
2 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Utilities/mutex.cpp
View File

@ -1,7 +1,4 @@
#include "mutex.h" #include "mutex.h"
#include "sync.h"
#include <climits>
void shared_mutex::imp_lock_shared(u32 val) void shared_mutex::imp_lock_shared(u32 val)
{ {
@ -122,7 +119,9 @@ void shared_mutex::imp_unlock_vip(u32 old)
void shared_mutex::imp_wait() void shared_mutex::imp_wait()
{ {
while (!balanced_wait_until(m_value, -1, [&](u32& value, auto...) while (true)
{
const auto [old, ok] = m_value.fetch_op([](u32& value)
{ {
if (value >= c_sig) if (value >= c_sig)
{ {
@ -131,15 +130,21 @@ void shared_mutex::imp_wait()
} }
return false; return false;
})) });
if (ok)
{ {
break;
}
m_value.wait(old);
} }
} }
void shared_mutex::imp_signal() void shared_mutex::imp_signal()
{ {
m_value += c_sig; m_value += c_sig;
balanced_awaken(m_value, 1); m_value.notify_one();
} }
void shared_mutex::imp_lock(u32 val) void shared_mutex::imp_lock(u32 val)

20
Utilities/sema.cpp
View File

@ -1,5 +1,4 @@
#include "sema.h" #include "sema.h"
#include "sync.h"
void semaphore_base::imp_wait() void semaphore_base::imp_wait()
{ {
@ -15,14 +14,6 @@ void semaphore_base::imp_wait()
} }
} }
#ifdef _WIN32
const s32 value = m_value.fetch_sub(1);
if (value <= 0)
{
NtWaitForKeyedEvent(nullptr, &m_value, false, nullptr);
}
#else
while (true) while (true)
{ {
// Try hard way // Try hard way
@ -51,24 +42,19 @@ void semaphore_base::imp_wait()
if (value >= 0) if (value >= 0)
{ {
// Signal other waiter to wake up or to restore sign bit // Signal other waiter to wake up or to restore sign bit
futex(&m_value, FUTEX_WAKE_PRIVATE, 1); m_value.notify_one();
return; return;
} }
futex(&m_value, FUTEX_WAIT_PRIVATE, value); m_value.wait(value);
} }
#endif
} }
void semaphore_base::imp_post(s32 _old) void semaphore_base::imp_post(s32 _old)
{ {
verify("semaphore_base: overflow" HERE), _old < 0; verify("semaphore_base: overflow" HERE), _old < 0;
#ifdef _WIN32 m_value.notify_one();
NtReleaseKeyedEvent(nullptr, &m_value, false, nullptr);
#else
futex(&m_value, FUTEX_WAKE_PRIVATE, 1);
#endif
} }
bool semaphore_base::try_post(s32 _max) bool semaphore_base::try_post(s32 _max)