mirror of
https://github.com/ntex-rs/ntex.git
synced 2025-04-03 21:07:39 +03:00
Make memory pools optional (#340)
This commit is contained in:
Nikolay Kim
GitHub
parent
9bd05487de
commit
0b73ae8fa8
3 changed files with 294 additions and 265 deletions
|
|
@ -1,5 +1,9 @@
|
|||
# Changes
|
||||
|
||||
## [0.1.26] (2024-04-04)
|
||||
|
||||
* Make memory pools optional
|
||||
|
||||
## [0.1.25] (2024-04-02)
|
||||
|
||||
* Fix pool waiters management
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[package]
|
||||
name = "ntex-bytes"
|
||||
version = "0.1.25"
|
||||
version = "0.1.26"
|
||||
authors = ["Nikolay Kim <fafhrd91@gmail.com>", "Carl Lerche <me@carllerche.com>"]
|
||||
description = "Types and traits for working with bytes (bytes crate fork)"
|
||||
documentation = "https://docs.rs/ntex-bytes"
|
||||
|
|
@ -17,6 +17,8 @@ default = []
|
|||
# simd utf8 check support
|
||||
simd = ["simdutf8"]
|
||||
|
||||
mpool = []
|
||||
|
||||
[dependencies]
|
||||
bitflags = "2"
|
||||
bytes = "1"
|
||||
|
|
@ -28,3 +30,4 @@ simdutf8 = { version = "0.1.4", optional = true }
|
|||
serde_test = "1"
|
||||
serde_json = "1"
|
||||
ntex = { version = "1", features = ["tokio"] }
|
||||
ntex-bytes = { version = "*", features = ["mpool"] }
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
#![allow(clippy::type_complexity)]
|
||||
use std::sync::atomic::Ordering::{Relaxed, Release};
|
||||
use std::sync::atomic::{AtomicBool, AtomicUsize};
|
||||
use std::task::{Context, Poll, Waker};
|
||||
use std::{cell::Cell, cell::RefCell, fmt, future::Future, mem, pin::Pin, ptr, rc::Rc};
|
||||
use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering::Relaxed};
|
||||
use std::task::{Context, Poll};
|
||||
use std::{cell::Cell, cell::RefCell, fmt, future::Future, pin::Pin, ptr, rc::Rc};
|
||||
|
||||
use futures_core::task::__internal::AtomicWaker;
|
||||
|
||||
use crate::{BufMut, BytesMut, BytesVec};
|
||||
|
||||
pub struct Pool {
|
||||
#[cfg(feature = "mpool")]
|
||||
idx: Cell<usize>,
|
||||
inner: &'static MemoryPool,
|
||||
}
|
||||
|
|
@ -37,7 +37,8 @@ struct MemoryPool {
|
|||
id: PoolId,
|
||||
waker: AtomicWaker,
|
||||
waker_alive: AtomicBool,
|
||||
waiters: RefCell<Waiters>,
|
||||
#[cfg(feature = "mpool")]
|
||||
waiters: RefCell<mpool::Waiters>,
|
||||
flags: Cell<Flags>,
|
||||
|
||||
size: AtomicUsize,
|
||||
|
|
@ -81,6 +82,7 @@ impl PoolId {
|
|||
#[inline]
|
||||
pub fn pool(self) -> Pool {
|
||||
POOLS.with(|pools| Pool {
|
||||
#[cfg(feature = "mpool")]
|
||||
idx: Cell::new(usize::MAX),
|
||||
inner: pools[self.0 as usize],
|
||||
})
|
||||
|
|
@ -173,6 +175,7 @@ impl PoolRef {
|
|||
/// Get `Pool` instance for this pool ref.
|
||||
pub fn pool(self) -> Pool {
|
||||
Pool {
|
||||
#[cfg(feature = "mpool")]
|
||||
idx: Cell::new(0),
|
||||
inner: self.0,
|
||||
}
|
||||
|
|
@ -234,10 +237,13 @@ impl PoolRef {
|
|||
self.0.windows.set(windows);
|
||||
|
||||
// release old waiters
|
||||
#[cfg(feature = "mpool")]
|
||||
{
|
||||
let mut waiters = self.0.waiters.borrow_mut();
|
||||
while let Some(waker) = waiters.consume() {
|
||||
waker.wake();
|
||||
}
|
||||
}
|
||||
|
||||
self
|
||||
}
|
||||
|
|
@ -424,7 +430,8 @@ impl MemoryPool {
|
|||
id,
|
||||
waker: AtomicWaker::new(),
|
||||
waker_alive: AtomicBool::new(false),
|
||||
waiters: RefCell::new(Waiters::new()),
|
||||
#[cfg(feature = "mpool")]
|
||||
waiters: RefCell::new(mpool::Waiters::new()),
|
||||
flags: Cell::new(Flags::empty()),
|
||||
|
||||
size: AtomicUsize::new(0),
|
||||
|
|
@ -462,6 +469,7 @@ impl Clone for Pool {
|
|||
#[inline]
|
||||
fn clone(&self) -> Pool {
|
||||
Pool {
|
||||
#[cfg(feature = "mpool")]
|
||||
idx: Cell::new(usize::MAX),
|
||||
inner: self.inner,
|
||||
}
|
||||
|
|
@ -482,6 +490,7 @@ impl From<PoolRef> for Pool {
|
|||
}
|
||||
}
|
||||
|
||||
#[cfg(feature = "mpool")]
|
||||
impl Drop for Pool {
|
||||
fn drop(&mut self) {
|
||||
// cleanup waiter
|
||||
|
|
@ -512,12 +521,17 @@ impl Pool {
|
|||
#[inline]
|
||||
/// Check if pool is ready
|
||||
pub fn is_ready(&self) -> bool {
|
||||
#[cfg(feature = "mpool")]
|
||||
{
|
||||
let idx = self.idx.get();
|
||||
if idx != usize::MAX {
|
||||
if let Some(Entry::Occupied(_)) = self.inner.waiters.borrow().entries.get(idx) {
|
||||
if let Some(mpool::Entry::Occupied(_)) =
|
||||
self.inner.waiters.borrow().entries.get(idx)
|
||||
{
|
||||
return false;
|
||||
}
|
||||
}
|
||||
}
|
||||
true
|
||||
}
|
||||
|
||||
|
|
@ -528,7 +542,8 @@ impl Pool {
|
|||
}
|
||||
|
||||
#[inline]
|
||||
pub fn poll_ready(&self, ctx: &mut Context<'_>) -> Poll<()> {
|
||||
pub fn poll_ready(&self, _ctx: &mut Context<'_>) -> Poll<()> {
|
||||
#[cfg(feature = "mpool")]
|
||||
if self.inner.max_size.get() > 0 {
|
||||
let window_l = self.inner.window_l.get();
|
||||
if window_l == 0 {
|
||||
|
|
@ -554,10 +569,10 @@ impl Pool {
|
|||
let new = {
|
||||
let idx = self.idx.get();
|
||||
if idx == usize::MAX {
|
||||
self.idx.set(waiters.append(ctx.waker().clone()));
|
||||
self.idx.set(waiters.append(_ctx.waker().clone()));
|
||||
true
|
||||
} else {
|
||||
waiters.update(idx, ctx.waker().clone())
|
||||
waiters.update(idx, _ctx.waker().clone())
|
||||
}
|
||||
};
|
||||
|
||||
|
|
@ -579,7 +594,7 @@ impl Pool {
|
|||
if !flags.contains(Flags::SPAWNED) {
|
||||
flags.insert(Flags::SPAWNED);
|
||||
self.inner.flags.set(flags);
|
||||
spawn(Box::pin(Driver { pool: self.inner }))
|
||||
spawn(Box::pin(mpool::Driver { pool: self.inner }))
|
||||
}
|
||||
return Poll::Pending;
|
||||
}
|
||||
|
|
@ -588,12 +603,18 @@ impl Pool {
|
|||
}
|
||||
}
|
||||
|
||||
struct Driver {
|
||||
pool: &'static MemoryPool,
|
||||
}
|
||||
#[cfg(feature = "mpool")]
|
||||
mod mpool {
|
||||
use std::{mem, sync::atomic::Ordering::Release, task::Waker};
|
||||
|
||||
impl Driver {
|
||||
fn release(&self, waiters_num: usize) {
|
||||
use super::*;
|
||||
|
||||
pub(super) struct Driver {
|
||||
pub(super) pool: &'static MemoryPool,
|
||||
}
|
||||
|
||||
impl Driver {
|
||||
pub(super) fn release(&self, waiters_num: usize) {
|
||||
let mut waiters = self.pool.waiters.borrow_mut();
|
||||
|
||||
let mut to_release = waiters.occupied_len >> 4;
|
||||
|
|
@ -613,15 +634,15 @@ impl Driver {
|
|||
}
|
||||
}
|
||||
|
||||
fn release_all(&self) {
|
||||
pub(super) fn release_all(&self) {
|
||||
let mut waiters = self.pool.waiters.borrow_mut();
|
||||
while let Some(waker) = waiters.consume() {
|
||||
waker.wake();
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
impl Future for Driver {
|
||||
impl Future for Driver {
|
||||
type Output = ();
|
||||
|
||||
#[inline]
|
||||
|
|
@ -684,33 +705,33 @@ impl Future for Driver {
|
|||
|
||||
Poll::Pending
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct Waiters {
|
||||
entries: Vec<Entry>,
|
||||
pub(super) struct Waiters {
|
||||
pub(super) entries: Vec<Entry>,
|
||||
root: usize,
|
||||
tail: usize,
|
||||
free: usize,
|
||||
len: usize,
|
||||
occupied_len: usize,
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
enum Entry {
|
||||
#[derive(Debug)]
|
||||
pub(super) enum Entry {
|
||||
Vacant(usize),
|
||||
Consumed,
|
||||
Occupied(Node),
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Debug)]
|
||||
struct Node {
|
||||
#[derive(Debug)]
|
||||
pub(super) struct Node {
|
||||
item: Waker,
|
||||
prev: usize,
|
||||
next: usize,
|
||||
}
|
||||
}
|
||||
|
||||
impl Waiters {
|
||||
fn new() -> Waiters {
|
||||
impl Waiters {
|
||||
pub(super) fn new() -> Waiters {
|
||||
Waiters {
|
||||
entries: Vec::new(),
|
||||
root: usize::MAX,
|
||||
|
|
@ -729,7 +750,7 @@ impl Waiters {
|
|||
}
|
||||
|
||||
// consume root item
|
||||
fn consume(&mut self) -> Option<Waker> {
|
||||
pub(super) fn consume(&mut self) -> Option<Waker> {
|
||||
if self.root != usize::MAX {
|
||||
self.occupied_len -= 1;
|
||||
let entry =
|
||||
|
|
@ -759,7 +780,7 @@ impl Waiters {
|
|||
}
|
||||
}
|
||||
|
||||
fn update(&mut self, idx: usize, val: Waker) -> bool {
|
||||
pub(super) fn update(&mut self, idx: usize, val: Waker) -> bool {
|
||||
let entry = self
|
||||
.entries
|
||||
.get_mut(idx)
|
||||
|
|
@ -791,7 +812,7 @@ impl Waiters {
|
|||
}
|
||||
}
|
||||
|
||||
fn remove(&mut self, key: usize) {
|
||||
pub(super) fn remove(&mut self, key: usize) {
|
||||
if let Some(entry) = self.entries.get_mut(key) {
|
||||
// Swap the entry at the provided value
|
||||
let entry = mem::replace(entry, Entry::Vacant(self.free));
|
||||
|
|
@ -828,7 +849,7 @@ impl Waiters {
|
|||
}
|
||||
}
|
||||
|
||||
fn append(&mut self, val: Waker) -> usize {
|
||||
pub(super) fn append(&mut self, val: Waker) -> usize {
|
||||
let idx = self.free;
|
||||
|
||||
self.len += 1;
|
||||
|
|
@ -868,4 +889,5 @@ impl Waiters {
|
|||
|
||||
idx
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue