Optimised extend #127
Draft
Optimised extend #127
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
|
🚀 Deployed on https://65059694ca32910d0ff42051--ringbuffer.netlify.app |
src/ringbuffer_trait.rs
Outdated
| /// | ||
| /// Depending on the RingBuffer implementation, may be faster than inserting items in a loop | ||
| /// | ||
| /// Note that this function is same as [`extend`] except that it is |
There was a problem hiding this comment.
Is this actually specialized now or will it be?
There was a problem hiding this comment.
in constgeneric yes
src/ringbuffer_trait.rs
Outdated
| where | ||
| T: Default, | ||
| where | ||
| T: Default, |
src/with_const_generics.rs
Outdated
| { | ||
| #[allow(clippy::let_unit_value)] | ||
| let _ = Self::ERROR_CAPACITY_IS_NOT_ALLOWED_TO_BE_ZERO; | ||
| let _ = Self::ERROR_CAPACITY_IS_NOT_ALLOWED_TO_BE_ZERO; |
src/with_const_generics.rs
Outdated
| @@ -418,6 +634,94 @@ mod tests { | |||
| } | |||
| } | |||
|
|
|||
| struct WeirdIterator<T: IntoIterator>(<T as IntoIterator>::IntoIter, SizeHint); | |||
|
All improvements are over a baseline of extend-by-push Batch Size = 1Batch size = 32Batch size = 256Batch size = 1024Binary search to a good batch Size; Batch size = 64Batch size = 16Batch size = 30 |
|
Although surprising to me, a batch size of 30 seems to work very well for large extends when the buffer does not start out empty. This feature is now behind a feature flag, since technically it's not 100% tested but it seems to perform very well in all tests I could throw at it. |
jdonszelmann
force-pushed
the
optimised_extend
branch
from
7568202
to
cf0437d
Compare
| // Safety: clear above | ||
| unsafe { self.finish_iter::<BATCH_SIZE>(iter) }; | ||
| } else if self.is_empty() { | ||
| self.clear(); |
There was a problem hiding this comment.
I think you can move this into finish_iter and make it safe. Maybe rename it to new_from_iter or something.
| self.clear(); | ||
|
|
||
| // Safety: clear above | ||
| unsafe { self.finish_iter::<BATCH_SIZE>(iter) }; |
There was a problem hiding this comment.
Why is this not extend_batched_internal?
| // repeat until we find an empty batch | ||
| loop { | ||
| // fill up a batch | ||
| let how_full = Self::fill_batch(&mut batch, &mut other); |
There was a problem hiding this comment.
I think the code might be simpler if you fill the batch with min(BATCH_SIZE, CAP - len) instead. Then you never have to split the batch up and stuff.
If I understand correctly, finish_iter is necessary because you need the writeptr not to be equal to readptr or something? Maybe if you do the min thing, that might not be necessary? In any case, might be nice to document why and in what cases you need finish_iter.
There was a problem hiding this comment.
No wait, I mean min(BATCH_SIZE, CAP - mod(writeptr, CAP)) I think. Whatever the number is of elements that fit until the end of the allocated space. So you don't have to split.
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.
#123 @codehobbyist06
Closes #124