RPCS3/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2024-11-22 10:42:36 +01:00
Code Issues Releases Wiki Activity

Fixup sys_event to check EBUSY only for PPU->PPU signals

Browse Source
This commit is contained in:
Elad 2024-10-31 20:17:37 +02:00
parent 5eb4691cd6
commit b87c891ec4
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
rpcs3/Emu/Cell/lv2/sys_event.cpp
View File

@ -145,18 +145,6 @@ CellError lv2_event_queue::send(lv2_event event, bool* notified_thread, lv2_even
return CELL_EBUSY; return CELL_EBUSY;
} }
if (port)
{
// Block event port disconnection for the time being of sending events
port->is_busy++;
ensure(notified_thread);
}
if (notified_thread)
{
*notified_thread = true;
}
if (type == SYS_PPU_QUEUE) if (type == SYS_PPU_QUEUE)
{ {
// Store event in registers // Store event in registers
@ -179,6 +167,15 @@ CellError lv2_event_queue::send(lv2_event event, bool* notified_thread, lv2_even
std::tie(ppu.gpr[4], ppu.gpr[5], ppu.gpr[6], ppu.gpr[7]) = event; std::tie(ppu.gpr[4], ppu.gpr[5], ppu.gpr[6], ppu.gpr[7]) = event;
awake(&ppu); awake(&ppu);
if (port && ppu.prio.load().prio < ensure(cpu_thread::get_current<ppu_thread>())->prio.load().prio)
{
// Block event port disconnection for the time being of sending events
// PPU -> lower prio PPU is the only case that can cause thread blocking
port->is_busy++;
ensure(notified_thread);
*notified_thread = true;
}
} }
else else
{ {
@ -763,7 +760,7 @@ error_code sys_event_port_send(u32 eport_id, u64 data1, u64 data2, u64 data3)
{ {
const u64 source = port.name ? port.name : (u64{process_getpid() + 0u} << 32) | u64{eport_id}; const u64 source = port.name ? port.name : (u64{process_getpid() + 0u} << 32) | u64{eport_id};
return port.queue->send(source, data1, data2, data3, &notified_thread, ppu ? &port : nullptr); return port.queue->send(source, data1, data2, data3, &notified_thread, ppu && port.queue->type == SYS_PPU_QUEUE ? &port : nullptr);
} }
return CELL_ENOTCONN; return CELL_ENOTCONN;
@ -774,7 +771,7 @@ error_code sys_event_port_send(u32 eport_id, u64 data1, u64 data2, u64 data3)
return CELL_ESRCH; return CELL_ESRCH;
} }
if (ppu && notified_thread) if (ppu && port->queue->type == SYS_PPU_QUEUE && notified_thread)
{ {
// Wait to be requeued // Wait to be requeued
if (ppu->test_stopped()) if (ppu->test_stopped())