Restart timer after runtime stop (#154)

* Code coverage
* Restart timer after runtime stop

.github/workflows/cov.yml

@@ -0,0 +1,37 @@
+name: Coverage
+
+on: [pull_request, push]
+
+jobs:
+  coverage:
+    runs-on: ubuntu-latest
+    env:
+      CARGO_TERM_COLOR: always
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Install Rust
+        run: rustup toolchain install stable --component llvm-tools-preview
+
+      - name: Install cargo-llvm-cov
+        uses: taiki-e/install-action@cargo-llvm-cov
+
+      - name: Generate Cargo.lock
+        uses: actions-rs/cargo@v1
+        with:
+          command: generate-lockfile
+
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v1.0.1
+
+      - name: Code coverage
+        run: cargo llvm-cov --all --all-features --lcov --output-path lcov.info
+
+      - name: Code coverage (glommio)
+        run: cargo llvm-cov --all --no-default-features --features="glommio,cookie,url,compress,openssl,rustls" --lcov --output-path lcov.info
+
+      - name: Upload coverage to Codecov
+        uses: codecov/codecov-action@v3
+        with:
+          files: lcov.info
+          fail_ci_if_error: true

.github/workflows/linux.yml

@@ -42,13 +42,6 @@ jobs:
           path: ~/.cargo/git
           key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-cargo-index-trimmed-${{ hashFiles('**/Cargo.lock') }}
 
-      - name: Cache cargo tarpaulin
-        if: matrix.version == '1.65.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
-        uses: actions/cache@v1
-        with:
-          path: ~/.cargo/bin
-          key: ${{ matrix.version }}-x86_64-unknown-linux-gnu-tarpaulin
-
       - name: Run tests
         uses: actions-rs/cargo@v1
         timeout-minutes: 40
@@ -63,33 +56,6 @@ jobs:
           cd ntex
           cargo test --no-default-features --no-fail-fast --features="async-std,cookie,url,compress,openssl,rustls" --lib -- --test-threads 1
 
-      - name: Install tarpaulin
-        if: matrix.version == '1.65.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.65.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
-        continue-on-error: true
-        run: |
-          cargo tarpaulin --out Xml --all --all-features
-
-      - name: Generate coverage report (glommio)
-        if: matrix.version == '1.65.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
-        continue-on-error: true
-        run: |
-          cd ntex
-          sudo -E env PATH="$PATH" bash -c "ulimit -l 512 && ulimit -a && cargo tarpaulin --out Xml --no-default-features --features=\"glommio,cookie,url,compress,openssl,rustls\""
-
-      - name: Upload to Codecov
-        if: matrix.version == '1.65.0' && (github.ref == 'refs/heads/master' || github.event_name == 'pull_request')
-        continue-on-error: true
-        uses: codecov/codecov-action@v2
-        with:
-          files: cobertura.xml, ./ntex/cobertura.xml
-          verbose: true
-
       - name: Install cargo-cache
         continue-on-error: true
         run: |

README.md

@@ -6,7 +6,7 @@
 [![build status](https://github.com/ntex-rs/ntex/workflows/CI%20%28Linux%29/badge.svg?branch=master&event=push)](https://github.com/ntex-rs/ntex/actions?query=workflow%3A"CI+(Linux)") 
 [![crates.io](https://img.shields.io/crates/v/ntex.svg)](https://crates.io/crates/ntex) 
 [![Documentation](https://img.shields.io/docsrs/ntex/latest)](https://docs.rs/ntex) 
-[![Version](https://img.shields.io/badge/rustc-1.57+-lightgray.svg)](https://blog.rust-lang.org/2021/12/02/Rust-1.57.0.html) 
+[![Version](https://img.shields.io/badge/rustc-1.65+-lightgray.svg)](https://blog.rust-lang.org/2022/11/03/Rust-1.65.0.html) 
 ![License](https://img.shields.io/crates/l/ntex.svg) 
 [![codecov](https://codecov.io/gh/ntex-rs/ntex/branch/master/graph/badge.svg)](https://codecov.io/gh/ntex-rs/ntex) 
 [![Chat on Discord](https://img.shields.io/discord/919288597826387979?label=chat&logo=discord)](https://discord.gg/zBNyhVRz) 
@@ -29,13 +29,13 @@ Starting ntex v0.5 async runtime must be selected as a feature. Available option
 
 ```toml
 [dependencies]
-ntex = { version = "0.5", features = ["glommio"] }
+ntex = { version = "0.6", features = ["glommio"] }
 ```
 
 ## Documentation & community resources
 
 * [Documentation](https://docs.rs/ntex)
-* Minimum supported Rust version: 1.57 or later
+* Minimum supported Rust version: 1.65 or later
 
 ## License
 

ntex-io/CHANGES.md

@@ -1,5 +1,11 @@
 # Changes
 
+## [0.2.0-beta.0] - 2022-12-xx
+
+* Upgrade to ntex-service 1.0
+
+* Restart timer after runtime stop
+
 ## [0.1.11] - 2022-12-02
 
 * Expose IoRef::start_keepalive_timer() and IoRef::remove_keepalive_timer() methods

ntex-io/src/io.rs

@@ -1,14 +1,11 @@
 use std::cell::Cell;
 use std::task::{Context, Poll};
-use std::{
+use std::{fmt, future::Future, hash, io, marker, mem, ops, pin::Pin, ptr, rc::Rc, time};
-    fmt, future::Future, hash, io, marker, mem, ops::Deref, pin::Pin, ptr, rc::Rc, time,
-};
 
 use ntex_bytes::{BytesVec, PoolId, PoolRef};
 use ntex_codec::{Decoder, Encoder};
-use ntex_util::{
+use ntex_util::time::{now, Millis};
-    future::poll_fn, future::Either, task::LocalWaker, time::now, time::Millis,
+use ntex_util::{future::poll_fn, future::Either, task::LocalWaker};
-};
 
 use super::filter::{Base, NullFilter};
 use super::seal::Sealed;
@@ -696,7 +693,7 @@ impl<F> fmt::Debug for Io<F> {
     }
 }
 
-impl<F> Deref for Io<F> {
+impl<F> ops::Deref for Io<F> {
     type Target = IoRef;
 
     #[inline]

ntex-io/src/ioref.rs

@@ -3,8 +3,7 @@ use std::{any, fmt, hash, io, time};
 use ntex_bytes::{BufMut, BytesVec, PoolRef};
 use ntex_codec::{Decoder, Encoder};
 
-use super::io::{Flags, IoRef, OnDisconnect};
+use super::{io::Flags, timer, types, Filter, IoRef, OnDisconnect};
-use super::{timer, types, Filter};
 
 impl IoRef {
     #[inline]

ntex-io/src/timer.rs

@@ -46,6 +46,7 @@ pub(crate) fn register(timeout: Duration, io: &IoRef) -> Instant {
             let inner = timer.clone();
 
             spawn(async move {
+                let guard = TimerGuard(inner.clone());
                 loop {
                     sleep(Millis::ONE_SEC).await;
                     {
@@ -71,6 +72,7 @@ pub(crate) fn register(timeout: Duration, io: &IoRef) -> Instant {
                         }
                     }
                 }
+                drop(guard);
             });
         }
     });
@@ -78,6 +80,14 @@ pub(crate) fn register(timeout: Duration, io: &IoRef) -> Instant {
     expire
 }
 
+struct TimerGuard(Rc<RefCell<Inner>>);
+
+impl Drop for TimerGuard {
+    fn drop(&mut self) {
+        self.0.borrow_mut().running = false;
+    }
+}
+
 pub(crate) fn unregister(expire: Instant, io: &IoRef) {
     TIMER.with(|timer| {
         timer.borrow_mut().unregister(expire, io);

ntex-service/src/lib.rs

@@ -1,7 +1,7 @@
 //! See [`Service`] docs for information on this crate's foundational trait.
 
 #![deny(rust_2018_idioms, warnings)]
-// #![allow(clippy::type_complexity)]
+#![allow(clippy::type_complexity)]
 
 use std::future::Future;
 use std::rc::Rc;