Skip to content

Limit in/out buffer growth with a Vec<u8> wrapper #328

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

Open
maciejhirsz wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Limit in/out buffer growth with a Vec<u8> wrapper #328

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b839a59
Introduce CappedBuffer and io buffer limits
maciejhirsz Sep 17, 2020
24ce8d8
Don't expose mutable Vec, remove grow settings
maciejhirsz Sep 17, 2020
8b031c4
Shift buffers without re-allocations
maciejhirsz Sep 17, 2020
9d6f0e4
Clean up unnecessary seek probes around frame.format
maciejhirsz Sep 17, 2020
56acd9d
Clean warnings, always disconnect on capacity errors
maciejhirsz Sep 17, 2020
9b485c5
Code review grumbles
maciejhirsz Sep 17, 2020
c74bafe
Replace unsafe with drain
maciejhirsz Sep 18, 2020
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
Prev Previous commit
Next Next commit
Clean warnings, always disconnect on capacity errors
  • Loading branch information
@maciejhirsz
maciejhirsz committed Sep 17, 2020
commit 56acd9d9f4f55878c05ab208c22211e6324c695c
5 changes: 2 additions & 3 deletions src/connection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use std::borrow::Borrow;
use std::collections::VecDeque;
use std::io::{Cursor, Read, Seek, SeekFrom, Write};
use std::io::{Cursor, Read, Write};
use std::mem::replace;
use std::net::SocketAddr;
use std::str::from_utf8;
Expand Down Expand Up @@ -427,8 +427,8 @@ where
self.handler.on_error(err);
if let Err(err) = self.send_close(CloseCode::Size, reason) {
self.handler.on_error(err);
self.disconnect()
}
self.disconnect()
}
Kind::Protocol => {
if self.settings.panic_on_protocol {
Expand Down Expand Up @@ -1176,7 +1176,6 @@ where

trace!("Buffering frame to {}:\n{}", self.peer_addr(), frame);

let pos = self.out_buffer.position();
frame.format(self.out_buffer.get_mut())?;
Ok(())
}
Expand Down