refactor(bindings/bench): make harness own IO #4847
+152
−247
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
maddeleine
reviewed
Oct 29, 2024
| @@ -0,0 +1,64 @@ | |||
| use std::{cell::RefCell, collections::VecDeque, io::ErrorKind, pin::Pin, rc::Rc}; | |||
| // This struct is used by Openssl and Rustls which both rely on a "stream" abstraction | ||
| // which implements read and write. This is not used by s2n-tls, which relies on | ||
| // lower level callbacks. | ||
| pub struct ViewIO { |
There was a problem hiding this comment.
Am I insane, how is the ViewIO struct different than the TestPairIO struct?
| @@ -325,93 +311,6 @@ where | |||
|
|
|||
| Ok(()) | |||
| } | |||
|
|
|||
| /// Shrink buffers owned by the connections | |||
| pub fn shrink_connection_buffers(&mut self) { | |||
There was a problem hiding this comment.
Why did we have these shrink functions? How are we able to just delete them without having issues?
goatgoose
reviewed
Oct 29, 2024
Comment on lines
+111
to
114
| conn_pair = TlsConnPair::<T, T>::from_configs( | ||
| CryptoConfig::default(), | ||
| HandshakeType::default(), | ||
| buffers.pop().unwrap(), |
There was a problem hiding this comment.
How does this work? Doesn't from_configs accept a client and server config?
Comment on lines
-364
to
-367
| // prevent (potentially slow) resizing of buffers for small data transfers, | ||
| // like with handshake | ||
| recv.borrow_mut().reserve(10000); | ||
| send.borrow_mut().reserve(10000); |
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.
Description of changes:
The goal of this PR is to reduce unnecessary abstraction.
Ideally the
S2NConnectionandOpenSSLConnectionstructs would just alias the raw types from the corresponding libraries, likes2n_tls::connection::Connection. This refactor is a step in that direction.Now the ConnPair owns that actual IO Stream, and connections are just handed references (views) to it. Note that I simply used reference counters
Rcrather than trying to thread lifetimes through everything.Testing:
All existing tests should continue to pass.
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.