archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-13 18:28:35 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

atomic.hpp: add timeout support

Browse source
This commit is contained in:
Nekotekina 2019-09-09 02:42:05 +03:00
parent a45f86a4a2
commit aa99faa85d
2 changed files with 58 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

58
rpcs3/util/atomic.cpp
View file

@ -72,22 +72,41 @@ namespace
return s_waiter_maps[std::hash<const void*>()(ptr) % std::size(s_waiter_maps)];
}
void fallback_wait(const void* data, std::size_t size, u64 old_value)
void fallback_wait(const void* data, std::size_t size, u64 old_value, u64 timeout)
{
auto& wmap = get_fallback_map(data);
if (!timeout)
{
return;
}
// Update node key
s_tls_waiter.key() = data;
if (std::unique_lock lock(wmap.mutex); ptr_cmp(data, size, old_value) && s_tls_wait_cb(data))
{
// Add node to the waiter list
std::condition_variable& cond = wmap.list.insert(std::move(s_tls_waiter))->second.cond;
const auto iter = wmap.list.insert(std::move(s_tls_waiter));
// Wait until the node is returned to its TLS location
if (timeout + 1)
{
if (!iter->second.cond.wait_for(lock, std::chrono::nanoseconds(timeout), [&]
{
return 1 && s_tls_waiter;
}))
{
// Put it back
s_tls_waiter = wmap.list.extract(iter);
}
return;
}
while (!s_tls_waiter)
{
cond.wait(lock);
iter->second.cond.wait(lock);
}
}
}
@ -127,9 +146,9 @@ namespace
#if !defined(_WIN32) && !defined(__linux__)
void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value)
void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value, u64 timeout)
{
fallback_wait(data, size, old_value);
fallback_wait(data, size, old_value, timeout);
}
void atomic_storage_futex::notify_one(const void* data)
@ -144,8 +163,13 @@ void atomic_storage_futex::notify_all(const void* data)
#else
void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value)
void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_value, u64 timeout)
{
if (!timeout)
{
return;
}
const std::intptr_t iptr = reinterpret_cast<std::intptr_t>(data);
atomic_t<s64>& entry = s_hashtable[iptr % s_hashtable_size];
@ -183,10 +207,26 @@ void atomic_storage_futex::wait(const void* data, std::size_t size, u64 old_valu
if (ptr_cmp(data, size, old_value) && s_tls_wait_cb(data))
{
#ifdef _WIN32
NtWaitForKeyedEvent(nullptr, &entry, false, nullptr);
return;
LARGE_INTEGER qw;
qw.QuadPart = -static_cast<s64>(timeout / 100);
if (timeout % 100)
{
// Round up to closest 100ns unit
qw.QuadPart -= 1;
}
if (!NtWaitForKeyedEvent(nullptr, &entry, false, timeout + 1 ? &qw : nullptr))
{
// Return if no errors, continue if timed out
return;
}
#else
futex(reinterpret_cast<char*>(&entry) + 4 * IS_BE_MACHINE, FUTEX_WAIT_PRIVATE, new_value, nullptr);
struct timespec ts;
ts.tv_sec = timeout / 1'000'000'000;
ts.tv_nsec = timeout % 1'000'000'000;
futex(reinterpret_cast<char*>(&entry) + 4 * IS_BE_MACHINE, FUTEX_WAIT_PRIVATE, new_value, timeout + 1 ? &ts : nullptr);
#endif
}