mirrors/ntex
1
0
Fork 0
mirror of https://github.com/ntex-rs/ntex.git synced 2025-04-04 13:27:39 +03:00
Code Issues Projects Releases Packages Wiki Activity

Do not leak request/response pools

Browse source
This commit is contained in:
Nikolay Kim 2021-02-20 11:59:49 +06:00
parent b8c05e2409
commit 6709090fab
2 changed files with 20 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ntex/CHANGES.md
View file

@ -4,6 +4,8 @@
* http: Refactor date service * http: Refactor date service
* http: Do not leak request/response pools
* server: Rename ServerBulder::system_exit to stop_runtime * server: Rename ServerBulder::system_exit to stop_runtime
* util: Drop Either service, use Variant instead * util: Drop Either service, use Variant instead

33
ntex/src/http/message.rs
View file

@ -33,7 +33,9 @@ bitflags! {
pub(crate) trait Head: Default + 'static { pub(crate) trait Head: Default + 'static {
fn clear(&mut self); fn clear(&mut self);
fn pool() -> &'static MessagePool<Self>; fn with_pool<F, R>(f: F) -> R
where
F: FnOnce(&MessagePool<Self>) -> R;
} }
#[derive(Debug)] #[derive(Debug)]
@ -68,8 +70,11 @@ impl Head for RequestHead {
self.extensions.borrow_mut().clear(); self.extensions.borrow_mut().clear();
} }
fn pool() -> &'static MessagePool<Self> { fn with_pool<F, R>(f: F) -> R
REQUEST_POOL.with(|p| *p) where
F: FnOnce(&MessagePool<Self>) -> R,
{
REQUEST_POOL.with(|p| f(p))
} }
} }
@ -327,7 +332,7 @@ pub(crate) struct Message<T: Head> {
impl<T: Head> Message<T> { impl<T: Head> Message<T> {
/// Get new message from the pool of objects /// Get new message from the pool of objects
pub(crate) fn new() -> Self { pub(crate) fn new() -> Self {
T::pool().get_message() T::with_pool(|p| p.get_message())
} }
} }
@ -348,7 +353,7 @@ impl<T: Head> std::ops::DerefMut for Message<T> {
impl<T: Head> Drop for Message<T> { impl<T: Head> Drop for Message<T> {
fn drop(&mut self) { fn drop(&mut self) {
if Rc::strong_count(&self.head) == 1 { if Rc::strong_count(&self.head) == 1 {
T::pool().release(self.head.clone()); T::with_pool(|p| p.release(self.head.clone()));
} }
} }
} }
@ -395,18 +400,17 @@ pub(crate) struct MessagePool<T: Head>(RefCell<Vec<Rc<T>>>);
/// Request's objects pool /// Request's objects pool
pub(super) struct BoxedResponsePool(RefCell<Vec<Box<ResponseHead>>>); pub(super) struct BoxedResponsePool(RefCell<Vec<Box<ResponseHead>>>);
thread_local!(static REQUEST_POOL: &'static MessagePool<RequestHead> = MessagePool::<RequestHead>::create()); thread_local!(static REQUEST_POOL: MessagePool<RequestHead> = MessagePool::<RequestHead>::create());
thread_local!(static RESPONSE_POOL: &'static BoxedResponsePool = BoxedResponsePool::create()); thread_local!(static RESPONSE_POOL: BoxedResponsePool = BoxedResponsePool::create());
impl<T: Head> MessagePool<T> { impl<T: Head> MessagePool<T> {
fn create() -> &'static MessagePool<T> { fn create() -> MessagePool<T> {
let pool = MessagePool(RefCell::new(Vec::with_capacity(128))); MessagePool(RefCell::new(Vec::with_capacity(128)))
Box::leak(Box::new(pool))
} }
/// Get message from the pool /// Get message from the pool
#[inline] #[inline]
fn get_message(&'static self) -> Message<T> { fn get_message(&self) -> Message<T> {
if let Some(mut msg) = self.0.borrow_mut().pop() { if let Some(mut msg) = self.0.borrow_mut().pop() {
if let Some(r) = Rc::get_mut(&mut msg) { if let Some(r) = Rc::get_mut(&mut msg) {
r.clear(); r.clear();
@ -430,14 +434,13 @@ impl<T: Head> MessagePool<T> {
} }
impl BoxedResponsePool { impl BoxedResponsePool {
fn create() -> &'static BoxedResponsePool { fn create() -> BoxedResponsePool {
let pool = BoxedResponsePool(RefCell::new(Vec::with_capacity(128))); BoxedResponsePool(RefCell::new(Vec::with_capacity(128)))
Box::leak(Box::new(pool))
} }
/// Get message from the pool /// Get message from the pool
#[inline] #[inline]
fn get_message(&'static self, status: StatusCode) -> BoxedResponseHead { fn get_message(&self, status: StatusCode) -> BoxedResponseHead {
if let Some(mut head) = self.0.borrow_mut().pop() { if let Some(mut head) = self.0.borrow_mut().pop() {
head.reason = None; head.reason = None;
head.status = status; head.status = status;