ShuriZma
/
xenia-canary
mirror of https://github.com/xenia-canary/xenia-canary.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[Input System] xe_mutex revert 

On request from chrisps, revert xe_mutex back to xe_unlikely_mutex to avoid mutex deadlocks while initializing hid-winkey.
This commit is contained in:
beeanyew 2022-09-18 15:18:29 +02:00
parent a29a7436e0
commit cd17f1846f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/xenia/hid/input_system.cc
View File

@ -137,8 +137,8 @@ X_INPUT_VIBRATION InputSystem::ModifyVibrationLevel(
modified_vibration.right_motor_speed = 0; modified_vibration.right_motor_speed = 0;
return modified_vibration; return modified_vibration;
} }
std::unique_lock<xe_mutex> InputSystem::lock() { std::unique_lock<xe_unlikely_mutex> InputSystem::lock() {
return std::unique_lock<xe_mutex>{lock_}; return std::unique_lock<xe_unlikely_mutex>{lock_};
} }
} // namespace hid } // namespace hid
} // namespace xe } // namespace xe

4
src/xenia/hid/input_system.h
View File

@ -48,7 +48,7 @@ class InputSystem {
void UpdateUsedSlot(uint8_t slot, bool connected); void UpdateUsedSlot(uint8_t slot, bool connected);
uint8_t GetConnectedSlots() const { return connected_slot; } uint8_t GetConnectedSlots() const { return connected_slot; }
std::unique_lock<xe_mutex> lock(); std::unique_lock<xe_unlikely_mutex> lock();
private: private:
xe::ui::Window* window_ = nullptr; xe::ui::Window* window_ = nullptr;
@ -57,7 +57,7 @@ class InputSystem {
X_INPUT_VIBRATION ModifyVibrationLevel(X_INPUT_VIBRATION* vibration); X_INPUT_VIBRATION ModifyVibrationLevel(X_INPUT_VIBRATION* vibration);
uint8_t connected_slot = 0b0001; uint8_t connected_slot = 0b0001;
xe_mutex lock_; xe_unlikely_mutex lock_;
}; };
} // namespace hid } // namespace hid