Add Selector::send_or_else to get the message back if not sent#180
Open
rumpuslabs wants to merge 2 commits into
Open
Add Selector::send_or_else to get the message back if not sent#180rumpuslabs wants to merge 2 commits into
Selector::send_or_else to get the message back if not sent#180rumpuslabs wants to merge 2 commits into
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
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.
All the send methods in
flumereturn an error type that gives you your original message back if it was not sent, except forSelectError. This makes sense becauseSelectError::Timeoutmight be caused by multiple send operations all timing out, or none if theSelectoronly has receives.I wanted to wrap my existing
flume-basedAPI with a hidden interruptor channel, to allow blocking waits to be terminated early. So I was transforming what was previously calls toSender::send_*intoSelector::new().send(...).recv(&INTERRUPT_CHANNEL).wait_*, but this meant I could no longer get my original message back in the case of timeouts or interruptions.My first attempt to fix this involved wrapping the message in an
Arc<Mutex<Option<T>>>to allow me to claw it back if it wasn't claimed by the receiving end of the channel, which ran into an annoyance where I had toclone()the Arc in theSelector::send()closure because it wasFnMutinstead ofFnOnce. The first commit in this PR fixes this issue. Since allFnMutclosures are subtypes ofFnOncethis is a non-breaking change toflume's API.I didn't like the extra cost of the
Arc<Mutex<...>>so I hypothesised a way to get my message back via a different closure if thesendbranch wasn't taken. That is the second commit in this PR (also a non-breaking change, adding a new method toSelector).This allowed me to write: