Option for reader #52
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
Thanks to @djmitche for making me look at this again!
djmitche
reviewed
Nov 10, 2023
Comment on lines
+386
to
397
| let mut reading_stuff = state.reader.take(); | ||
| // Is there read in progress? | ||
| while read_in_progress { | ||
| while reading_stuff.is_none() { | ||
| // - If yes, release CACHE mutex, WAIT on condvar atomically | ||
| state = self.read_completed.wait(state).unwrap(); | ||
| // check cache again | ||
| if let Some(bytes_read_from_cache) = state.read_from_cache(pos, buf) { | ||
| log::debug!("Deferred cache success"); | ||
| return Ok(bytes_read_from_cache); | ||
| } | ||
| read_in_progress = state.read_in_progress; | ||
| reading_stuff = state.reader.take(); | ||
| } |
There was a problem hiding this comment.
It might be worth encapsulating this into a State method or other utility, in such a way that it uses RAII to put the value back. It's almost 100 lines later that this value is returned to the Option!
There was a problem hiding this comment.
I like that idea! Will do
There was a problem hiding this comment.
I had a crack at this but it turned out I didn't like the results so much. I prefer the current explicit step since then it's obvious that we put back the reading stuff before releasing the mutex. I fiddled around a bit with RAII guards and with a .with_reading_stuff(FnOnce) type arrangement but neither was sufficiently delightful.
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.
Relates to #50.