Nikolay Kim 5 months ago
parent
commit
513db9464a

+ 7 - 8
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

+ 6 - 6
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": ""
     }

+ 3 - 3
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"

+ 2 - 2
frameworks/Rust/ntex/ntex-default-rt.dockerfile → 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

+ 2 - 2
frameworks/Rust/ntex/ntex-db-default.dockerfile → 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

+ 2 - 2
frameworks/Rust/ntex/ntex-plt-default.dockerfile → 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