Make sure we don't multithread libzip access #16680
Merged
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
We can't have two threads seeking on the same fd at the same time.
We can't read multiple at once.
|
Wow, this seems quite obvious now... But just didn't think about it, heh. |
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.
Since it uses a shared fd, of course we can't allow it to be used from two threads at once. I suspect this is the cause of #16642 and it could even be one of the mysteries in #16601.
Could use a bit more thorough testing, though. I didn't really try to replicate #16642 and more made sure it still loads textures.
I thought about opening multiple zips per thread, but because of our bestest friend scoped storage, I suspect that would be slower than just locking during the zip read. We still png/zim decode concurrently.
-[Unknown]