Skip to content

websocket/stream: Avoid memory allocations on flushing #325

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lexnv merged 4 commits into from
Feb 18, 2025
Merged

websocket/stream: Avoid memory allocations on flushing #325

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fca7300
websocket/stream: Avoid memory allocations on flushing
lexnv Feb 13, 2025
f2275dd
websocket/stream: Increase buffer capacity from 2000 to 8192
lexnv Feb 13, 2025
3244d63
websocket/stream: Shrink to fit based on capacity to bound growth
lexnv Feb 17, 2025
48605c0
Merge branch 'master' into lexnv/optimize-stream
lexnv Feb 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions src/transport/websocket/stream.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@ use std::{

// TODO: add tests

const DEFAULT_BUF_SIZE: usize = 8 * 1024;

/// Send state.
enum State {
/// State is poisoned.
Expand Down Expand Up @@ -70,7 +72,7 @@ impl<S: AsyncRead + AsyncWrite + Unpin> BufferedStream<S> {
/// Create new [`BufferedStream`].
pub(super) fn new(stream: WebSocketStream<S>) -> Self {
Self {
write_buffer: Vec::with_capacity(2000),
write_buffer: Vec::with_capacity(DEFAULT_BUF_SIZE),
read_buffer: None,
write_ptr: 0usize,
stream,
Expand Down Expand Up @@ -124,10 +126,12 @@ impl<S: AsyncRead + AsyncWrite + Unpin> futures::AsyncWrite for BufferedStream<S
}
State::FlushPending => match futures::ready!(self.stream.poll_flush_unpin(cx)) {
Ok(_res) => {
// TODO: optimize
self.state = State::ReadyToSend;
self.write_ptr = 0;
self.write_buffer = Vec::with_capacity(2000);
self.write_buffer.clear();
// In the unlikely event that the buffer is too large, we need to bound the
// capacity to avoid unbounded memory usage.
self.write_buffer.shrink_to(DEFAULT_BUF_SIZE);
return Poll::Ready(Ok(()));
}
Err(_) => return Poll::Ready(Err(std::io::ErrorKind::UnexpectedEof.into())),
Expand Down
Loading