From 174292e133585186447d4ae4397db1709b68ef8f Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Sun, 9 Mar 2025 18:44:39 +0500 Subject: [PATCH 1/5] ntex: update version --- frameworks/Rust/ntex/Cargo.toml | 26 ++++++++- frameworks/Rust/ntex/benchmark_config.json | 56 +++++++++++++++++++ frameworks/Rust/ntex/config.toml | 41 ++++++++++++++ .../Rust/ntex/ntex-db-default.dockerfile | 16 ++++++ frameworks/Rust/ntex/ntex-default.dockerfile | 16 ++++++ .../Rust/ntex/ntex-plt-default.dockerfile | 16 ++++++ frameworks/Rust/ntex/src/main.rs | 16 +----- frameworks/Rust/ntex/src/main_db.rs | 16 +----- frameworks/Rust/ntex/src/main_plt.rs | 16 +----- 9 files changed, 172 insertions(+), 47 deletions(-) create mode 100644 frameworks/Rust/ntex/ntex-db-default.dockerfile create mode 100644 frameworks/Rust/ntex/ntex-default.dockerfile create mode 100644 frameworks/Rust/ntex/ntex-plt-default.dockerfile diff --git a/frameworks/Rust/ntex/Cargo.toml b/frameworks/Rust/ntex/Cargo.toml index 3bbf3dffa0f..d87937a626f 100755 --- a/frameworks/Rust/ntex/Cargo.toml +++ b/frameworks/Rust/ntex/Cargo.toml @@ -11,6 +11,10 @@ path = "src/main.rs" name = "ntex-compio" path = "src/main.rs" +[[bin]] +name = "ntex-default" +path = "src/main.rs" + [[bin]] name = "ntex-db" path = "src/main_db.rs" @@ -19,6 +23,10 @@ path = "src/main_db.rs" name = "ntex-db-compio" path = "src/main_db.rs" +[[bin]] +name = "ntex-db-default" +path = "src/main_db.rs" + [[bin]] name = "ntex-plt" path = "src/main_plt.rs" @@ -27,6 +35,10 @@ path = "src/main_plt.rs" name = "ntex-plt-compio" path = "src/main_plt.rs" +[[bin]] +name = "ntex-plt-default" +path = "src/main_plt.rs" + [features] default = [] @@ -36,8 +48,11 @@ tokio = ["ntex/tokio"] # compio runtime compio = ["ntex/compio"] +# default-rt runtime +default-rt = ["ntex/default-rt"] + [dependencies] -ntex = "2.8" +ntex = "2.12" ntex-compio = "0.2" ntex-bytes = { version = "0.1.21", features=["simd"] } mimalloc = { version = "0.1.25", default-features = false } @@ -47,7 +62,6 @@ buf-min = { version = "0.7", features = ["ntex-bytes"] } env_logger = "0.11" nanorand = { version = "0.7", default-features = false, features = ["std", "wyrand", "tls"] } atoi = "2.0" -core_affinity = "0.8" futures = "0.3" sonic-rs = "0.3.16" serde = { version = "1", features = ["derive"] } @@ -59,6 +73,14 @@ tokio-postgres = { git="https://github.com/fafhrd91/postgres.git", branch="ntex- [target.'cfg(target_os = "linux")'.dependencies] compio-driver = { version = "*", features = ["io-uring"]} +[patch.crates-io] +ntex = { git = "https://github.com/ntex-rs/ntex.git" } +ntex-io = { git = "https://github.com/ntex-rs/ntex.git" } +ntex-iodriver = { git = "https://github.com/ntex-rs/ntex.git" } +ntex-net = { git = "https://github.com/ntex-rs/ntex.git" } +ntex-rt = { git = "https://github.com/ntex-rs/ntex.git" } +ntex-runtime = { git = "https://github.com/ntex-rs/ntex.git" } + [profile.release] opt-level = 3 codegen-units = 1 diff --git a/frameworks/Rust/ntex/benchmark_config.json b/frameworks/Rust/ntex/benchmark_config.json index 9ed29c64b97..ef02ed24804 100755 --- a/frameworks/Rust/ntex/benchmark_config.json +++ b/frameworks/Rust/ntex/benchmark_config.json @@ -37,6 +37,24 @@ "notes": "", "versus": "" }, + "default": { + "json_url": "/json", + "plaintext_url": "/plaintext", + "port": 8080, + "approach": "Realistic", + "classification": "Micro", + "database": "Postgres", + "framework": "ntex", + "language": "Rust", + "orm": "Raw", + "platform": "None", + "webserver": "ntex", + "os": "Linux", + "database_os": "Linux", + "display_name": "ntex [default]", + "notes": "", + "versus": "" + }, "db": { "fortune_url": "/fortunes", "db_url": "/db", @@ -77,6 +95,26 @@ "notes": "", "versus": "" }, + "db-default": { + "fortune_url": "/fortunes", + "db_url": "/db", + "query_url": "/query?q=", + "update_url": "/update?q=", + "port": 8080, + "approach": "Realistic", + "classification": "Micro", + "database": "Postgres", + "framework": "ntex", + "language": "Rust", + "orm": "Raw", + "platform": "None", + "webserver": "ntex", + "os": "Linux", + "database_os": "Linux", + "display_name": "ntex [default,db]", + "notes": "", + "versus": "" + }, "plt": { "json_url": "/json", "plaintext_url": "/plaintext", @@ -112,6 +150,24 @@ "display_name": "ntex [compio,platform]", "notes": "", "versus": "" + }, + "plt-default": { + "json_url": "/json", + "plaintext_url": "/plaintext", + "port": 8080, + "approach": "Realistic", + "classification": "Platform", + "database": "Postgres", + "framework": "ntex", + "language": "Rust", + "orm": "Raw", + "platform": "None", + "webserver": "ntex", + "os": "Linux", + "database_os": "Linux", + "display_name": "ntex [default,platform]", + "notes": "", + "versus": "" } }] } diff --git a/frameworks/Rust/ntex/config.toml b/frameworks/Rust/ntex/config.toml index 759dca26c70..8fc74a20d70 100644 --- a/frameworks/Rust/ntex/config.toml +++ b/frameworks/Rust/ntex/config.toml @@ -27,6 +27,19 @@ platform = "None" webserver = "ntex" versus = "" +[default] +urls.plaintext = "/plaintext" +urls.json = "/json" +approach = "Realistic" +classification = "Micro" +database = "Postgres" +database_os = "Linux" +os = "Linux" +orm = "Raw" +platform = "None" +webserver = "ntex" +versus = "" + [db] urls.db = "/db" urls.query = "/query?q=" @@ -57,6 +70,21 @@ platform = "None" webserver = "ntex" versus = "" +[db-default] +urls.db = "/db" +urls.query = "/query?q=" +urls.update = "/update?q=" +urls.fortune = "/fortunes" +approach = "Realistic" +classification = "Micro" +database = "Postgres" +database_os = "Linux" +os = "Linux" +orm = "Raw" +platform = "None" +webserver = "ntex" +versus = "" + [plt] urls.plaintext = "/plaintext" urls.json = "/json" @@ -82,3 +110,16 @@ orm = "Raw" platform = "None" webserver = "ntex" versus = "" + +[plt-default] +urls.plaintext = "/plaintext" +urls.json = "/json" +approach = "Realistic" +classification = "Platform" +database = "Postgres" +database_os = "Linux" +os = "Linux" +orm = "Raw" +platform = "None" +webserver = "ntex" +versus = "" diff --git a/frameworks/Rust/ntex/ntex-db-default.dockerfile b/frameworks/Rust/ntex/ntex-db-default.dockerfile new file mode 100644 index 00000000000..1ce2f12e7af --- /dev/null +++ b/frameworks/Rust/ntex/ntex-db-default.dockerfile @@ -0,0 +1,16 @@ +FROM rust:latest + +# Disable simd at jsonescape +# ENV CARGO_CFG_JSONESCAPE_DISABLE_AUTO_SIMD= + +RUN apt-get update -yqq && apt-get install -yqq cmake g++ + +ADD ./ /ntex +WORKDIR /ntex + +RUN cargo clean +RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --features="default-rt" + +EXPOSE 8080 + +CMD ./target/release/ntex-db-default diff --git a/frameworks/Rust/ntex/ntex-default.dockerfile b/frameworks/Rust/ntex/ntex-default.dockerfile new file mode 100644 index 00000000000..06a70a68a8f --- /dev/null +++ b/frameworks/Rust/ntex/ntex-default.dockerfile @@ -0,0 +1,16 @@ +FROM rust:latest + +# Disable simd at jsonescape +# ENV CARGO_CFG_JSONESCAPE_DISABLE_AUTO_SIMD= + +RUN apt-get update -yqq && apt-get install -yqq cmake g++ + +ADD ./ /ntex +WORKDIR /ntex + +RUN cargo clean +RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --features="default-rt" + +EXPOSE 8080 + +CMD ./target/release/ntex-default diff --git a/frameworks/Rust/ntex/ntex-plt-default.dockerfile b/frameworks/Rust/ntex/ntex-plt-default.dockerfile new file mode 100644 index 00000000000..f6b1c389bae --- /dev/null +++ b/frameworks/Rust/ntex/ntex-plt-default.dockerfile @@ -0,0 +1,16 @@ +FROM rust:latest + +# Disable simd at jsonescape +# ENV CARGO_CFG_JSONESCAPE_DISABLE_AUTO_SIMD= + +RUN apt-get update -yqq && apt-get install -yqq cmake g++ + +ADD ./ /ntex +WORKDIR /ntex + +RUN cargo clean +RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --features="default" + +EXPOSE 8080 + +CMD ./target/release/ntex-plt-default diff --git a/frameworks/Rust/ntex/src/main.rs b/frameworks/Rust/ntex/src/main.rs index 5210d85863f..aeecbeae481 100644 --- a/frameworks/Rust/ntex/src/main.rs +++ b/frameworks/Rust/ntex/src/main.rs @@ -48,13 +48,10 @@ async fn plaintext() -> web::HttpResponse { async fn main() -> std::io::Result<()> { println!("Started http server: 127.0.0.1:8080"); - let cores = core_affinity::get_core_ids().unwrap(); - let total_cores = cores.len(); - let cores = std::sync::Arc::new(std::sync::Mutex::new(cores)); - // start http server ntex::server::build() .backlog(1024) + .enable_affinity() .bind("techempower", "0.0.0.0:8080", |cfg| { cfg.memory_pool(PoolId::P1); PoolId::P1.set_read_params(65535, 2048); @@ -67,17 +64,6 @@ async fn main() -> std::io::Result<()> { .payload_read_rate(Seconds::ZERO, Seconds::ZERO, 0) .h1(web::App::new().service(json).service(plaintext).finish()) })? - .configure(move |cfg| { - let cores = cores.clone(); - cfg.on_worker_start(move |_| { - if let Some(core) = cores.lock().unwrap().pop() { - core_affinity::set_for_current(core); - } - Ready::<_, &str>::Ok(()) - }); - Ok(()) - })? - .workers(total_cores) .run() .await } diff --git a/frameworks/Rust/ntex/src/main_db.rs b/frameworks/Rust/ntex/src/main_db.rs index 4197322bc13..bce599170ab 100644 --- a/frameworks/Rust/ntex/src/main_db.rs +++ b/frameworks/Rust/ntex/src/main_db.rs @@ -82,12 +82,9 @@ impl ServiceFactory for AppFactory { async fn main() -> std::io::Result<()> { println!("Starting http server: 127.0.0.1:8080"); - let cores = core_affinity::get_core_ids().unwrap(); - let total_cores = cores.len(); - let cores = std::sync::Arc::new(std::sync::Mutex::new(cores)); - ntex::server::build() .backlog(1024) + .enable_affinity() .bind("techempower", "0.0.0.0:8080", |cfg| { cfg.memory_pool(PoolId::P1); PoolId::P1.set_read_params(65535, 2048); @@ -100,17 +97,6 @@ async fn main() -> std::io::Result<()> { .payload_read_rate(Seconds::ZERO, Seconds::ZERO, 0) .h1(AppFactory) })? - .configure(move |cfg| { - let cores = cores.clone(); - cfg.on_worker_start(move |_| { - if let Some(core) = cores.lock().unwrap().pop() { - core_affinity::set_for_current(core); - } - Ready::<_, &str>::Ok(()) - }); - Ok(()) - })? - .workers(total_cores) .run() .await } diff --git a/frameworks/Rust/ntex/src/main_plt.rs b/frameworks/Rust/ntex/src/main_plt.rs index 9cc80ac9952..78642043289 100644 --- a/frameworks/Rust/ntex/src/main_plt.rs +++ b/frameworks/Rust/ntex/src/main_plt.rs @@ -79,13 +79,10 @@ impl Future for App { async fn main() -> io::Result<()> { println!("Started http server: 127.0.0.1:8080"); - let cores = core_affinity::get_core_ids().unwrap(); - let total_cores = cores.len(); - let cores = std::sync::Arc::new(std::sync::Mutex::new(cores)); - // start http server ntex::server::build() .backlog(1024) + .enable_affinity() .bind("techempower", "0.0.0.0:8080", |cfg| { cfg.memory_pool(PoolId::P1); PoolId::P1.set_read_params(65535, 2048); @@ -96,17 +93,6 @@ async fn main() -> io::Result<()> { codec: h1::Codec::default(), }) })? - .configure(move |cfg| { - let cores = cores.clone(); - cfg.on_worker_start(move |_| { - if let Some(core) = cores.lock().unwrap().pop() { - core_affinity::set_for_current(core); - } - Ready::<_, &str>::Ok(()) - }); - Ok(()) - })? - .workers(total_cores) .run() .await } From b78c530668299b37a346aacacac569d077980331 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Sun, 9 Mar 2025 18:50:31 +0500 Subject: [PATCH 2/5] wip --- frameworks/Rust/ntex/src/db.rs | 2 +- frameworks/Rust/ntex/src/main.rs | 2 +- frameworks/Rust/ntex/src/main_db.rs | 2 +- frameworks/Rust/ntex/src/main_plt.rs | 5 ++--- frameworks/Rust/ntex/src/utils.rs | 4 ++-- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/frameworks/Rust/ntex/src/db.rs b/frameworks/Rust/ntex/src/db.rs index cd4443f3c00..da33f1f6c35 100644 --- a/frameworks/Rust/ntex/src/db.rs +++ b/frameworks/Rust/ntex/src/db.rs @@ -173,7 +173,7 @@ impl PgConnection { utils::reserve(&mut body, 4 * 1024); FortunesTemplate { - fortunes: &*fortunes, + fortunes: &fortunes, } .write_call(&mut body); fortunes.clear(); diff --git a/frameworks/Rust/ntex/src/main.rs b/frameworks/Rust/ntex/src/main.rs index aeecbeae481..b0e53b3f05c 100644 --- a/frameworks/Rust/ntex/src/main.rs +++ b/frameworks/Rust/ntex/src/main.rs @@ -2,7 +2,7 @@ static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; use ntex::http::header::{CONTENT_TYPE, SERVER}; -use ntex::{http, time::Seconds, util::BytesMut, util::PoolId, util::Ready, web}; +use ntex::{http, time::Seconds, util::BytesMut, util::PoolId, web}; use sonic_rs::Serialize; mod utils; diff --git a/frameworks/Rust/ntex/src/main_db.rs b/frameworks/Rust/ntex/src/main_db.rs index bce599170ab..544921fb594 100644 --- a/frameworks/Rust/ntex/src/main_db.rs +++ b/frameworks/Rust/ntex/src/main_db.rs @@ -6,7 +6,7 @@ use ntex::http::header::{CONTENT_TYPE, SERVER}; use ntex::http::{HttpService, KeepAlive, Request, Response, StatusCode}; use ntex::service::{Service, ServiceCtx, ServiceFactory}; use ntex::web::{Error, HttpResponse}; -use ntex::{time::Seconds, util::PoolId, util::Ready}; +use ntex::{time::Seconds, util::PoolId}; mod db; mod utils; diff --git a/frameworks/Rust/ntex/src/main_plt.rs b/frameworks/Rust/ntex/src/main_plt.rs index 78642043289..e16070f0b63 100644 --- a/frameworks/Rust/ntex/src/main_plt.rs +++ b/frameworks/Rust/ntex/src/main_plt.rs @@ -1,10 +1,9 @@ #[global_allocator] static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc; -use std::{future::Future, io, pin::Pin, task::Context, task::Poll}; +use std::{future::Future, io, pin::Pin, task::ready, task::Context, task::Poll}; -use ntex::util::{ready, PoolId, Ready}; -use ntex::{fn_service, http::h1, io::Io, io::RecvError}; +use ntex::{fn_service, http::h1, io::Io, io::RecvError, util::PoolId}; use sonic_rs::Serialize; mod utils; diff --git a/frameworks/Rust/ntex/src/utils.rs b/frameworks/Rust/ntex/src/utils.rs index 7a2e6bf1df1..b8a9010237f 100644 --- a/frameworks/Rust/ntex/src/utils.rs +++ b/frameworks/Rust/ntex/src/utils.rs @@ -34,7 +34,7 @@ pub fn reserve(buf: &mut BytesMut, lw: usize) { pub struct BytesWriter<'a>(pub &'a mut BytesMut); -impl<'a> Write for BytesWriter<'a> { +impl Write for BytesWriter<'_> { fn write(&mut self, src: &[u8]) -> Result { self.0.extend_from_slice(src); Ok(src.len()) @@ -45,7 +45,7 @@ impl<'a> Write for BytesWriter<'a> { } } -impl<'a> WriteExt for BytesWriter<'a> { +impl WriteExt for BytesWriter<'_> { #[inline(always)] fn reserve_with(&mut self, additional: usize) -> Result<&mut [MaybeUninit], io::Error> { self.0.reserve(additional); From 698e69bca8f6e8c321dcfbc8e50caa39d30fb16b Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Sun, 9 Mar 2025 19:03:07 +0500 Subject: [PATCH 3/5] wip --- frameworks/Rust/ntex/benchmark_config.json | 2 +- frameworks/Rust/ntex/config.toml | 2 +- frameworks/Rust/ntex/ntex-plt-default.dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/frameworks/Rust/ntex/benchmark_config.json b/frameworks/Rust/ntex/benchmark_config.json index ef02ed24804..67ffbf68d7a 100755 --- a/frameworks/Rust/ntex/benchmark_config.json +++ b/frameworks/Rust/ntex/benchmark_config.json @@ -37,7 +37,7 @@ "notes": "", "versus": "" }, - "default": { + "default-rt": { "json_url": "/json", "plaintext_url": "/plaintext", "port": 8080, diff --git a/frameworks/Rust/ntex/config.toml b/frameworks/Rust/ntex/config.toml index 8fc74a20d70..3595c61e8fd 100644 --- a/frameworks/Rust/ntex/config.toml +++ b/frameworks/Rust/ntex/config.toml @@ -27,7 +27,7 @@ platform = "None" webserver = "ntex" versus = "" -[default] +[default-rt] urls.plaintext = "/plaintext" urls.json = "/json" approach = "Realistic" diff --git a/frameworks/Rust/ntex/ntex-plt-default.dockerfile b/frameworks/Rust/ntex/ntex-plt-default.dockerfile index f6b1c389bae..8e2e72a8343 100644 --- a/frameworks/Rust/ntex/ntex-plt-default.dockerfile +++ b/frameworks/Rust/ntex/ntex-plt-default.dockerfile @@ -9,7 +9,7 @@ ADD ./ /ntex WORKDIR /ntex RUN cargo clean -RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --features="default" +RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --features="default-rt" EXPOSE 8080 From a040c660d7d9f12e5543e10715be16f4d36da77b Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Sun, 9 Mar 2025 19:16:24 +0500 Subject: [PATCH 4/5] wip --- .../ntex/{ntex-default.dockerfile => ntex-default-rt.dockerfile} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename frameworks/Rust/ntex/{ntex-default.dockerfile => ntex-default-rt.dockerfile} (100%) diff --git a/frameworks/Rust/ntex/ntex-default.dockerfile b/frameworks/Rust/ntex/ntex-default-rt.dockerfile similarity index 100% rename from frameworks/Rust/ntex/ntex-default.dockerfile rename to frameworks/Rust/ntex/ntex-default-rt.dockerfile From 513db9464af6593bf1ccd300b3f41a09ca4f3fa1 Mon Sep 17 00:00:00 2001 From: Nikolay Kim Date: Mon, 10 Mar 2025 12:12:21 +0500 Subject: [PATCH 5/5] wip --- frameworks/Rust/ntex/Cargo.toml | 15 +++++++-------- frameworks/Rust/ntex/benchmark_config.json | 12 ++++++------ frameworks/Rust/ntex/config.toml | 6 +++--- ...ault-rt.dockerfile => ntex-db-neon.dockerfile} | 4 ++-- ...db-default.dockerfile => ntex-neon.dockerfile} | 4 ++-- ...efault.dockerfile => ntex-plt-neon.dockerfile} | 4 ++-- 6 files changed, 22 insertions(+), 23 deletions(-) rename frameworks/Rust/ntex/{ntex-default-rt.dockerfile => ntex-db-neon.dockerfile} (83%) rename frameworks/Rust/ntex/{ntex-db-default.dockerfile => ntex-neon.dockerfile} (83%) rename frameworks/Rust/ntex/{ntex-plt-default.dockerfile => ntex-plt-neon.dockerfile} (82%) diff --git a/frameworks/Rust/ntex/Cargo.toml b/frameworks/Rust/ntex/Cargo.toml index d87937a626f..bfc44e1e408 100755 --- a/frameworks/Rust/ntex/Cargo.toml +++ b/frameworks/Rust/ntex/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "ntex-bench" -version = "2.0.0" +version = "2.1.0" edition = "2018" [[bin]] @@ -12,7 +12,7 @@ name = "ntex-compio" path = "src/main.rs" [[bin]] -name = "ntex-default" +name = "ntex-neon" path = "src/main.rs" [[bin]] @@ -24,7 +24,7 @@ name = "ntex-db-compio" path = "src/main_db.rs" [[bin]] -name = "ntex-db-default" +name = "ntex-db-neon" path = "src/main_db.rs" [[bin]] @@ -36,7 +36,7 @@ name = "ntex-plt-compio" path = "src/main_plt.rs" [[bin]] -name = "ntex-plt-default" +name = "ntex-plt-neon" path = "src/main_plt.rs" [features] @@ -48,8 +48,8 @@ tokio = ["ntex/tokio"] # compio runtime compio = ["ntex/compio"] -# default-rt runtime -default-rt = ["ntex/default-rt"] +# neon runtime +neon = ["ntex/neon"] [dependencies] ntex = "2.12" @@ -76,10 +76,9 @@ compio-driver = { version = "*", features = ["io-uring"]} [patch.crates-io] ntex = { git = "https://github.com/ntex-rs/ntex.git" } ntex-io = { git = "https://github.com/ntex-rs/ntex.git" } -ntex-iodriver = { git = "https://github.com/ntex-rs/ntex.git" } ntex-net = { git = "https://github.com/ntex-rs/ntex.git" } ntex-rt = { git = "https://github.com/ntex-rs/ntex.git" } -ntex-runtime = { git = "https://github.com/ntex-rs/ntex.git" } +ntex-neon = { git = "https://github.com/ntex-rs/ntex.git" } [profile.release] opt-level = 3 diff --git a/frameworks/Rust/ntex/benchmark_config.json b/frameworks/Rust/ntex/benchmark_config.json index 67ffbf68d7a..44e54843e8e 100755 --- a/frameworks/Rust/ntex/benchmark_config.json +++ b/frameworks/Rust/ntex/benchmark_config.json @@ -37,7 +37,7 @@ "notes": "", "versus": "" }, - "default-rt": { + "neon": { "json_url": "/json", "plaintext_url": "/plaintext", "port": 8080, @@ -51,7 +51,7 @@ "webserver": "ntex", "os": "Linux", "database_os": "Linux", - "display_name": "ntex [default]", + "display_name": "ntex [neon]", "notes": "", "versus": "" }, @@ -95,7 +95,7 @@ "notes": "", "versus": "" }, - "db-default": { + "db-neon": { "fortune_url": "/fortunes", "db_url": "/db", "query_url": "/query?q=", @@ -111,7 +111,7 @@ "webserver": "ntex", "os": "Linux", "database_os": "Linux", - "display_name": "ntex [default,db]", + "display_name": "ntex [neon,db]", "notes": "", "versus": "" }, @@ -151,7 +151,7 @@ "notes": "", "versus": "" }, - "plt-default": { + "plt-neon": { "json_url": "/json", "plaintext_url": "/plaintext", "port": 8080, @@ -165,7 +165,7 @@ "webserver": "ntex", "os": "Linux", "database_os": "Linux", - "display_name": "ntex [default,platform]", + "display_name": "ntex [neon,platform]", "notes": "", "versus": "" } diff --git a/frameworks/Rust/ntex/config.toml b/frameworks/Rust/ntex/config.toml index 3595c61e8fd..75e7832f73b 100644 --- a/frameworks/Rust/ntex/config.toml +++ b/frameworks/Rust/ntex/config.toml @@ -27,7 +27,7 @@ platform = "None" webserver = "ntex" versus = "" -[default-rt] +[neon] urls.plaintext = "/plaintext" urls.json = "/json" approach = "Realistic" @@ -70,7 +70,7 @@ platform = "None" webserver = "ntex" versus = "" -[db-default] +[db-neon] urls.db = "/db" urls.query = "/query?q=" urls.update = "/update?q=" @@ -111,7 +111,7 @@ platform = "None" webserver = "ntex" versus = "" -[plt-default] +[plt-neon] urls.plaintext = "/plaintext" urls.json = "/json" approach = "Realistic" diff --git a/frameworks/Rust/ntex/ntex-default-rt.dockerfile b/frameworks/Rust/ntex/ntex-db-neon.dockerfile similarity index 83% rename from frameworks/Rust/ntex/ntex-default-rt.dockerfile rename to frameworks/Rust/ntex/ntex-db-neon.dockerfile index 06a70a68a8f..0bd30d7d49c 100644 --- a/frameworks/Rust/ntex/ntex-default-rt.dockerfile +++ b/frameworks/Rust/ntex/ntex-db-neon.dockerfile @@ -9,8 +9,8 @@ ADD ./ /ntex WORKDIR /ntex RUN cargo clean -RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --features="default-rt" +RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --features="neon" EXPOSE 8080 -CMD ./target/release/ntex-default +CMD ./target/release/ntex-db-neon diff --git a/frameworks/Rust/ntex/ntex-db-default.dockerfile b/frameworks/Rust/ntex/ntex-neon.dockerfile similarity index 83% rename from frameworks/Rust/ntex/ntex-db-default.dockerfile rename to frameworks/Rust/ntex/ntex-neon.dockerfile index 1ce2f12e7af..91b0ac1acba 100644 --- a/frameworks/Rust/ntex/ntex-db-default.dockerfile +++ b/frameworks/Rust/ntex/ntex-neon.dockerfile @@ -9,8 +9,8 @@ ADD ./ /ntex WORKDIR /ntex RUN cargo clean -RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --features="default-rt" +RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --features="neon" EXPOSE 8080 -CMD ./target/release/ntex-db-default +CMD ./target/release/ntex-neon diff --git a/frameworks/Rust/ntex/ntex-plt-default.dockerfile b/frameworks/Rust/ntex/ntex-plt-neon.dockerfile similarity index 82% rename from frameworks/Rust/ntex/ntex-plt-default.dockerfile rename to frameworks/Rust/ntex/ntex-plt-neon.dockerfile index 8e2e72a8343..766886f6997 100644 --- a/frameworks/Rust/ntex/ntex-plt-default.dockerfile +++ b/frameworks/Rust/ntex/ntex-plt-neon.dockerfile @@ -9,8 +9,8 @@ ADD ./ /ntex WORKDIR /ntex RUN cargo clean -RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --features="default-rt" +RUN RUSTFLAGS="-C target-cpu=native" cargo build --release --features="neon" EXPOSE 8080 -CMD ./target/release/ntex-plt-default +CMD ./target/release/ntex-plt-neon