Derivation building goal simplify -- no goto
#13905
Merged
Conversation
This file contains hidden or 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
Do this with a new `useHook` boolean we carefully make sure is set in all cases. This change isn't really worthwhile by itself, but it allows us to make further refactors (see later commits) which are well-motivated.
This will make it easier to convert somethings to RAII.
It doesn't need to be a field any more, because we just use it with two loops.
We don't need to keep doing this every loop iteration, hook stuff it is only set above.
Ericson2314
force-pushed
the
derivation-building-goal-simplify-0
branch
from
d7be7fb to
c6ba120
Compare
There was a problem hiding this comment.
Pull Request Overview
This PR refactors the derivation building goal to simplify the control flow by eliminating the controversial goto statement, consolidating the hook and local build paths into a single function flow.
- Inlines the
hookDone()coroutine andstarted()function into the maintryToBuild()flow - Moves hook machine name tracking from the goal to the
HookInstancestruct - Converts the hook build path from a separate coroutine to inline logic with a loop structure
Reviewed Changes
Copilot reviewed 3 out of 3 changed files in this pull request and generated 3 comments.
| File | Description |
|---|---|
src/libstore/unix/include/nix/store/build/hook-instance.hh |
Adds documentation and machineName field to HookInstance struct |
src/libstore/include/nix/store/build/derivation-building-goal.hh |
Removes hook-related member variables and methods, moves constructor/destructor to public |
src/libstore/build/derivation-building-goal.cc |
Refactors tryToBuild() to inline hook logic, removes separate hookDone() coroutine |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
Mic92
approved these changes
Sep 3, 2025
Exactly why is is correct is a little subtle, because sometimes the worker is owned by the worker. But the commit message in e437b08 explained the situation well enough: I made that commit message part of the ABI docs, and now it should be understandable to the next person.
…`tryToBuild` Will help us make this a local variable.
Also inline `assertPathValidity` in the process.
Ericson2314
force-pushed
the
derivation-building-goal-simplify-0
branch
from
5de69f7 to
a30bf96
Compare
Mic92
approved these changes
Sep 3, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Motivation
The first few commits of #13865 before the
gotothat would be controversial.Context
Add 👍 to pull requests you find important.
The Nix maintainer team uses a GitHub project board to schedule and track reviews.