upgrade to ntex 0.5 (#6988)

Author: fafhrd91

frameworks/Rust/ntex/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "ntex"
-version = "0.2.1"
+version = "0.3.0"
 edition = "2018"
 
 [[bin]]
@@ -16,7 +16,7 @@ name = "ntex-raw"
 path = "src/main_raw.rs"
 
 [dependencies]
-ntex = "0.4.0-b.12"
+ntex = "=0.5.0-b.0"
 mimalloc = { version = "0.1.25", default-features = false }
 snmalloc-rs = { version = "0.2.26", features = ["1mib", "native-cpu"] }
 yarte = { version = "0.15", features = ["bytes-buf", "json"] }
@@ -27,9 +27,10 @@ num_cpus = "1.13"
 futures = "0.3"
 http = "0.2"
 smallvec = "1.6.1"
-simd-json = "0.4.6"
+simd-json = "0.4.13"
 simd-json-derive = "0.2.2"
 serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 log = { version = "0.4", features = ["release_max_level_off"] }
 tokio = { version = "1", default-features = false }
 tokio-postgres = { git="https://github.com/fafhrd91/postgres.git" }

frameworks/Rust/ntex/src/db.rs

@@ -5,9 +5,12 @@ use nanorand::{WyRand, RNG};
 use ntex::util::{Bytes, BytesMut};
 use smallvec::SmallVec;
 use tokio_postgres::types::ToSql;
-use tokio_postgres::{connect, Client, NoTls, Statement};
+use tokio_postgres::{connect, Client, Statement};
 use yarte::{ywrite_html, Serialize};
 
+#[cfg(target_os = "macos")]
+use serde_json as simd_json;
+
 use crate::utils::Writer;
 
 #[derive(Copy, Clone, Serialize, Debug, serde::Serialize)]
@@ -33,7 +36,7 @@ pub struct PgConnection {
 
 impl PgConnection {
     pub async fn connect(db_url: &str) -> PgConnection {
-        let (cl, conn) = connect(db_url, NoTls)
+        let (cl, conn) = connect(db_url)
             .await
             .expect("can not connect to postgresql");
         ntex::rt::spawn(conn.map(|_| ()));

frameworks/Rust/ntex/src/main.rs

@@ -2,7 +2,7 @@
 static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
 
 use ntex::http::header::{HeaderValue, CONTENT_TYPE, SERVER};
-use ntex::{http, util::Bytes, web, time::Seconds};
+use ntex::{http, time::Seconds, util::Bytes, util::PoolId, web};
 use yarte::Serialize;
 
 mod utils;
@@ -42,17 +42,18 @@ async fn main() -> std::io::Result<()> {
     ntex::server::build()
         .backlog(1024)
         .bind("techempower", "0.0.0.0:8080", || {
+            PoolId::P1.set_read_params(65535, 1024);
+            PoolId::P1.set_write_params(65535, 1024);
+
             http::HttpService::build()
                 .keep_alive(http::KeepAlive::Os)
                 .client_timeout(Seconds(0))
-                .disconnect_timeout(Seconds(0))
-                .buffer_params(65535, 65535, 1024)
                 .h1(web::App::new()
                     .service(json)
                     .service(plaintext)
                     .with_config(web::dev::AppConfig::default()))
-                .tcp()
         })?
+        .memory_pool("techempower", PoolId::P1)
         .start()
         .await
 }

frameworks/Rust/ntex/src/main_db.rs

@@ -7,8 +7,11 @@ use futures::future::{ok, Future, FutureExt};
 use ntex::http::header::{HeaderValue, CONTENT_TYPE, SERVER};
 use ntex::http::{HttpService, KeepAlive, Request, Response};
 use ntex::service::{Service, ServiceFactory};
-use ntex::{util::BytesMut, time::Seconds};
 use ntex::web::{Error, HttpResponse};
+use ntex::{time::Seconds, util::BytesMut, util::PoolId};
+
+#[cfg(target_os = "macos")]
+use serde_json as simd_json;
 
 mod db;
 mod utils;
@@ -98,14 +101,15 @@ async fn main() -> std::io::Result<()> {
     ntex::server::build()
         .backlog(1024)
         .bind("techempower", "0.0.0.0:8080", || {
+            PoolId::P1.set_read_params(65535, 1024);
+            PoolId::P1.set_write_params(65535, 1024);
+
             HttpService::build()
                 .keep_alive(KeepAlive::Os)
                 .client_timeout(Seconds(0))
-                .disconnect_timeout(Seconds(0))
-                .buffer_params(65535, 65535, 1024)
                 .h1(AppFactory)
-                .tcp()
         })?
+        .memory_pool("techempower", PoolId::P1)
         .start()
         .await
 }

frameworks/Rust/ntex/src/main_raw.rs

@@ -1,13 +1,15 @@
 #[global_allocator]
 static GLOBAL: snmalloc_rs::SnMalloc = snmalloc_rs::SnMalloc;
 
-use std::{cell::RefCell, future::Future, io, pin::Pin, rc::Rc, task::Context, task::Poll};
+use std::{future::Future, io, pin::Pin, task::Context, task::Poll};
 
-use ntex::{fn_service, time::Seconds, http::h1, rt::net::TcpStream};
-use ntex::framed::{ReadTask, State, WriteTask};
+use ntex::{fn_service, http::h1, io::Io, util::BufMut, util::PoolId};
 
 mod utils;
 
+#[cfg(target_os = "macos")]
+use serde_json as simd_json;
+
 const JSON: &[u8] =
     b"HTTP/1.1 200 OK\r\nServer: N\r\nContent-Type: application/json\r\nContent-Length: 27\r\n";
 const PLAIN: &[u8] =
@@ -22,7 +24,7 @@ pub struct Message {
 }
 
 struct App {
-    state: State,
+    io: Io,
     codec: h1::Codec,
 }
 
@@ -31,19 +33,18 @@ impl Future for App {
 
     fn poll(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Self::Output> {
         let this = self.as_mut().get_mut();
-        if !this.state.is_open() {
-            this.state.close();
+        if this.io.is_closed() {
             return Poll::Ready(Ok(()));
         }
 
-        let read = this.state.read();
-        let write = this.state.write();
+        let read = this.io.read();
+        let write = this.io.write();
         loop {
             match read.decode(&this.codec) {
                 Ok(Some((req, _))) => {
-                    write.with_buf(|buf| {
+                    let _ = write.with_buf(|buf| {
                         // make sure we've got room
-                        let remaining = buf.capacity() - buf.len();
+                        let remaining = buf.remaining_mut();
                         if remaining < 1024 {
                             buf.reserve(65535 - remaining);
                         }
@@ -73,16 +74,12 @@ impl Future for App {
                 }
                 Ok(None) => break,
                 _ => {
-                    this.state.close();
+                    this.io.close();
                     return Poll::Ready(Err(()));
                 }
             }
         }
-        if read.is_ready() {
-            this.state.register_dispatcher(cx.waker());
-        } else {
-            read.wake(cx.waker())
-        }
+        let _ = read.poll_read_ready(cx);
         Poll::Pending
     }
 }
@@ -95,18 +92,15 @@ async fn main() -> io::Result<()> {
     ntex::server::build()
         .backlog(1024)
         .bind("techempower", "0.0.0.0:8080", || {
-            fn_service(|io: TcpStream| {
-                let state = State::with_params(65535, 65535, 1024, Seconds(0));
-                let io = Rc::new(RefCell::new(io));
-                ntex::rt::spawn(ReadTask::new(io.clone(), state.clone()));
-                ntex::rt::spawn(WriteTask::new(io, state.clone()));
+            PoolId::P1.set_read_params(65535, 8192);
+            PoolId::P1.set_write_params(65535, 8192);
 
-                App {
-                    state,
-                    codec: h1::Codec::default(),
-                }
+            fn_service(|io| App {
+                io,
+                codec: h1::Codec::default(),
             })
         })?
+        .memory_pool("techempower", PoolId::P1)
         .start()
         .await
 }