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

Make command infra less stateful and more regular #7750

Merged
merged 1 commit into from Mar 15, 2023

Conversation

Ericson2314
Copy link
Member

@Ericson2314 Ericson2314 commented Feb 4, 2023

Motivation

Already, we had classes like BuiltPathsCommand and StorePathsCommand which provided alternative run virtual functions providing the implementation with more arguments. This was a very nice and easy way to make writing command; just fill in the virtual functions and it is fairly clear what to do.

However, exception to this pattern were Installable{,s}Command. These two classes instead just had a field where the installables would be stored, and various side-effecting prepare and load machinery too fill them in. Command would wish out those fields.

This isn't so clear to use.

What this commit does is make those command classes like the others, with richer run functions.

Not only does this restore the pattern making commands easier to write, it has a number of other benefits:

  • prepare and load are gone entirely! One command just hands just hands off to the next.

  • useDefaultInstallables because defaultInstallables. This takes over prepare for the one case that needs it, and provides enough flexiblity to handle nix repl's idiosyncratic migration.

  • We can use ref instead of std::shared_ptr. The former must be initialized (so it is like Rust's Box rather than Option<Box>, This expresses the invariant that the installable are in fact initialized much better.

    This is possible because since we just have local variables not fields, we can stop worrying about the not-yet-initialized case.

  • Fewer lines of code! (Finally I have a large refactor that makes the number go down not up...)

  • nix repl is now implemented in a clearer way.

The last item deserves further mention. nix repl is not like the other installable commands because instead working from once-loaded installables, it needs to be able to load them again and again.

To properly support this, we make a new superclass RawInstallablesCommand. This class has the argument parsing and completion logic, but does not hand off parsed installables but instead just the raw string arguments.

This is exactly what nix repl needs, and allows us to instead of having the logic awkwardly split between prepare, useDefaultInstallables, and load, have everything right next to each other. I think this will enable future simplifications of that argument defaulting logic, but I am saving those for a future PR --- best to keep code motion and more complicated boolean expression rewriting separate steps.

The "diagnostic ignored -Woverloaded-virtual" pragma helps because C++ doesn't like our many run methods. In our case, we don't mind the shadowing it all --- it is intentional that the derived class only provides a run method, and doesn't call any of the overridden run methods.

Context

Helps with NixOS/rfcs#134

Depends on #7748

Checklist for maintainers

Maintainers: tick if completed or explain if not relevant

  • agreed on idea
  • agreed on implementation strategy
  • tests, as appropriate
    • functional tests - tests/**.sh
    • unit tests - src/*/tests
    • integration tests - tests/nixos/*
  • documentation in the manual
  • code and comments are self-explanatory
  • commit message explains why the change was made
  • new feature or bug fix: updated release notes

@Ericson2314 Ericson2314 changed the title No args prepare Make command infra less stateful and more regular Feb 4, 2023
@Ericson2314 Ericson2314 marked this pull request as draft February 4, 2023 18:28
@Ericson2314 Ericson2314 mentioned this pull request Feb 20, 2023
10 tasks
@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/2023-02-17-nix-team-meeting-minutes-33/25624/1

@dpulls
Copy link

dpulls bot commented Feb 20, 2023

🎉 All dependencies have been resolved !

@Ericson2314
Copy link
Member Author

This is the next one for RFC 134. I assigned @edolstra too in addition to @tomberek because @edolstra expressed an interest in reviewing these at some point, and since this one is a good bit bigger it could probably use a second pair of eyes reviewing anyways.

Copy link
Contributor

@tomberek tomberek left a comment

Choose a reason for hiding this comment

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

Makes the flow of command processing more clear. Less state and more explicit passing of values.

@thufschmitt thufschmitt added the contributor-experience Developer experience for Nix contributors label Feb 27, 2023
@Ericson2314 Ericson2314 marked this pull request as draft March 6, 2023 14:52
@Ericson2314 Ericson2314 force-pushed the no-args-prepare branch 3 times, most recently from 459b196 to 98235f9 Compare March 7, 2023 23:07
@Ericson2314 Ericson2314 marked this pull request as ready for review March 7, 2023 23:37
@Ericson2314
Copy link
Member Author

The macOS output seems a bit out of order? at least I am trouble reading it.

Regardless, I think this is ready for review. I don't anticipate needing to change it much to fix this error.

@Ericson2314
Copy link
Member Author

(Ah good, it went away)

@nixos-discourse
Copy link

This pull request has been mentioned on NixOS Discourse. There might be relevant details there:

https://discourse.nixos.org/t/2023-03-10-nix-team-meeting-minutes-39/26279/1

src/libcmd/command.cc Outdated Show resolved Hide resolved
src/libcmd/command.hh Outdated Show resolved Hide resolved
@edolstra
Copy link
Member

Could we use -Wno-overloaded-virtual to shut up the compiler?

@Ericson2314
Copy link
Member Author

Ericson2314 commented Mar 15, 2023

Could we use -Wno-overloaded-virtual to shut up the compiler?

I added a pramga for that. I can't do the push-pop thing very well because the warning would also apply in every single sub-command, as opposed to just the run in the header. But it is still better than just, say, adding the flag to CXXFLAGS.

It says pragma gcc, but It works with Clang too :).

Thanks for the review!

Already, we had classes like `BuiltPathsCommand` and `StorePathsCommand`
which provided alternative `run` virtual functions providing the
implementation with more arguments. This was a very nice and easy way to
make writing command; just fill in the virtual functions and it is
fairly clear what to do.

However, exception to this pattern were `Installable{,s}Command`. These
two classes instead just had a field where the installables would be
stored, and various side-effecting `prepare` and `load` machinery too
fill them in. Command would wish out those fields.

This isn't so clear to use.

What this commit does is make those command classes like the others,
with richer `run` functions.

Not only does this restore the pattern making commands easier to write,
it has a number of other benefits:

- `prepare` and `load` are gone entirely! One command just hands just
  hands off to the next.

- `useDefaultInstallables` because `defaultInstallables`. This takes
  over `prepare` for the one case that needs it, and provides enough
  flexiblity to handle `nix repl`'s idiosyncratic migration.

- We can use `ref` instead of `std::shared_ptr`. The former must be
  initialized (so it is like Rust's `Box` rather than `Option<Box>`,
  This expresses the invariant that the installable are in fact
  initialized much better.

  This is possible because since we just have local variables not
  fields, we can stop worrying about the not-yet-initialized case.

- Fewer lines of code! (Finally I have a large refactor that makes the
  number go down not up...)

- `nix repl` is now implemented in a clearer way.

The last item deserves further mention. `nix repl` is not like the other
installable commands because instead working from once-loaded
installables, it needs to be able to load them again and again.

To properly support this, we make a new superclass
`RawInstallablesCommand`. This class has the argument parsing and
completion logic, but does *not* hand off parsed installables but
instead just the raw string arguments.

This is exactly what `nix repl` needs, and allows us to instead of
having the logic awkwardly split between `prepare`,
`useDefaultInstallables,` and `load`, have everything right next to each
other. I think this will enable future simplifications of that argument
defaulting logic, but I am saving those for a future PR --- best to keep
code motion and more complicated boolean expression rewriting separate
steps.

The "diagnostic ignored `-Woverloaded-virtual`" pragma helps because C++
doesn't like our many `run` methods. In our case, we don't mind the
shadowing it all --- it is *intentional* that the derived class only
provides a `run` method, and doesn't call any of the overridden `run`
methods.

Helps with NixOS/rfcs#134
@Ericson2314 Ericson2314 merged commit eb56cb7 into NixOS:master Mar 15, 2023
8 checks passed
@Ericson2314 Ericson2314 deleted the no-args-prepare branch March 15, 2023 21:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
contributor-experience Developer experience for Nix contributors
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

None yet

5 participants