Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ResourcePack: dont scan for individual files #10960

Merged
merged 1 commit into from Aug 24, 2022

Conversation

shuffle2
Copy link
Contributor

@shuffle2 shuffle2 commented Aug 6, 2022

walking the zip prevents minizip from re-reading the same
data repeatedly from the actual backing filesystem.
also improves most usages of minizip to allow for >4GB,
files altho we probably don't need it

drops time to "install" https://forums.dolphin-emu.org/Thread-sonic-adventure-2-battle-hd-project-v2-3-june-21-2019 from 9:30 (MINUTES) to 25 seconds (which is still pretty slow imo).

fwiw i tested also with the buffered minizip layer, and there's no speedup. likely because we just read the entire file once. there might be further speedup by decoupling the read + write operations (so it's not serialized), but meh.

walking the zip prevents minizip from re-reading the same
data repeatedly from the actual backing filesystem.
also improves most usages of minizip to allow for >4GB,
files altho we probably don't need it
@Pokechu22
Copy link
Contributor

Could you split the >4GB file change into a separate commit from the file scanning change? I'm not familiar with the resource pack code (or minizip as a library) so it's a bit hard to tell what's part of what.

@shuffle2
Copy link
Contributor Author

I think this PR is ready to merge, and I'm not going to spend time to split the commits for review purposes 🤷

@AdmiralCurtiss
Copy link
Contributor

Seems fine.

@AdmiralCurtiss AdmiralCurtiss merged commit e5cfa28 into dolphin-emu:master Aug 24, 2022
11 checks passed
@shuffle2 shuffle2 deleted the mz branch October 21, 2022 22:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
4 participants