Archive/rpcs3
0
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-04-28 21:38:01 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Rewrite cond_variable to use waitable atomics

Browse source 
Increase max_timeout and fix max_timeout usage
This commit is contained in:
Nekotekina 2019-09-09 11:09:30 +03:00
parent 67f31c17d1
commit d13ff285d1
5 changed files with 105 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

29
Utilities/Thread.cpp
View file

@ -1778,11 +1778,13 @@ void thread_base::finalize() noexcept
--g_thread_count;
}
bool thread_ctrl::_wait_for(u64 usec)
void thread_ctrl::_wait_for(u64 usec)
{
auto _this = g_tls_this_thread;
do
std::unique_lock lock(_this->m_mutex, std::defer_lock);
while (true)
{
// Mutex is unlocked at the start and after the waiting
if (u32 sig = _this->m_signal.load())
@ -1790,17 +1792,20 @@ bool thread_ctrl::_wait_for(u64 usec)
if (sig & 1)
{
_this->m_signal &= ~1;
return true;
return;
}
}
if (usec == 0)
{
// No timeout: return immediately
return false;
return;
}
_this->m_mutex.lock();
if (!lock)
{
lock.lock();
}
// Double-check the value
if (u32 sig = _this->m_signal.load())
@ -1808,15 +1813,17 @@ bool thread_ctrl::_wait_for(u64 usec)
if (sig & 1)
{
_this->m_signal &= ~1;
_this->m_mutex.unlock();
return true;
return;
}
}
}
while (_this->m_cond.wait_unlock(std::exchange(usec, usec > cond_variable::max_timeout ? -1 : 0), _this->m_mutex));
// Timeout
return false;
_this->m_cond.wait_unlock(usec, lock);
if (usec < cond_variable::max_timeout)
{
usec = 0;
}
}
}
thread_base::thread_base(std::string_view name)