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

cellGem: lock tracker mutex in get_info

Browse Source 
This may reduce the possibility of unexpected tracking results
This commit is contained in:
Megamouse 2024-12-12 02:23:01 +01:00
parent 49081d0d82
commit f96cfe08f4
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
rpcs3/Emu/Cell/Modules/cellGem.cpp
View File

@ -716,8 +716,9 @@ public:
return hue < m_hues.size() && m_hues[hue] < 20; // potentially true if less than 20 pixels have the hue return hue < m_hues.size() && m_hues[hue] < 20; // potentially true if less than 20 pixels have the hue
} }
ps_move_info& get_info(u32 gem_num) ps_move_info get_info(u32 gem_num)
{ {
std::lock_guard lock(mutex);
return ::at32(m_info, gem_num); return ::at32(m_info, gem_num);
} }
@ -1116,8 +1117,8 @@ static void ps_move_pos_to_gem_state(u32 gem_num, gem_config::gem_controller& co
return; return;
} }
auto& tracker = g_fxo->get<named_thread<gem_tracker>>(); // Let's not lock the mutex. This not really important here auto& tracker = g_fxo->get<named_thread<gem_tracker>>();
const ps_move_info& info = tracker.get_info(gem_num); const ps_move_info info = tracker.get_info(gem_num);
if constexpr (std::is_same_v<T, vm::ptr<CellGemState>>) if constexpr (std::is_same_v<T, vm::ptr<CellGemState>>)
{ {
@ -2147,8 +2148,8 @@ error_code cellGemGetState(u32 gem_num, u32 flag, u64 time_parameter, vm::ptr<Ce
{ {
case move_handler::real: case move_handler::real:
{ {
auto& tracker = g_fxo->get<named_thread<gem_tracker>>(); // Let's not lock the mutex. This not really important here auto& tracker = g_fxo->get<named_thread<gem_tracker>>();
const ps_move_info& info = tracker.get_info(gem_num); const ps_move_info info = tracker.get_info(gem_num);
ds3_input_to_pad(gem_num, gem_state->pad.digitalbuttons, gem_state->pad.analog_T); ds3_input_to_pad(gem_num, gem_state->pad.digitalbuttons, gem_state->pad.analog_T);
ps_move_pos_to_gem_state(gem_num, controller, gem_state); ps_move_pos_to_gem_state(gem_num, controller, gem_state);