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

sys_event_queue: Fix forced event queue destruction

Browse source 
Add missing last existence check at sys_spu_thread_(try)receive_event and lv2_event_queue::send.
This commit is contained in:
Eladash 2020-05-02 11:22:28 +03:00 • committed by Ivan
parent 37ce7056ac
commit edde748519
5 changed files with 39 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

20
rpcs3/Emu/Cell/lv2/sys_event.cpp
View file

@ -43,20 +43,25 @@ bool lv2_event_queue::check(const std::shared_ptr<lv2_event_queue>& sptr)
return sptr && sptr->exists;
}
bool lv2_event_queue::send(lv2_event event)
CellError lv2_event_queue::send(lv2_event event)
{
std::lock_guard lock(mutex);
if (!exists)
{
return CELL_ENOTCONN;
}
if (sq.empty())
{
if (events.size() < this->size + 0u)
{
// Save event
events.emplace_back(event);
return true;
return {};
}
return false;
return CELL_EBUSY;
}
if (type == SYS_PPU_QUEUE)
@ -85,7 +90,7 @@ bool lv2_event_queue::send(lv2_event event)
spu.notify();
}
return true;
return {};
}
error_code sys_event_queue_create(vm::ptr<u32> equeue_id, vm::ptr<sys_event_queue_attribute_t> attr, u64 event_queue_key, s32 size)
@ -514,12 +519,7 @@ error_code sys_event_port_send(u32 eport_id, u64 data1, u64 data2, u64 data3)
{
const u64 source = port.name ? port.name : (s64{process_getpid()} << 32) | u64{eport_id};
if (queue->send(source, data1, data2, data3))
{
return {};
}
return CELL_EBUSY;
return queue->send(source, data1, data2, data3);
}
return CELL_ENOTCONN;