berkus
/
actix-web
mirror of https://github.com/fafhrd91/actix-web
1
0
Fork 0
Code Issues Releases Wiki Activity

try to fix memory usage for h1

This commit is contained in:
fakeshadow 2021-01-25 01:33:42 -08:00
parent c201c15f8c
commit 9edd9e1e18
1 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
actix-http/src/h1/dispatcher.rs
View File

@ -30,8 +30,8 @@ use super::codec::Codec;
use super::payload::{Payload, PayloadSender, PayloadStatus}; use super::payload::{Payload, PayloadSender, PayloadStatus};
use super::{Message, MessageType}; use super::{Message, MessageType};
const LW_BUFFER_SIZE: usize = 4096; const LW_BUFFER_SIZE: usize = 1024;
const HW_BUFFER_SIZE: usize = 32_768; const HW_BUFFER_SIZE: usize = 8192;
const MAX_PIPELINED_MESSAGES: usize = 16; const MAX_PIPELINED_MESSAGES: usize = 16;
bitflags! { bitflags! {
@ -893,18 +893,13 @@ where
{ {
let mut read_some = false; let mut read_some = false;
loop { // reserve capacity for buffer
// If buf is full return but do not disconnect since
// there is more reading to be done
if buf.len() >= HW_BUFFER_SIZE {
return Ok(Some(false));
}
let remaining = buf.capacity() - buf.len(); let remaining = buf.capacity() - buf.len();
if remaining < LW_BUFFER_SIZE { if remaining < LW_BUFFER_SIZE {
buf.reserve(HW_BUFFER_SIZE - remaining); buf.reserve(HW_BUFFER_SIZE - remaining);
} }
loop {
match actix_codec::poll_read_buf(Pin::new(io), cx, buf) { match actix_codec::poll_read_buf(Pin::new(io), cx, buf) {
Poll::Pending => { Poll::Pending => {
return if read_some { Ok(Some(false)) } else { Ok(None) }; return if read_some { Ok(Some(false)) } else { Ok(None) };
@ -913,6 +908,12 @@ where
if n == 0 { if n == 0 {
return Ok(Some(true)); return Ok(Some(true));
} else { } else {
// If buf is full return but do not disconnect since
// there is more reading to be done
if buf.len() >= HW_BUFFER_SIZE {
return Ok(Some(false));
}
read_some = true; read_some = true;
} }
} }