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

vm::wait_op improved

Browse source 
Now it accepts thread_t and its descendants (but may require adding
friend vm::waiter_lock_t class)
This commit is contained in:
Nekotekina 2015-07-27 04:18:18 +03:00
parent ff1f6d3d4f
commit 71a378a3fb
3 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

28
rpcs3/Emu/Memory/vm.cpp
View file

@ -152,7 +152,7 @@ namespace vm
std::mutex g_waiter_list_mutex;
waiter_t* _add_waiter(CPUThread& thread, u32 addr, u32 size)
waiter_t* _add_waiter(thread_t& thread, u32 addr, u32 size)
{
std::lock_guard<std::mutex> lock(g_waiter_list_mutex);
@ -242,25 +242,18 @@ namespace vm
addr = 0;
mask = ~0;
// signal thread (must not be signaled yet)
if (!thread->signal())
{
throw EXCEPTION("Thread already signaled");
}
// signal thread
thread->cv.notify_one();
return true;
}
waiter_lock_t::waiter_lock_t(CPUThread& thread, u32 addr, u32 size)
: m_waiter(_add_waiter(thread, addr, size))
, m_lock(thread.mutex, std::adopt_lock) // must be locked in _add_waiter
{
}
void waiter_lock_t::wait()
{
while (!m_waiter->thread->unsignal())
// if another thread successfully called pred(), it must be set to null
while (m_waiter->pred)
{
// if pred() called by another thread threw an exception, it'll be rethrown
if (m_waiter->pred())
{
return;
@ -270,15 +263,6 @@ namespace vm
m_waiter->thread->cv.wait(m_lock);
}
// if another thread successfully called pred(), it must be set to null
if (m_waiter->pred)
{
// if pred() called by another thread threw an exception, rethrow it
m_waiter->pred();
throw EXCEPTION("Unexpected");
}
}
waiter_lock_t::~waiter_lock_t()