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

Removed std::enable_shared_from_this

Browse source 
Minor ID manager refactoring
This commit is contained in:
Nekotekina 2016-07-24 02:56:03 +03:00
parent 09ae45c566
commit 7ccdea7822
10 changed files with 41 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

6
rpcs3/Emu/Cell/lv2/sys_mutex.cpp
View file

@ -18,7 +18,7 @@ void lv2_mutex_t::unlock(lv2_lock_t)
if (sq.size())
{
// pick new owner; protocol is ignored in current implementation
owner = std::static_pointer_cast<cpu_thread>(sq.front()->shared_from_this());
owner = idm::get<PPUThread>(sq.front()->id);
VERIFY(!owner->state.test_and_set(cpu_state::signal));
(*owner)->notify();
@ -127,7 +127,7 @@ s32 sys_mutex_lock(PPUThread& ppu, u32 mutex_id, u64 timeout)
// lock immediately if not locked
if (!mutex->owner)
{
mutex->owner = std::static_pointer_cast<cpu_thread>(ppu.shared_from_this());
mutex->owner = idm::get<PPUThread>(ppu.id);
return CELL_OK;
}
@ -202,7 +202,7 @@ s32 sys_mutex_trylock(PPUThread& ppu, u32 mutex_id)
}
// own the mutex if free
mutex->owner = std::static_pointer_cast<cpu_thread>(ppu.shared_from_this());
mutex->owner = idm::get<PPUThread>(ppu.id);
return CELL_OK;
}