HookableEvent: Use std::recursive_mutex instead of std::mutex #11720
+1
−1
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes a crash when recording fifologs, as the mutex is acquired when BPWritten calls AfterFrameEvent::Trigger, but then acquired again when FifoRecorder::EndFrame calls m_end_of_frame_event.reset(). std::mutex does not allow calling lock() if the thread already owns the mutex, while std::recursive_mutex does allow this. This is a regression from dolphin-emu#11522 (which introduced the HookableEvent system).
|
I was able to record a FifoLog after this change, unsure about rest of the usages, but I wasn't seeing anything obvious. |
|
Personally I see no reason for this to not be a recursive mutex, unless this was intended as some protection so you can't register/unregister events during a callback? I'm guessing not though. |
|
I'm just gonna merge this since it fixes a known crash... |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
This fixes a crash when recording fifologs, as the mutex is acquired when
BPWrittencallsAfterFrameEvent::Trigger, but then acquired again whenFifoRecorder::EndFramecallsm_end_of_frame_event.reset().std::mutexdoes not allow callinglock()if the thread already owns the mutex, whilestd::recursive_mutexdoes allow this.This is a regression from #11522 (which introduced the HookableEvent system).