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

Move more code under mpool feature (#342)

Browse source
This commit is contained in:
Nikolay Kim 2024-04-08 12:28:42 +05:00 • committed by GitHub
parent ec8eb23707
commit c60e7f52b7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 38 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ntex-bytes/CHANGELOG.md
View file

@ -1,5 +1,9 @@
# Changes # Changes
## [0.1.27] (2024-04-08)
* Move more code under mpool feature
## [0.1.26] (2024-04-04) ## [0.1.26] (2024-04-04)
* Make memory pools optional * Make memory pools optional

2
ntex-bytes/Cargo.toml
View file

@ -1,6 +1,6 @@
[package] [package]
name = "ntex-bytes" name = "ntex-bytes"
version = "0.1.26" version = "0.1.27"
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Carl Lerche <me@carllerche.com>"] authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Carl Lerche <me@carllerche.com>"]
description = "Types and traits for working with bytes (bytes crate fork)" description = "Types and traits for working with bytes (bytes crate fork)"
documentation = "https://docs.rs/ntex-bytes" documentation = "https://docs.rs/ntex-bytes"

4
ntex-bytes/src/bytes.rs
View file

@ -1592,6 +1592,7 @@ impl BytesMut {
self.chunk().iter() self.chunk().iter()
} }
#[cfg(feature = "mpool")]
pub(crate) fn move_to_pool(&mut self, pool: PoolRef) { pub(crate) fn move_to_pool(&mut self, pool: PoolRef) {
self.inner.move_to_pool(pool); self.inner.move_to_pool(pool);
} }
@ -2417,6 +2418,7 @@ impl BytesVec {
self.chunk().iter() self.chunk().iter()
} }
#[cfg(feature = "mpool")]
pub(crate) fn move_to_pool(&mut self, pool: PoolRef) { pub(crate) fn move_to_pool(&mut self, pool: PoolRef) {
self.inner.move_to_pool(pool); self.inner.move_to_pool(pool);
} }
@ -2686,6 +2688,7 @@ impl InnerVec {
} }
} }
#[cfg(feature = "mpool")]
#[inline] #[inline]
fn move_to_pool(&mut self, pool: PoolRef) { fn move_to_pool(&mut self, pool: PoolRef) {
unsafe { unsafe {
@ -3102,6 +3105,7 @@ impl Inner {
} }
} }
#[cfg(feature = "mpool")]
#[inline] #[inline]
fn move_to_pool(&mut self, pool: PoolRef) { fn move_to_pool(&mut self, pool: PoolRef) {
let kind = self.kind(); let kind = self.kind();

38
ntex-bytes/src/pool.rs
View file

@ -1,8 +1,11 @@
#![allow(clippy::type_complexity)] #![allow(clippy::type_complexity)]
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering::Relaxed}; #[cfg(feature = "mpool")]
use std::sync::atomic::AtomicBool;
use std::sync::atomic::{AtomicUsize, Ordering::Relaxed};
use std::task::{Context, Poll}; use std::task::{Context, Poll};
use std::{cell::Cell, cell::RefCell, fmt, future::Future, pin::Pin, ptr, rc::Rc}; use std::{cell::Cell, cell::RefCell, fmt, future::Future, pin::Pin, ptr, rc::Rc};
#[cfg(feature = "mpool")]
use futures_core::task::__internal::AtomicWaker; use futures_core::task::__internal::AtomicWaker;
use crate::{BufMut, BytesMut, BytesVec}; use crate::{BufMut, BytesMut, BytesVec};
@ -35,7 +38,9 @@ bitflags::bitflags! {
struct MemoryPool { struct MemoryPool {
id: PoolId, id: PoolId,
#[cfg(feature = "mpool")]
waker: AtomicWaker, waker: AtomicWaker,
#[cfg(feature = "mpool")]
waker_alive: AtomicBool, waker_alive: AtomicBool,
#[cfg(feature = "mpool")] #[cfg(feature = "mpool")]
waiters: RefCell<mpool::Waiters>, waiters: RefCell<mpool::Waiters>,
@ -188,13 +193,15 @@ impl PoolRef {
} }
#[inline] #[inline]
pub fn move_in(self, buf: &mut BytesMut) { pub fn move_in(self, _buf: &mut BytesMut) {
buf.move_to_pool(self); #[cfg(feature = "mpool")]
_buf.move_to_pool(self);
} }
#[inline] #[inline]
pub fn move_vec_in(self, buf: &mut BytesVec) { pub fn move_vec_in(self, _buf: &mut BytesVec) {
buf.move_to_pool(self); #[cfg(feature = "mpool")]
_buf.move_to_pool(self);
} }
#[inline] #[inline]
@ -361,21 +368,28 @@ impl PoolRef {
} }
#[inline] #[inline]
pub(crate) fn acquire(self, size: usize) { pub(crate) fn acquire(self, _size: usize) {
let prev = self.0.size.fetch_add(size, Relaxed); #[cfg(feature = "mpool")]
{
let prev = self.0.size.fetch_add(_size, Relaxed);
if self.0.waker_alive.load(Relaxed) { if self.0.waker_alive.load(Relaxed) {
self.wake_driver(prev + size) self.wake_driver(prev + _size)
}
} }
} }
#[inline] #[inline]
pub(crate) fn release(self, size: usize) { pub(crate) fn release(self, _size: usize) {
let prev = self.0.size.fetch_sub(size, Relaxed); #[cfg(feature = "mpool")]
{
let prev = self.0.size.fetch_sub(_size, Relaxed);
if self.0.waker_alive.load(Relaxed) { if self.0.waker_alive.load(Relaxed) {
self.wake_driver(prev - size) self.wake_driver(prev - _size)
}
} }
} }
#[cfg(feature = "mpool")]
fn wake_driver(self, allocated: usize) { fn wake_driver(self, allocated: usize) {
let l = self.0.window_l.get(); let l = self.0.window_l.get();
let h = self.0.window_h.get(); let h = self.0.window_h.get();
@ -428,7 +442,9 @@ impl MemoryPool {
fn create(id: PoolId) -> &'static MemoryPool { fn create(id: PoolId) -> &'static MemoryPool {
Box::leak(Box::new(MemoryPool { Box::leak(Box::new(MemoryPool {
id, id,
#[cfg(feature = "mpool")]
waker: AtomicWaker::new(), waker: AtomicWaker::new(),
#[cfg(feature = "mpool")]
waker_alive: AtomicBool::new(false), waker_alive: AtomicBool::new(false),
#[cfg(feature = "mpool")] #[cfg(feature = "mpool")]
waiters: RefCell::new(mpool::Waiters::new()), waiters: RefCell::new(mpool::Waiters::new()),