hex/wstunnel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Reduce memory footpring

Browse source
This commit is contained in:
Σrebe - Romain GERARD 2024-01-01 21:00:19 +01:00
parent ace649a8a1
commit 817571c907
No known key found for this signature in database
GPG key ID: 7A42B4B97E0332F4
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/tunnel/io.rs
View file

@ -1,3 +1,4 @@
use std::cmp::max;
use fastwebsockets::{Frame, OpCode, Payload, WebSocketError, WebSocketRead, WebSocketWrite}; use fastwebsockets::{Frame, OpCode, Payload, WebSocketError, WebSocketRead, WebSocketWrite};
use futures_util::{pin_mut, FutureExt}; use futures_util::{pin_mut, FutureExt};
use hyper::upgrade::Upgraded; use hyper::upgrade::Upgraded;
@ -22,7 +23,7 @@ pub(super) async fn propagate_read(
}); });
static MAX_PACKET_LENGTH: usize = 64 * 1024; static MAX_PACKET_LENGTH: usize = 64 * 1024;
let mut buffer = vec![0u8; MAX_PACKET_LENGTH]; let mut buffer = vec![0u8; MAX_PACKET_LENGTH * 1];
// We do our own pin_mut! to avoid shadowing timeout and be able to reset it, on next loop iteration // We do our own pin_mut! to avoid shadowing timeout and be able to reset it, on next loop iteration
// We reuse the future to avoid creating a timer in the tight loop // We reuse the future to avoid creating a timer in the tight loop
@ -59,7 +60,7 @@ pub(super) async fn propagate_read(
} }
}; };
trace!("read {} bytes", read_len); //debug!("read {} wasted {}% usable {} capa {}", read_len, 100 - (read_len * 100 / buffer.capacity()), buffer.as_slice().len(), buffer.capacity());
if let Err(err) = ws_tx if let Err(err) = ws_tx
.write_frame(Frame::binary(Payload::BorrowedMut(&mut buffer[..read_len]))) .write_frame(Frame::binary(Payload::BorrowedMut(&mut buffer[..read_len])))
.await .await
@ -73,7 +74,10 @@ pub(super) async fn propagate_read(
// For udp, the buffer will never grows. // For udp, the buffer will never grows.
if buffer.capacity() == read_len { if buffer.capacity() == read_len {
buffer.clear(); buffer.clear();
buffer.resize(buffer.capacity() * 2, 0); let new_size = buffer.capacity() + (buffer.capacity() / 4); // grow buffer by 1.25 %
buffer.reserve_exact(new_size);
buffer.resize(buffer.capacity(), 0);
//info!("Buffer {} Mb {} {} {}", buffer.capacity() as f64 / 1024.0 / 1024.0, new_size, buffer.as_slice().len(), buffer.capacity())
} }
} }