mirror/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-03-29 22:20:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

sys_spu: weak_ptr -> shared_ptr

Browse Source
This commit is contained in:
Eladash 2021-05-14 15:24:41 +03:00 committed by Ivan
parent a992a5fba9
commit 47436bd774
2 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rpcs3/Emu/Cell/lv2/sys_spu.cpp
View File

@ -1428,7 +1428,7 @@ error_code sys_spu_thread_group_connect_event(ppu_thread& ppu, u32 id, u32 eq, u
return CELL_EINVAL; return CELL_EINVAL;
} }
const auto queue = idm::get<lv2_obj, lv2_event_queue>(eq); auto queue = idm::get<lv2_obj, lv2_event_queue>(eq);
std::lock_guard lock(group->mutex); std::lock_guard lock(group->mutex);
@ -1443,7 +1443,7 @@ error_code sys_spu_thread_group_connect_event(ppu_thread& ppu, u32 id, u32 eq, u
return CELL_ESRCH; return CELL_ESRCH;
} }
*ep = queue; *ep = std::move(queue);
return CELL_OK; return CELL_OK;
} }

27
rpcs3/Emu/Cell/lv2/sys_spu.h
View File

@ -293,9 +293,9 @@ struct lv2_spu_group
std::array<std::pair<u32, std::vector<sys_spu_segment>>, 8> imgs; // Entry points, SPU image segments std::array<std::pair<u32, std::vector<sys_spu_segment>>, 8> imgs; // Entry points, SPU image segments
std::array<std::array<u64, 4>, 8> args; // SPU Thread Arguments std::array<std::array<u64, 4>, 8> args; // SPU Thread Arguments
std::weak_ptr<lv2_event_queue> ep_run; // port for SYS_SPU_THREAD_GROUP_EVENT_RUN events std::shared_ptr<lv2_event_queue> ep_run; // port for SYS_SPU_THREAD_GROUP_EVENT_RUN events
std::weak_ptr<lv2_event_queue> ep_exception; // TODO: SYS_SPU_THREAD_GROUP_EVENT_EXCEPTION std::shared_ptr<lv2_event_queue> ep_exception; // TODO: SYS_SPU_THREAD_GROUP_EVENT_EXCEPTION
std::weak_ptr<lv2_event_queue> ep_sysmodule; // TODO: SYS_SPU_THREAD_GROUP_EVENT_SYSTEM_MODULE std::shared_ptr<lv2_event_queue> ep_sysmodule; // TODO: SYS_SPU_THREAD_GROUP_EVENT_SYSTEM_MODULE
lv2_spu_group(std::string name, u32 num, s32 prio, s32 type, lv2_memory_container* ct, bool uses_scheduler, u32 mem_size) lv2_spu_group(std::string name, u32 num, s32 prio, s32 type, lv2_memory_container* ct, bool uses_scheduler, u32 mem_size)
: name(std::move(name)) : name(std::move(name))
@ -318,28 +318,19 @@ struct lv2_spu_group
threads_map.fill(-1); threads_map.fill(-1);
} }
void send_run_event(u64 data1, u64 data2, u64 data3) const CellError send_run_event(u64 data1, u64 data2, u64 data3) const
{ {
if (const auto queue = ep_run.lock()) return ep_run ? ep_run->send(SYS_SPU_THREAD_GROUP_EVENT_RUN_KEY, data1, data2, data3) : CELL_ENOTCONN;
{
queue->send(SYS_SPU_THREAD_GROUP_EVENT_RUN_KEY, data1, data2, data3);
}
} }
void send_exception_event(u64 data1, u64 data2, u64 data3) const CellError send_exception_event(u64 data1, u64 data2, u64 data3) const
{ {
if (const auto queue = ep_exception.lock()) return ep_exception ? ep_exception->send(SYS_SPU_THREAD_GROUP_EVENT_EXCEPTION_KEY, data1, data2, data3) : CELL_ENOTCONN;
{
queue->send(SYS_SPU_THREAD_GROUP_EVENT_EXCEPTION_KEY, data1, data2, data3);
}
} }
void send_sysmodule_event(u64 data1, u64 data2, u64 data3) const CellError send_sysmodule_event(u64 data1, u64 data2, u64 data3) const
{ {
if (const auto queue = ep_sysmodule.lock()) return ep_sysmodule ? ep_sysmodule->send(SYS_SPU_THREAD_GROUP_EVENT_SYSTEM_MODULE_KEY, data1, data2, data3) : CELL_ENOTCONN;
{
queue->send(SYS_SPU_THREAD_GROUP_EVENT_SYSTEM_MODULE_KEY, data1, data2, data3);
}
} }
static std::pair<named_thread<spu_thread>*, std::shared_ptr<lv2_spu_group>> get_thread(u32 id); static std::pair<named_thread<spu_thread>*, std::shared_ptr<lv2_spu_group>> get_thread(u32 id);