Skip to content

Maybe fix race condition with archive file#2389

Merged
fenhl merged 10 commits into
OoTRandomizer:Devfrom
CMuncey:Dev
Dec 15, 2025
Merged

Maybe fix race condition with archive file#2389
fenhl merged 10 commits into
OoTRandomizer:Devfrom
CMuncey:Dev

Conversation

@CMuncey

@CMuncey CMuncey commented Mar 14, 2025

Copy link
Copy Markdown

Update how we're handling archive files in the compressor, tie the archive data to the dma table entry instead of just relying on a number being incremented.

@cjohnson57 cjohnson57 added Type: Bug Something isn't working Status: Waiting for Author Changes or response requested Component: ASM/C Changes some internals of the ASM/C libraries labels Mar 15, 2025
@cjohnson57

Copy link
Copy Markdown
Collaborator

What needs to happen for this to come out of the draft stage?

@fenhl fenhl added Status: Waiting for Maintainers and removed Status: Waiting for Author Changes or response requested labels Nov 22, 2025
@fenhl fenhl marked this pull request as ready for review November 23, 2025 06:21
@fenhl fenhl added the Status: Needs Review Someone should be looking at it label Nov 23, 2025

@rrealmuto rrealmuto left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This new compressor routine looks like it properly addresses the previous race condition. My only concern is regarding changing the format of the ARCHIVE.bin file which will invalidate existing ARCHIVE.bin files and prevent the compressor from working correctly until the file is deleted. This mostly affects developers who will likely be using the same ARCHIVE.bin file across multiple branches checked out w/ git. I proposed a few recommendations to address this which I suggest we do before merging.

Other than just just a few minor cleanup things.

Comment thread bin/Compress/README.md Outdated
Comment thread bin/Compress/src/compressor.c Outdated
Comment thread bin/Compress/src/compressor.c Outdated
Comment thread bin/Compress/src/compressor.c Outdated
@fenhl fenhl added the Status: Waiting for Author Changes or response requested label Dec 1, 2025
@fenhl fenhl removed the Status: Waiting for Author Changes or response requested label Dec 5, 2025
@fenhl fenhl requested a review from rrealmuto December 5, 2025 17:35
@fenhl fenhl removed the Status: Needs Review Someone should be looking at it label Dec 15, 2025
@fenhl fenhl added this to the next milestone Dec 15, 2025
@fenhl fenhl merged commit 7fbc0db into OoTRandomizer:Dev Dec 15, 2025
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Component: ASM/C Changes some internals of the ASM/C libraries Type: Bug Something isn't working

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants