Don't ScheduleEvent from wrong thread when inserting SD card #3989
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
JosJuice
force-pushed
the
insert-sd-thread
branch
from
fab4352
to
5d391ca
Compare
|
The race condition where we modify m_WiiSDCard from the UI thread, then access it from the CPU thread seems more important... we really need some sort of centralized system for handling configuration changes while a game is running. I guess this change is fine as-is for the moment. |
JosJuice
force-pushed
the
insert-sd-thread
branch
from
5d391ca
to
9b9ad08
Compare
|
I've added a comment about the problems so they won't get completely forgotten if the code gets merged in its current state. |
JosJuice
force-pushed
the
insert-sd-thread
branch
from
9b9ad08
to
b960b56
Compare
|
LGTM |
|
Reviewed 2 of 2 files at r3. Comments from Reviewable |
|
LGTM |
| void SDIO_EventNotify_CPUThread(u64 userdata, s64 cycles_late) | ||
| { | ||
| auto device = | ||
| static_cast<CWII_IPC_HLE_Device_sdio_slot0*>(GetDeviceByName("/dev/sdio/slot0").get()); |
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
This comment was marked as off-topic.
This comment was marked as off-topic.
Sorry, something went wrong.
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.
Suggestion cannot be applied right now. Please check back later.
/dev/sdio/slot0's EventNotify was being called from the UI thread even though it only should be called from the CPU thread for thread safety reasons. With this PR, the UI thread instead schedules an event that will call EventNotify on the CPU thread.
There is a potential race condition if IsRunning becomes false right after my newly added call to IsRunning, which can end up adding an event to CoreTiming after it has shut down. It's unlikely to occur in practice, and the old code had the same problem (with GetDeviceByName as the equivalent of IsRunning), but it's still a race condition. I'm not sure what to do about it. Suggestions?
This change is