update ntex-rt

.github/workflows/linux.yml

@@ -8,7 +8,7 @@ jobs:
       fail-fast: false
       matrix:
         version:
-          - 1.46.0 # MSRV
+          - 1.51.0 # MSRV
           - stable
           - nightly
 
@@ -43,7 +43,7 @@ jobs:
           key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
 
       - name: Cache cargo tarpaulin
-        if: matrix.version == '1.46.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.51.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         uses: actions/cache@v1
         with:
           path: ~/.cargo/bin
@@ -57,19 +57,19 @@ jobs:
           args: --all --all-features --no-fail-fast -- --nocapture
 
       - name: Install tarpaulin
-        if: matrix.version == '1.46.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.51.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         continue-on-error: true
         run: |
           cargo install cargo-tarpaulin
 
       - name: Generate coverage report
-        if: matrix.version == '1.46.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.51.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         continue-on-error: true
         run: |
           cargo tarpaulin --out Xml --all --all-features
 
       - name: Upload to Codecov
-        if: matrix.version == '1.46.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
+        if: matrix.version == '1.51.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
         continue-on-error: true
         uses: codecov/codecov-action@v1
         with:

README.md

@@ -7,7 +7,7 @@
 [![codecov](https://codecov.io/gh/ntex-rs/ntex/branch/master/graph/badge.svg)](https://codecov.io/gh/ntex-rs/ntex) 
 [![crates.io](https://img.shields.io/crates/v/ntex.svg)](https://crates.io/crates/ntex) 
 [![Documentation](https://docs.rs/ntex/badge.svg)](https://docs.rs/ntex) 
-[![Version](https://img.shields.io/badge/rustc-1.48+-lightgray.svg)](https://blog.rust-lang.org/2020/11/19/Rust-1.48.html) 
+[![Version](https://img.shields.io/badge/rustc-1.51+-lightgray.svg)](https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html) 
 ![License](https://img.shields.io/crates/l/ntex.svg) 
 
   </p>

ntex/CHANGES.md

@@ -2,6 +2,8 @@
 
 ## [0.4.0-b.3] - 2021-08-xx
 
+* Add timer service
+
 * Use ntex-service 0.2
 
 ## [0.4.0-b.2] - 2021-08-14

ntex/Cargo.toml

@@ -44,7 +44,7 @@ http-framework = ["h2", "http", "httparse",
 
 [dependencies]
 ntex-codec = "0.5.0"
-ntex-rt = "0.2.2"
+ntex-rt = "0.3.0"
 ntex-router = "0.5.1"
 ntex-service = "0.2.0-b.0"
 ntex-macros = "0.1.3"
@@ -54,6 +54,7 @@ ntex-bytes = "0.1.4"
 ahash = "0.7.4"
 base64 = "0.13"
 bitflags = "1.3"
+bitmaps = "3.1"
 derive_more = "0.99.14"
 futures-core = { version = "0.3.16", default-features = false, features = ["alloc"] }
 futures-sink = { version = "0.3.16", default-features = false, features = ["alloc"] }

ntex/README.md

@@ -7,7 +7,7 @@
 [![codecov](https://codecov.io/gh/ntex-rs/ntex/branch/master/graph/badge.svg)](https://codecov.io/gh/ntex-rs/ntex) 
 [![crates.io](https://img.shields.io/crates/v/ntex.svg)](https://crates.io/crates/ntex) 
 [![Documentation](https://docs.rs/ntex/badge.svg)](https://docs.rs/ntex) 
-[![Version](https://img.shields.io/badge/rustc-1.48+-lightgray.svg)](https://blog.rust-lang.org/2020/11/19/Rust-1.48.html) 
+[![Version](https://img.shields.io/badge/rustc-1.51+-lightgray.svg)](https://blog.rust-lang.org/2021/03/25/Rust-1.51.0.html) 
 ![License](https://img.shields.io/crates/l/ntex.svg) 
 
   </p>

ntex/src/http/config.rs

@@ -2,7 +2,7 @@ use std::{cell::Cell, cell::RefCell, ptr::copy_nonoverlapping, rc::Rc, time};
 
 use crate::framed::Timer;
 use crate::http::{Request, Response};
-use crate::rt::time::{sleep, sleep_until, Instant, Sleep};
+use crate::rt::time::{sleep, sleep_until, Sleep};
 use crate::service::boxed::BoxService;
 use crate::util::BytesMut;
 
@@ -156,7 +156,7 @@ impl<T, S, X, U> DispatcherConfig<T, S, X, U> {
     }
 
     /// Keep-alive expire time
-    pub(super) fn keep_alive_expire(&self) -> Option<Instant> {
+    pub(super) fn keep_alive_expire(&self) -> Option<time::Instant> {
         if self.keep_alive.as_secs() != 0 {
             Some(self.timer.now() + self.keep_alive)
         } else {
@@ -164,7 +164,7 @@ impl<T, S, X, U> DispatcherConfig<T, S, X, U> {
         }
     }
 
-    pub(super) fn now(&self) -> Instant {
+    pub(super) fn now(&self) -> time::Instant {
         self.timer.now()
     }
 }
@@ -187,7 +187,7 @@ impl Default for DateService {
 
 struct DateServiceInner {
     current: Cell<bool>,
-    current_time: Cell<Instant>,
+    current_time: Cell<time::Instant>,
     current_date: Cell<[u8; DATE_VALUE_LENGTH_HDR]>,
 }
 
@@ -195,14 +195,14 @@ impl DateServiceInner {
     fn new() -> Self {
         DateServiceInner {
             current: Cell::new(false),
-            current_time: Cell::new(Instant::now()),
+            current_time: Cell::new(time::Instant::now()),
             current_date: Cell::new(DATE_VALUE_DEFAULT),
         }
     }
 
     fn update(&self) {
         self.current.set(true);
-        self.current_time.set(Instant::now());
+        self.current_time.set(time::Instant::now());
 
         let mut bytes = DATE_VALUE_DEFAULT;
         let dt = httpdate::HttpDate::from(time::SystemTime::now()).to_string();
@@ -229,7 +229,7 @@ impl DateService {
         }
     }
 
-    fn now(&self) -> Instant {
+    fn now(&self) -> time::Instant {
         self.check_date();
         self.0.current_time.get()
     }

ntex/src/http/h2/dispatcher.rs

@@ -1,6 +1,6 @@
 use std::task::{Context, Poll};
 use std::{
-    convert::TryFrom, future::Future, marker::PhantomData, net, pin::Pin, rc::Rc,
+    convert::TryFrom, future::Future, marker::PhantomData, net, pin::Pin, rc::Rc, time,
 };
 
 use h2::server::{Connection, SendResponse};
@@ -17,7 +17,7 @@ use crate::http::message::ResponseHead;
 use crate::http::payload::Payload;
 use crate::http::request::Request;
 use crate::http::response::Response;
-use crate::rt::time::{Instant, Sleep};
+use crate::rt::time::Sleep;
 use crate::util::{Bytes, BytesMut};
 use crate::Service;
 
@@ -30,7 +30,7 @@ pin_project_lite::pin_project! {
         connection: Connection<T, Bytes>,
         on_connect: Option<Box<dyn DataFactory>>,
         peer_addr: Option<net::SocketAddr>,
-        ka_expire: Instant,
+        ka_expire: time::Instant,
         ka_timer: Option<Sleep>,
         _t: PhantomData<B>,
     }

ntex/src/lib.rs

@@ -40,6 +40,7 @@ pub mod framed;
 pub mod http;
 pub mod server;
 pub mod testing;
+pub mod time;
 pub mod util;
 #[cfg(feature = "http-framework")]
 pub mod web;

ntex/src/server/accept.rs

@@ -1,9 +1,11 @@
-use std::{io, sync::mpsc as sync_mpsc, sync::Arc, thread, time::Duration};
+use std::{
+    io, sync::mpsc as sync_mpsc, sync::Arc, thread, time::Duration, time::Instant,
+};
 
 use log::{error, info};
 use slab::Slab;
 
-use crate::rt::time::{sleep_until, Instant};
+use crate::rt::time::sleep_until;
 use crate::rt::System;
 
 use super::socket::{Listener, SocketAddr};

ntex/src/server/worker.rs

@@ -6,7 +6,7 @@ use async_channel::{unbounded, Receiver, Sender};
 use async_oneshot as oneshot;
 use futures_core::Stream as FutStream;
 
-use crate::rt::time::{sleep_until, Instant, Sleep};
+use crate::rt::time::{sleep_until, Sleep};
 use crate::rt::{spawn, Arbiter};
 use crate::util::{counter::Counter, join_all};
 
@@ -350,9 +350,11 @@ impl Future for Worker {
                     info!("Graceful worker shutdown, {} connections", num);
                     self.state = WorkerState::Shutdown(
                         Box::pin(sleep_until(
-                            Instant::now() + time::Duration::from_secs(1),
+                            time::Instant::now() + time::Duration::from_secs(1),
+                        )),
+                        Box::pin(sleep_until(
+                            time::Instant::now() + self.shutdown_timeout,
                         )),
-                        Box::pin(sleep_until(Instant::now() + self.shutdown_timeout)),
                         Some(result),
                     );
                 } else {
@@ -441,7 +443,7 @@ impl Future for Worker {
                     Poll::Pending => (),
                     Poll::Ready(_) => {
                         *t1 = Box::pin(sleep_until(
-                            Instant::now() + time::Duration::from_secs(1),
+                            time::Instant::now() + time::Duration::from_secs(1),
                         ));
                         let _ = t1.as_mut().poll(cx);
                     }

ntex/src/util/keepalive.rs

@@ -1,9 +1,8 @@
 use std::task::{Context, Poll};
-use std::{
+use std::time::{Duration, Instant};
-    cell::RefCell, convert::Infallible, future::Future, marker, pin::Pin, time::Duration,
+use std::{cell::RefCell, convert::Infallible, future::Future, marker, pin::Pin};
-};
 
-use crate::rt::time::{sleep_until, Instant, Sleep};
+use crate::rt::time::{sleep_until, Sleep};
 use crate::{util::Ready, Service, ServiceFactory};
 
 use super::time::{LowResTime, LowResTimeService};
@@ -89,7 +88,7 @@ where
     F: Fn() -> E,
 {
     pub fn new(ka: Duration, time: LowResTimeService, f: F) -> Self {
-        let expire = Instant::from_std(time.now() + ka);
+        let expire = time.now() + ka;
         KeepAliveService {
             f,
             ka,
@@ -117,7 +116,7 @@ where
 
         match Pin::new(&mut inner.delay).poll(cx) {
             Poll::Ready(_) => {
-                let now = Instant::from_std(self.time.now());
+                let now = self.time.now();
                 if inner.expire <= now {
                     Poll::Ready(Err((self.f)()))
                 } else {
@@ -132,7 +131,7 @@ where
     }
 
     fn call(&self, req: R) -> Self::Future {
-        self.inner.borrow_mut().expire = Instant::from_std(self.time.now() + self.ka);
+        self.inner.borrow_mut().expire = self.time.now() + self.ka;
         Ready::Ok(req)
     }
 }