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

Restore using keyed events in waitable atomics on Windows

This commit is contained in:
Nekotekina 2019-10-18 23:08:00 +03:00
parent d4ba7f37b6
commit db7042b986
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Utilities/sync.h
View File

@ -24,6 +24,8 @@
#include <unordered_map> #include <unordered_map>
#ifdef _WIN32 #ifdef _WIN32
DYNAMIC_IMPORT("ntdll.dll", NtWaitForKeyedEvent, NTSTATUS(HANDLE, PVOID Key, BOOLEAN Alertable, PLARGE_INTEGER Timeout));
DYNAMIC_IMPORT("ntdll.dll", NtReleaseKeyedEvent, NTSTATUS(HANDLE, PVOID Key, BOOLEAN Alertable, PLARGE_INTEGER Timeout));
DYNAMIC_IMPORT("ntdll.dll", NtWaitForSingleObject, NTSTATUS(HANDLE Handle, BOOLEAN Alertable, PLARGE_INTEGER Timeout)); DYNAMIC_IMPORT("ntdll.dll", NtWaitForSingleObject, NTSTATUS(HANDLE Handle, BOOLEAN Alertable, PLARGE_INTEGER Timeout));
DYNAMIC_IMPORT("ntdll.dll", NtDelayExecution, NTSTATUS(BOOLEAN Alertable, PLARGE_INTEGER DelayInterval)); DYNAMIC_IMPORT("ntdll.dll", NtDelayExecution, NTSTATUS(BOOLEAN Alertable, PLARGE_INTEGER DelayInterval));
#endif #endif

17
rpcs3/util/atomic.cpp
View File

@ -59,7 +59,7 @@ static thread_local bool(*s_tls_wait_cb)(const void* data) = [](const void*)
#ifdef USE_POSIX #ifdef USE_POSIX
using sema_handle = sem_t; using sema_handle = sem_t;
#elif defined(_WIN32) #elif defined(_WIN32)
using sema_handle = HANDLE; using sema_handle = std::uint16_t;
#else #else
namespace namespace
{ {
@ -119,10 +119,7 @@ static u32 sema_alloc()
// Initialize semaphore (should be very fast) // Initialize semaphore (should be very fast)
sem_init(&s_sema_list[id], 0, 0); sem_init(&s_sema_list[id], 0, 0);
#elif defined(_WIN32) #elif defined(_WIN32)
if (!s_sema_list[id]) // Do nothing
{
s_sema_list[id] = CreateSemaphoreW(nullptr, 0, 0x7fff'ffff, nullptr);
}
#else #else
if (!s_sema_list[id]) if (!s_sema_list[id])
{ {
@ -457,7 +454,7 @@ void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_valu
qw.QuadPart -= 1; qw.QuadPart -= 1;
} }
if (!NtWaitForSingleObject(s_sema_list[sema_id], false, timeout + 1 ? &qw : nullptr)) if (!NtWaitForKeyedEvent(nullptr, &s_sema_list[sema_id], false, timeout + 1 ? &qw : nullptr))
{ {
fallback = true; fallback = true;
} }
@ -572,7 +569,7 @@ void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_valu
#if defined(_WIN32) && !defined(USE_POSIX) #if defined(_WIN32) && !defined(USE_POSIX)
static LARGE_INTEGER instant{}; static LARGE_INTEGER instant{};
if (!NtWaitForSingleObject(s_sema_list[sema_id], false, &instant)) if (!NtWaitForKeyedEvent(nullptr, &s_sema_list[sema_id], false, &instant))
{ {
fallback = true; fallback = true;
} }
@ -768,7 +765,7 @@ void atomic_storage_futex::notify_one(const void* data)
#ifdef USE_POSIX #ifdef USE_POSIX
sem_post(&s_sema_list[sema_id]); sem_post(&s_sema_list[sema_id]);
#elif defined(_WIN32) #elif defined(_WIN32)
ReleaseSemaphore(s_sema_list[sema_id], 1, nullptr); NtReleaseKeyedEvent(nullptr, &s_sema_list[sema_id], 1, nullptr);
#else #else
dumb_sema& sema = *s_sema_list[sema_id]; dumb_sema& sema = *s_sema_list[sema_id];
@ -839,9 +836,9 @@ void atomic_storage_futex::notify_all(const void* data)
sem_post(&s_sema_list[sema_id]); sem_post(&s_sema_list[sema_id]);
} }
#elif defined(_WIN32) #elif defined(_WIN32)
if (count) for (u32 i = 0; i < count; i++)
{ {
ReleaseSemaphore(s_sema_list[sema_id], count, nullptr); NtReleaseKeyedEvent(nullptr, &s_sema_list[sema_id], count, nullptr);
} }
#else #else
if (count) if (count)