mirror of
https://github.com/fafhrd91/actix-net
synced 2025-02-08 00:44:24 +01:00
13049b80ca
* Migrate actix-codec, actix-rt, and actix-threadpool to std::future * update to latest tokio alpha and futures-rs * Migrate actix-service to std::future, This is a squash of ~8 commits, since it included a lot of experimentation. To see the commits, look into the semtexzv/std-future-service-tmp branch. * update futures-rs and tokio * Migrate actix-threadpool to std::future (#59) * Migrate actix-threadpool to std::future * Cosmetic refactor - turn log::error! into log::warn! as it doesn't throw any error - add Clone and Copy impls for Cancelled making it cheap to operate with - apply rustfmt * Bump up crate version to 0.2.0 and pre-fill its changelog * Disable patching 'actix-threadpool' crate in global workspace as unnecessary * Revert patching and fix 'actix-rt' * Migrate actix-rt to std::future (#47) * remove Pin from Service::poll_ready(); simplify combinators api; make code compile * disable tests * update travis config * refactor naming * drop IntoFuture trait * Migrate actix-server to std::future (#50) Still not finished, this is more WIP, this is an aggregation of several commits, which can be found in semtexzv/std-future-server-tmp branch * update actix-server * rename Factor to ServiceFactory * start server worker in start mehtod * update actix-utils * remove IntoTransform trait * Migrate actix-server::ssl::nativetls to std futures (#61) * Refactor 'nativetls' module * Migrate 'actix-server-config' to std futures - remove "uds" feature - disable features by default * Switch NativeTlsAcceptor to use 'tokio-tls' crate * Bikeshed features names and remove unnecessary dependencies for 'actix-server-config' crate * update openssl impl * migrate actix-connect to std::future * migrate actix-ioframe to std::future * update version to alpha.1 * fix boxed service * migrate server rustls support * migratte openssl and rustls connecttors * store the thread's handle with arbiter (#62) * update ssl connect tests * restore service tests * update readme
238 lines
7.0 KiB
Rust
238 lines
7.0 KiB
Rust
use std::convert::Infallible;
|
|
use std::task::{Context, Poll};
|
|
use std::time::{self, Duration, Instant};
|
|
|
|
use actix_service::{Service, ServiceFactory};
|
|
use futures::future::{ok, ready, FutureExt, Ready};
|
|
use tokio_timer::delay_for;
|
|
|
|
use super::cell::Cell;
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct LowResTime(Cell<Inner>);
|
|
|
|
#[derive(Debug)]
|
|
struct Inner {
|
|
resolution: Duration,
|
|
current: Option<Instant>,
|
|
}
|
|
|
|
impl Inner {
|
|
fn new(resolution: Duration) -> Self {
|
|
Inner {
|
|
resolution,
|
|
current: None,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl LowResTime {
|
|
pub fn with(resolution: Duration) -> LowResTime {
|
|
LowResTime(Cell::new(Inner::new(resolution)))
|
|
}
|
|
|
|
pub fn timer(&self) -> LowResTimeService {
|
|
LowResTimeService(self.0.clone())
|
|
}
|
|
}
|
|
|
|
impl Default for LowResTime {
|
|
fn default() -> Self {
|
|
LowResTime(Cell::new(Inner::new(Duration::from_secs(1))))
|
|
}
|
|
}
|
|
|
|
impl ServiceFactory for LowResTime {
|
|
type Request = ();
|
|
type Response = Instant;
|
|
type Error = Infallible;
|
|
type InitError = Infallible;
|
|
type Config = ();
|
|
type Service = LowResTimeService;
|
|
type Future = Ready<Result<Self::Service, Self::InitError>>;
|
|
|
|
fn new_service(&self, _: &()) -> Self::Future {
|
|
ok(self.timer())
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct LowResTimeService(Cell<Inner>);
|
|
|
|
impl LowResTimeService {
|
|
pub fn with(resolution: Duration) -> LowResTimeService {
|
|
LowResTimeService(Cell::new(Inner::new(resolution)))
|
|
}
|
|
|
|
/// Get current time. This function has to be called from
|
|
/// future's poll method, otherwise it panics.
|
|
pub fn now(&self) -> Instant {
|
|
let cur = self.0.get_ref().current;
|
|
if let Some(cur) = cur {
|
|
cur
|
|
} else {
|
|
let now = Instant::now();
|
|
let mut inner = self.0.clone();
|
|
let interval = {
|
|
let mut b = inner.get_mut();
|
|
b.current = Some(now);
|
|
b.resolution
|
|
};
|
|
|
|
tokio_executor::current_thread::spawn(delay_for(interval).then(move |_| {
|
|
inner.get_mut().current.take();
|
|
ready(())
|
|
}));
|
|
now
|
|
}
|
|
}
|
|
}
|
|
|
|
impl Service for LowResTimeService {
|
|
type Request = ();
|
|
type Response = Instant;
|
|
type Error = Infallible;
|
|
type Future = Ready<Result<Self::Response, Self::Error>>;
|
|
|
|
fn poll_ready(&mut self, _: &mut Context<'_>) -> Poll<Result<(), Self::Error>> {
|
|
Poll::Ready(Ok(()))
|
|
}
|
|
|
|
fn call(&mut self, _: ()) -> Self::Future {
|
|
ok(self.now())
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct SystemTime(Cell<SystemTimeInner>);
|
|
|
|
#[derive(Debug)]
|
|
struct SystemTimeInner {
|
|
resolution: Duration,
|
|
current: Option<time::SystemTime>,
|
|
}
|
|
|
|
impl SystemTimeInner {
|
|
fn new(resolution: Duration) -> Self {
|
|
SystemTimeInner {
|
|
resolution,
|
|
current: None,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Clone, Debug)]
|
|
pub struct SystemTimeService(Cell<SystemTimeInner>);
|
|
|
|
impl SystemTimeService {
|
|
pub fn with(resolution: Duration) -> SystemTimeService {
|
|
SystemTimeService(Cell::new(SystemTimeInner::new(resolution)))
|
|
}
|
|
|
|
/// Get current time. This function has to be called from
|
|
/// future's poll method, otherwise it panics.
|
|
pub fn now(&self) -> time::SystemTime {
|
|
let cur = self.0.get_ref().current;
|
|
if let Some(cur) = cur {
|
|
cur
|
|
} else {
|
|
let now = time::SystemTime::now();
|
|
let mut inner = self.0.clone();
|
|
let interval = {
|
|
let mut b = inner.get_mut();
|
|
b.current = Some(now);
|
|
b.resolution
|
|
};
|
|
|
|
tokio_executor::current_thread::spawn(delay_for(interval).then(move |_| {
|
|
inner.get_mut().current.take();
|
|
ready(())
|
|
}));
|
|
now
|
|
}
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use std::time::{Duration, SystemTime};
|
|
|
|
/// State Under Test: Two calls of `SystemTimeService::now()` return the same value if they are done within resolution interval of `SystemTimeService`.
|
|
///
|
|
/// Expected Behavior: Two back-to-back calls of `SystemTimeService::now()` return the same value.
|
|
#[test]
|
|
fn system_time_service_time_does_not_immediately_change() {
|
|
let resolution = Duration::from_millis(50);
|
|
|
|
let _ = actix_rt::System::new("test").block_on(async {
|
|
let time_service = SystemTimeService::with(resolution);
|
|
|
|
assert_eq!(time_service.now(), time_service.now());
|
|
});
|
|
}
|
|
|
|
/// State Under Test: Two calls of `LowResTimeService::now()` return the same value if they are done within resolution interval of `SystemTimeService`.
|
|
///
|
|
/// Expected Behavior: Two back-to-back calls of `LowResTimeService::now()` return the same value.
|
|
#[test]
|
|
fn lowres_time_service_time_does_not_immediately_change() {
|
|
let resolution = Duration::from_millis(50);
|
|
|
|
let _ = actix_rt::System::new("test").block_on(async {
|
|
let time_service = LowResTimeService::with(resolution);
|
|
|
|
assert_eq!(time_service.now(), time_service.now());
|
|
});
|
|
}
|
|
|
|
/// State Under Test: `SystemTimeService::now()` updates returned value every resolution period.
|
|
///
|
|
/// Expected Behavior: Two calls of `LowResTimeService::now()` made in subsequent resolution interval return different values
|
|
/// and second value is greater than the first one at least by a resolution interval.
|
|
#[test]
|
|
fn system_time_service_time_updates_after_resolution_interval() {
|
|
let resolution = Duration::from_millis(100);
|
|
let wait_time = Duration::from_millis(150);
|
|
|
|
actix_rt::System::new("test").block_on(async {
|
|
let time_service = SystemTimeService::with(resolution);
|
|
|
|
let first_time = time_service
|
|
.now()
|
|
.duration_since(SystemTime::UNIX_EPOCH)
|
|
.unwrap();
|
|
|
|
delay_for(wait_time).await;
|
|
|
|
let second_time = time_service
|
|
.now()
|
|
.duration_since(SystemTime::UNIX_EPOCH)
|
|
.unwrap();
|
|
|
|
assert!(second_time - first_time >= wait_time);
|
|
});
|
|
}
|
|
|
|
/// State Under Test: `LowResTimeService::now()` updates returned value every resolution period.
|
|
///
|
|
/// Expected Behavior: Two calls of `LowResTimeService::now()` made in subsequent resolution interval return different values
|
|
/// and second value is greater than the first one at least by a resolution interval.
|
|
#[test]
|
|
fn lowres_time_service_time_updates_after_resolution_interval() {
|
|
let resolution = Duration::from_millis(100);
|
|
let wait_time = Duration::from_millis(150);
|
|
|
|
let _ = actix_rt::System::new("test").block_on(async {
|
|
let time_service = LowResTimeService::with(resolution);
|
|
|
|
let first_time = time_service.now();
|
|
|
|
delay_for(wait_time).await;
|
|
|
|
let second_time = time_service.now();
|
|
assert!(second_time - first_time >= wait_time);
|
|
});
|
|
}
|
|
}
|