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

cleanup names

Browse source
This commit is contained in:
Nikolay Kim 2021-12-22 16:13:52 +06:00
parent 95b7290e36
commit ab3c2efa66
5 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
ntex/src/http/h1/dispatcher.rs
View file

@ -989,7 +989,6 @@ mod tests {
#[crate::rt_test] #[crate::rt_test]
async fn test_write_backpressure() { async fn test_write_backpressure() {
env_logger::init();
let num = Arc::new(AtomicUsize::new(0)); let num = Arc::new(AtomicUsize::new(0));
let num2 = num.clone(); let num2 = num.clone();

16
ntex/src/server/builder.rs
View file

@ -15,7 +15,7 @@ use crate::{time::sleep, time::Millis, util::join_all};
use super::accept::{AcceptLoop, AcceptNotify, Command}; use super::accept::{AcceptLoop, AcceptNotify, Command};
use super::config::{ use super::config::{
ConfigWrapper, Configuration, ConfiguredService, RuntimeConfiguration, ServiceConfig, Config, ConfigWrapper, ConfiguredService, ServiceConfig, ServiceRuntime,
}; };
use super::service::{Factory, InternalServiceFactory}; use super::service::{Factory, InternalServiceFactory};
use super::socket::Listener; use super::socket::Listener;
@ -151,9 +151,9 @@ impl ServerBuilder {
/// different module or even library. /// different module or even library.
pub fn configure<F>(mut self, f: F) -> io::Result<ServerBuilder> pub fn configure<F>(mut self, f: F) -> io::Result<ServerBuilder>
where where
F: Fn(&mut Configuration) -> io::Result<()>, F: Fn(&mut ServiceConfig) -> io::Result<()>,
{ {
let mut cfg = Configuration::new(self.threads, self.backlog); let mut cfg = ServiceConfig::new(self.threads, self.backlog);
f(&mut cfg)?; f(&mut cfg)?;
@ -176,7 +176,7 @@ impl ServerBuilder {
/// It get executed in the worker thread. /// It get executed in the worker thread.
pub fn on_worker_start<F, R, E>(mut self, f: F) -> Self pub fn on_worker_start<F, R, E>(mut self, f: F) -> Self
where where
F: Fn(RuntimeConfiguration) -> R + Send + Clone + 'static, F: Fn(ServiceRuntime) -> R + Send + Clone + 'static,
R: Future<Output = Result<(), E>> + 'static, R: Future<Output = Result<(), E>> + 'static,
E: fmt::Display + 'static, E: fmt::Display + 'static,
{ {
@ -197,7 +197,7 @@ impl ServerBuilder {
) -> io::Result<Self> ) -> io::Result<Self>
where where
U: net::ToSocketAddrs, U: net::ToSocketAddrs,
F: Fn(ServiceConfig) -> R + Send + Clone + 'static, F: Fn(Config) -> R + Send + Clone + 'static,
R: ServiceFactory<Config = (), Request = Io>, R: ServiceFactory<Config = (), Request = Io>,
{ {
let sockets = bind_addr(addr, self.backlog)?; let sockets = bind_addr(addr, self.backlog)?;
@ -225,7 +225,7 @@ impl ServerBuilder {
where where
N: AsRef<str>, N: AsRef<str>,
U: AsRef<std::path::Path>, U: AsRef<std::path::Path>,
F: Fn(ServiceConfig) -> R + Send + Clone + 'static, F: Fn(Config) -> R + Send + Clone + 'static,
R: ServiceFactory<Config = (), Request = Io>, R: ServiceFactory<Config = (), Request = Io>,
{ {
use std::os::unix::net::UnixListener; use std::os::unix::net::UnixListener;
@ -254,7 +254,7 @@ impl ServerBuilder {
factory: F, factory: F,
) -> io::Result<Self> ) -> io::Result<Self>
where where
F: Fn(ServiceConfig) -> R + Send + Clone + 'static, F: Fn(Config) -> R + Send + Clone + 'static,
R: ServiceFactory<Config = (), Request = Io>, R: ServiceFactory<Config = (), Request = Io>,
{ {
use std::net::{IpAddr, Ipv4Addr, SocketAddr}; use std::net::{IpAddr, Ipv4Addr, SocketAddr};
@ -279,7 +279,7 @@ impl ServerBuilder {
factory: F, factory: F,
) -> io::Result<Self> ) -> io::Result<Self>
where where
F: Fn(ServiceConfig) -> R + Send + Clone + 'static, F: Fn(Config) -> R + Send + Clone + 'static,
R: ServiceFactory<Config = (), Request = Io>, R: ServiceFactory<Config = (), Request = Io>,
{ {
let token = self.token.next(); let token = self.token.next();

30
ntex/src/server/config.rs
View file

@ -15,13 +15,13 @@ use super::service::{
use super::Token; use super::Token;
#[derive(Clone)] #[derive(Clone)]
pub struct ServiceConfig(pub(super) Rc<InnerServiceConfig>); pub struct Config(pub(super) Rc<InnerServiceConfig>);
pub(super) struct InnerServiceConfig { pub(super) struct InnerServiceConfig {
pub(super) pool: Cell<PoolId>, pub(super) pool: Cell<PoolId>,
} }
impl Default for ServiceConfig { impl Default for Config {
fn default() -> Self { fn default() -> Self {
Self(Rc::new(InnerServiceConfig { Self(Rc::new(InnerServiceConfig {
pool: Cell::new(PoolId::DEFAULT), pool: Cell::new(PoolId::DEFAULT),
@ -29,7 +29,7 @@ impl Default for ServiceConfig {
} }
} }
impl ServiceConfig { impl Config {
/// Set memory pool for the service. /// Set memory pool for the service.
/// ///
/// Use specified memory pool for memory allocations. /// Use specified memory pool for memory allocations.
@ -39,7 +39,7 @@ impl ServiceConfig {
} }
} }
pub struct Configuration { pub struct ServiceConfig {
pub(super) services: Vec<(String, net::TcpListener)>, pub(super) services: Vec<(String, net::TcpListener)>,
pub(super) apply: Box<dyn ServiceRuntimeConfiguration + Send>, pub(super) apply: Box<dyn ServiceRuntimeConfiguration + Send>,
pub(super) threads: usize, pub(super) threads: usize,
@ -47,9 +47,9 @@ pub struct Configuration {
applied: bool, applied: bool,
} }
impl Configuration { impl ServiceConfig {
pub(super) fn new(threads: usize, backlog: i32) -> Self { pub(super) fn new(threads: usize, backlog: i32) -> Self {
Configuration { ServiceConfig {
threads, threads,
backlog, backlog,
services: Vec::new(), services: Vec::new(),
@ -103,7 +103,7 @@ impl Configuration {
/// It get executed in the worker thread. /// It get executed in the worker thread.
pub fn on_worker_start<F, R, E>(&mut self, f: F) -> io::Result<()> pub fn on_worker_start<F, R, E>(&mut self, f: F) -> io::Result<()>
where where
F: Fn(RuntimeConfiguration) -> R + Send + Clone + 'static, F: Fn(ServiceRuntime) -> R + Send + Clone + 'static,
R: Future<Output = Result<(), E>> + 'static, R: Future<Output = Result<(), E>> + 'static,
E: fmt::Display + 'static, E: fmt::Display + 'static,
{ {
@ -156,8 +156,8 @@ impl InternalServiceFactory for ConfiguredService {
) -> Pin<Box<dyn Future<Output = Result<Vec<(Token, BoxedServerService)>, ()>>>> ) -> Pin<Box<dyn Future<Output = Result<Vec<(Token, BoxedServerService)>, ()>>>>
{ {
// configure services // configure services
let rt = RuntimeConfiguration::new(self.topics.clone()); let rt = ServiceRuntime::new(self.topics.clone());
let cfg_fut = self.rt.configure(RuntimeConfiguration(rt.0.clone())); let cfg_fut = self.rt.configure(ServiceRuntime(rt.0.clone()));
let mut names = self.names.clone(); let mut names = self.names.clone();
let tokens = self.services.clone(); let tokens = self.services.clone();
@ -208,7 +208,7 @@ pub(super) trait ServiceRuntimeConfiguration {
fn configure( fn configure(
&self, &self,
rt: RuntimeConfiguration, rt: ServiceRuntime,
) -> Pin<Box<dyn Future<Output = Result<(), ()>>>>; ) -> Pin<Box<dyn Future<Output = Result<(), ()>>>>;
} }
@ -222,7 +222,7 @@ unsafe impl<F: Send, R, E> Send for ConfigWrapper<F, R, E> {}
impl<F, R, E> ServiceRuntimeConfiguration for ConfigWrapper<F, R, E> impl<F, R, E> ServiceRuntimeConfiguration for ConfigWrapper<F, R, E>
where where
F: Fn(RuntimeConfiguration) -> R + Send + Clone + 'static, F: Fn(ServiceRuntime) -> R + Send + Clone + 'static,
R: Future<Output = Result<(), E>> + 'static, R: Future<Output = Result<(), E>> + 'static,
E: fmt::Display + 'static, E: fmt::Display + 'static,
{ {
@ -235,7 +235,7 @@ where
fn configure( fn configure(
&self, &self,
rt: RuntimeConfiguration, rt: ServiceRuntime,
) -> Pin<Box<dyn Future<Output = Result<(), ()>>>> { ) -> Pin<Box<dyn Future<Output = Result<(), ()>>>> {
let f = self.f.clone(); let f = self.f.clone();
Box::pin(async move { Box::pin(async move {
@ -250,7 +250,7 @@ fn not_configured() {
error!("Service is not configured"); error!("Service is not configured");
} }
pub struct RuntimeConfiguration(Rc<RefCell<ServiceRuntimeInner>>); pub struct ServiceRuntime(Rc<RefCell<ServiceRuntimeInner>>);
struct ServiceRuntimeInner { struct ServiceRuntimeInner {
names: HashMap<String, Token>, names: HashMap<String, Token>,
@ -258,9 +258,9 @@ struct ServiceRuntimeInner {
onstart: Vec<Pin<Box<dyn Future<Output = ()>>>>, onstart: Vec<Pin<Box<dyn Future<Output = ()>>>>,
} }
impl RuntimeConfiguration { impl ServiceRuntime {
fn new(names: HashMap<String, Token>) -> Self { fn new(names: HashMap<String, Token>) -> Self {
RuntimeConfiguration(Rc::new(RefCell::new(ServiceRuntimeInner { ServiceRuntime(Rc::new(RefCell::new(ServiceRuntimeInner {
names, names,
services: HashMap::default(), services: HashMap::default(),
onstart: Vec::new(), onstart: Vec::new(),

2
ntex/src/server/mod.rs
View file

@ -22,7 +22,7 @@ pub use ntex_tls::max_concurrent_ssl_accept;
pub(crate) use self::builder::create_tcp_listener; pub(crate) use self::builder::create_tcp_listener;
pub use self::builder::ServerBuilder; pub use self::builder::ServerBuilder;
pub use self::config::{Configuration, RuntimeConfiguration, ServiceConfig}; pub use self::config::{Config, ServiceConfig, ServiceRuntime};
pub use self::test::{build_test_server, test_server, TestServer}; pub use self::test::{build_test_server, test_server, TestServer};
#[non_exhaustive] #[non_exhaustive]

10
ntex/src/server/service.rs
View file

@ -8,7 +8,7 @@ use crate::service::{Service, ServiceFactory};
use crate::util::{counter::CounterGuard, Pool, PoolId, Ready}; use crate::util::{counter::CounterGuard, Pool, PoolId, Ready};
use crate::{rt::spawn, time::Millis}; use crate::{rt::spawn, time::Millis};
use super::{socket::Stream, ServiceConfig, Token}; use super::{socket::Stream, Config, Token};
/// Server message /// Server message
pub(super) enum ServerMessage { pub(super) enum ServerMessage {
@ -23,7 +23,7 @@ pub(super) enum ServerMessage {
pub(super) trait StreamServiceFactory: Send + Clone + 'static { pub(super) trait StreamServiceFactory: Send + Clone + 'static {
type Factory: ServiceFactory<Config = (), Request = Io>; type Factory: ServiceFactory<Config = (), Request = Io>;
fn create(&self, _: ServiceConfig) -> Self::Factory; fn create(&self, _: Config) -> Self::Factory;
} }
pub(super) trait InternalServiceFactory: Send { pub(super) trait InternalServiceFactory: Send {
@ -159,7 +159,7 @@ where
) -> Pin<Box<dyn Future<Output = Result<Vec<(Token, BoxedServerService)>, ()>>>> ) -> Pin<Box<dyn Future<Output = Result<Vec<(Token, BoxedServerService)>, ()>>>>
{ {
let token = self.token; let token = self.token;
let cfg = ServiceConfig::default(); let cfg = Config::default();
let fut = self.inner.create(cfg.clone()).new_service(()); let fut = self.inner.create(cfg.clone()).new_service(());
Box::pin(async move { Box::pin(async move {
@ -194,13 +194,13 @@ impl InternalServiceFactory for Box<dyn InternalServiceFactory> {
impl<F, T> StreamServiceFactory for F impl<F, T> StreamServiceFactory for F
where where
F: Fn(ServiceConfig) -> T + Send + Clone + 'static, F: Fn(Config) -> T + Send + Clone + 'static,
T: ServiceFactory<Config = (), Request = Io>, T: ServiceFactory<Config = (), Request = Io>,
{ {
type Factory = T; type Factory = T;
#[inline] #[inline]
fn create(&self, cfg: ServiceConfig) -> T { fn create(&self, cfg: Config) -> T {
(self)(cfg) (self)(cfg)
} }
} }