Fewer processes and Senders
#49
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
9999years
reviewed
Aug 25, 2023
Gabriella439
force-pushed
the
gabriella/no_stdout_process_2
branch
from
9319eee
to
46837ae
Compare
Gabriella439
changed the title
SendersSenders
9999years
reviewed
Aug 28, 2023
9999years
reviewed
Aug 28, 2023
src/ghci/stdout.rs
Outdated
| @@ -203,20 +128,17 @@ impl GhciStdout { | |||
| } | |||
|
|
|||
| #[instrument(skip_all, level = "debug")] | |||
| async fn show_modules(&mut self, sender: oneshot::Sender<ModuleSet>) -> miette::Result<()> { | |||
| pub async fn show_modules(&mut self) -> miette::Result<ModuleSet> { | |||
There was a problem hiding this comment.
Suggested change
| pub async fn show_modules(&mut self) -> miette::Result<ModuleSet> { | |
| pub fn show_modules(&mut self) -> miette::Result<ModuleSet> { |
Can be synchronous.
There was a problem hiding this comment.
I think this async is still necessary. There's a .await in this function
9999years
requested changes
Aug 28, 2023
This change does not borrow-check but this is to show the first step of this refactor which is to remove the process and the corresponding event channel.
The overall approach I took was to give the `Ghci` struct ownership of the `stdout` value and have all of the `GhciStdin` methods that need it borrow it mutably. This makes the `GhciStdin` methods more verbose (they now need an explicit `stdout` parameter which needs to be threaded throughout), but the long-term goal is that this will be a net simplification when we can get rid of the sender/receiver channels completely.
This is where the major compression kicks in. Now that we don't have separate processes we can remove the use of `Sender`s for passing the result and pass it directly using Rust's built-in support for `async` chaining.
Gabriella439
force-pushed
the
gabriella/no_stdout_process_2
branch
from
46837ae
to
4cd9f78
Compare
… as caught by @9999years
9999years
approved these changes
Aug 28, 2023
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.
The main motivation for this change was to remove
Sender-based result-passing in favor of passing values directly through return values. However, in order to do this I had to remove the subprocesses that were managingGhciStdoutandGhciStderr.The basic approach I used to make this work and appease the borrow-checker was:
Ghcistruct own all three ofstdin/stdout/stderrI think there's actually a better way to do this that doesn't require as much parameter passing, which is to move the methods on
GhciStdin/GhciStdout/GhciStderrto become methods onGhci, but I'll save that for a separate refactor since this change was already starting to get a big large. I picked this approach for my first pass since it led to the smallest diff for ease of review.Then once I finished that refactor I was able get rid of all the
Sender-related logic and instead pass the results that would have normally been passed viaSenders via the function's return value instead. If you squint you can sort of think of this as analogous to converting code from "continuation-passing style" to "direct style".The only
SenderI didn't get rid of wasSyncSentinelsince I'm trying to keep this PR focused on justGhci{Stdin,Stdout,Stderr}.