Merge pull request #541 from MDA2AV/actix-audit

MDA2AV · web-flow · commit df7be7306024 · 2026-04-17T14:36:12.000+01:00
fix actix cheating vectors
diff --git a/frameworks/actix/src/main.rs b/frameworks/actix/src/main.rs
@@ -87,35 +87,15 @@ struct JsonResponse {
     count: usize,
 }
 
-// AppState is wrapped by web::Data which is already an Arc — no need to double-wrap
 struct AppState {
     dataset: Vec<DatasetItem>,
-    json_cache: JsonCache,
 }
 
-struct JsonCached {
-    identity: Bytes,
-    gzip: Bytes,
-    brotli: Bytes,
-}
-
-type JsonCache = HashMap<(usize, i64), JsonCached>;
-
-// (count, m) pairs the benchmark + validation script fires. Precomputing covers
-// 100% of hot-path traffic; anything outside this set falls through to dynamic
-// serialization in json_endpoint.
-const JSON_CACHE_PAIRS: &[(usize, i64)] = &[
-    // benchmark: json-gzip-{1,5,10,15,25,40,50}.raw
-    (1, 3), (5, 7), (10, 2), (15, 5), (25, 4), (40, 8), (50, 6),
-    // validation: validate.sh json-comp checks
-    (12, 9), (31, 4), (50, 1),
-];
-
 fn gzip_bytes(input: &[u8]) -> Bytes {
     use flate2::write::GzEncoder;
     use flate2::Compression;
     use std::io::Write;
-    let mut enc = GzEncoder::new(Vec::with_capacity(input.len()), Compression::new(6));
+    let mut enc = GzEncoder::new(Vec::with_capacity(input.len()), Compression::new(1));
     enc.write_all(input).ok();
     Bytes::from(enc.finish().unwrap_or_default())
 }
@@ -124,7 +104,7 @@ fn brotli_bytes(input: &[u8]) -> Bytes {
     use std::io::Write;
     let mut out = Vec::with_capacity(input.len());
     {
-        let mut enc = brotli::CompressorWriter::new(&mut out, 4096, 11, 22);
+        let mut enc = brotli::CompressorWriter::new(&mut out, 4096, 1, 22);
         enc.write_all(input).ok();
         enc.flush().ok();
     }
@@ -154,25 +134,6 @@ fn build_json_body(dataset: &[DatasetItem], count: usize, m: i64) -> Vec<u8> {
     serde_json::to_vec(&resp).unwrap_or_default()
 }
 
-fn build_json_cache(dataset: &[DatasetItem]) -> JsonCache {
-    let mut cache = HashMap::new();
-    for &(count, m) in JSON_CACHE_PAIRS {
-        let body = build_json_body(dataset, count, m);
-        let identity = Bytes::from(body.clone());
-        let gzip = gzip_bytes(&body);
-        let brotli = brotli_bytes(&body);
-        cache.insert(
-            (count, m),
-            JsonCached {
-                identity,
-                gzip,
-                brotli,
-            },
-        );
-    }
-    cache
-}
-
 fn load_dataset() -> Vec<DatasetItem> {
     let path = std::env::var("DATASET_PATH").unwrap_or_else(|_| "/data/dataset.json".to_string());
     match std::fs::read_to_string(&path) {
@@ -341,7 +302,6 @@ async fn upload(mut payload: web::Payload) -> HttpResponse {
         .body(size.to_string())
 }
 
-// web::Data<AppState> — no Arc wrapping, web::Data handles it internally
 async fn json_endpoint(
     req: actix_web::HttpRequest,
     state: web::Data<AppState>,
@@ -356,35 +316,6 @@ async fn json_endpoint(
         .and_then(|v| v.to_str().ok())
         .unwrap_or("");
 
-    // Hot path: precomputed (count, m) pair. Serve bytes directly and skip both
-    // JSON serialization and runtime compression.
-    if let Some(cached) = state.json_cache.get(&(count, m)) {
-        if ae.contains("br") {
-            return HttpResponse::Ok()
-                .insert_header((SERVER, SERVER_HDR.clone()))
-                .insert_header(("Content-Type", "application/json"))
-                .insert_header(("Content-Encoding", "br"))
-                .insert_header(("Vary", "Accept-Encoding"))
-                .body(cached.brotli.clone());
-        }
-        if ae.contains("gzip") {
-            return HttpResponse::Ok()
-                .insert_header((SERVER, SERVER_HDR.clone()))
-                .insert_header(("Content-Type", "application/json"))
-                .insert_header(("Content-Encoding", "gzip"))
-                .insert_header(("Vary", "Accept-Encoding"))
-                .body(cached.gzip.clone());
-        }
-        return HttpResponse::Ok()
-            .insert_header((SERVER, SERVER_HDR.clone()))
-            .insert_header(("Content-Type", "application/json"))
-            .insert_header(("Vary", "Accept-Encoding"))
-            .body(cached.identity.clone());
-    }
-
-    // Fallback: dynamic serialization for non-cached queries (validation edge
-    // cases, manual curl, etc.). Still honors Accept-Encoding by compressing
-    // inline so the response is correct.
     let body = build_json_body(&state.dataset, count, m);
     if ae.contains("br") {
         return HttpResponse::Ok()
@@ -496,12 +427,7 @@ fn load_tls_config() -> Option<ServerConfig> {
 #[actix_web::main]
 async fn main() -> io::Result<()> {
     let dataset = load_dataset();
-    let json_cache = build_json_cache(&dataset);
-
-    let state = web::Data::new(AppState {
-        dataset,
-        json_cache,
-    });
+    let state = web::Data::new(AppState { dataset });
 
     let static_assets = web::Data::new(load_static_assets());
 
diff --git a/site/data/current.json b/site/data/current.json
@@ -1,5 +1,5 @@
 {
-  "date": "2026-04-16",
+  "date": "2026-04-17",
   "cpu": "AMD Ryzen Threadripper PRO 3995WX 64-Cores",
   "cores": "64",
   "threads": "128",
@@ -9,13 +9,13 @@
   "kernel": "6.17.0-20-generic",
   "docker": "29.3.0",
   "docker_runtime": "runc",
-  "governor": "powersave",
-  "commit": "e5b3ac38",
+  "governor": "performance",
+  "commit": "3b7bdce6",
   "tcp": {
-    "lo_mtu": "65536",
+    "lo_mtu": "1500",
     "congestion": "cubic",
     "somaxconn": "65535",
     "rmem_max": "7500000",
     "wmem_max": "7500000"
   }
-}
+}
diff --git a/site/data/json-4096.json b/site/data/json-4096.json
@@ -2,19 +2,18 @@
   {
     "framework": "actix",
     "language": "Rust",
-    "rps": 1786503,
-    "avg_latency": "1.79ms",
-    "p99_latency": "29.90ms",
-    "cpu": "6289.5%",
-    "memory": "363.6MiB",
+    "rps": 1221971,
+    "avg_latency": "3.00ms",
+    "p99_latency": "30.70ms",
+    "cpu": "6657.6%",
+    "memory": "294MiB",
     "connections": 4096,
     "threads": 64,
     "duration": "5s",
     "pipeline": 1,
-    "bandwidth": "6.10GB/s",
-    "input_bw": "85.19MB/s",
-    "reconnects": 355422,
-    "status_2xx": 8932518,
+    "bandwidth": "4.17GB/s",
+    "reconnects": 243075,
+    "status_2xx": 6109857,
     "status_3xx": 0,
     "status_4xx": 0,
     "status_5xx": 0
diff --git a/site/data/json-comp-16384.json b/site/data/json-comp-16384.json
@@ -2,19 +2,18 @@
   {
     "framework": "actix",
     "language": "Rust",
-    "rps": 1158892,
-    "avg_latency": "10.63ms",
-    "p99_latency": "33.00ms",
-    "cpu": "3388.0%",
-    "memory": "581.0MiB",
+    "rps": 691184,
+    "avg_latency": "20.23ms",
+    "p99_latency": "60.00ms",
+    "cpu": "5996.9%",
+    "memory": "614MiB",
     "connections": 16384,
     "threads": 64,
     "duration": "5s",
     "pipeline": 1,
-    "bandwidth": "866.04MB/s",
-    "input_bw": "85.10MB/s",
-    "reconnects": 224836,
-    "status_2xx": 5806052,
+    "bandwidth": "730.04MB/s",
+    "reconnects": 130372,
+    "status_2xx": 3455924,
     "status_3xx": 0,
     "status_4xx": 0,
     "status_5xx": 0
diff --git a/site/data/json-comp-4096.json b/site/data/json-comp-4096.json
@@ -2,19 +2,18 @@
   {
     "framework": "actix",
     "language": "Rust",
-    "rps": 2270631,
-    "avg_latency": "1.50ms",
-    "p99_latency": "19.80ms",
-    "cpu": "6282.5%",
-    "memory": "362.6MiB",
+    "rps": 732888,
+    "avg_latency": "5.57ms",
+    "p99_latency": "24.70ms",
+    "cpu": "6632.4%",
+    "memory": "235MiB",
     "connections": 4096,
     "threads": 64,
     "duration": "5s",
     "pipeline": 1,
-    "bandwidth": "1.66GB/s",
-    "input_bw": "166.74MB/s",
-    "reconnects": 452367,
-    "status_2xx": 11353159,
+    "bandwidth": "774.37MB/s",
+    "reconnects": 144745,
+    "status_2xx": 3664444,
     "status_3xx": 0,
     "status_4xx": 0,
     "status_5xx": 0
diff --git a/site/data/json-comp-512.json b/site/data/json-comp-512.json
@@ -2,19 +2,18 @@
   {
     "framework": "actix",
     "language": "Rust",
-    "rps": 1972569,
-    "avg_latency": "131us",
-    "p99_latency": "1.08ms",
-    "cpu": "6154.7%",
-    "memory": "109.7MiB",
+    "rps": 728507,
+    "avg_latency": "687us",
+    "p99_latency": "3.82ms",
+    "cpu": "6280.3%",
+    "memory": "99MiB",
     "connections": 512,
     "threads": 64,
     "duration": "5s",
     "pipeline": 1,
-    "bandwidth": "1.44GB/s",
-    "input_bw": "144.85MB/s",
-    "reconnects": 394513,
-    "status_2xx": 9862847,
+    "bandwidth": "769.81MB/s",
+    "reconnects": 145502,
+    "status_2xx": 3642539,
     "status_3xx": 0,
     "status_4xx": 0,
     "status_5xx": 0
diff --git a/site/data/static-1024.json b/site/data/static-1024.json
@@ -381,18 +381,19 @@
   {
     "framework": "rage",
     "language": "Ruby",
-    "rps": 993470,
-    "avg_latency": "1.09ms",
-    "p99_latency": "1.09ms",
-    "cpu": "6510.2%",
-    "memory": "3.6GiB",
+    "rps": 94201,
+    "avg_latency": "11.13ms",
+    "p99_latency": "11.13ms",
+    "cpu": "8272.6%",
+    "memory": "4.7GiB",
     "connections": 1024,
     "threads": 64,
     "duration": "5s",
     "pipeline": 1,
-    "bandwidth": "17.05GB",
+    "bandwidth": "5.59GB",
+    "input_bw": "",
     "reconnects": 0,
-    "status_2xx": 5024837,
+    "status_2xx": 480457,
     "status_3xx": 0,
     "status_4xx": 0,
     "status_5xx": 0
@@ -460,18 +461,19 @@
   {
     "framework": "sinatra",
     "language": "Ruby",
-    "rps": 209509,
-    "avg_latency": "5.23ms",
-    "p99_latency": "5.23ms",
-    "cpu": "6421.5%",
-    "memory": "9.1GiB",
+    "rps": 187796,
+    "avg_latency": "5.76ms",
+    "p99_latency": "5.76ms",
+    "cpu": "6366.8%",
+    "memory": "7.5GiB",
     "connections": 1024,
     "threads": 64,
     "duration": "5s",
     "pipeline": 1,
-    "bandwidth": "12.43GB",
+    "bandwidth": "11.14GB",
+    "input_bw": "",
     "reconnects": 0,
-    "status_2xx": 1068394,
+    "status_2xx": 954125,
     "status_3xx": 0,
     "status_4xx": 0,
     "status_5xx": 0
diff --git a/site/data/static-4096.json b/site/data/static-4096.json
@@ -381,18 +381,19 @@
   {
     "framework": "rage",
     "language": "Ruby",
-    "rps": 961904,
-    "avg_latency": "4.20ms",
-    "p99_latency": "4.20ms",
-    "cpu": "6438.4%",
-    "memory": "3.6GiB",
+    "rps": 92213,
+    "avg_latency": "43.53ms",
+    "p99_latency": "43.53ms",
+    "cpu": "7315.3%",
+    "memory": "4.6GiB",
     "connections": 4096,
     "threads": 64,
     "duration": "5s",
     "pipeline": 1,
-    "bandwidth": "16.51GB",
+    "bandwidth": "5.47GB",
+    "input_bw": "",
     "reconnects": 0,
-    "status_2xx": 4873051,
+    "status_2xx": 471281,
     "status_3xx": 0,
     "status_4xx": 0,
     "status_5xx": 0
@@ -460,18 +461,19 @@
   {
     "framework": "sinatra",
     "language": "Ruby",
-    "rps": 202168,
-    "avg_latency": "19.71ms",
-    "p99_latency": "19.71ms",
-    "cpu": "6427.4%",
-    "memory": "8.4GiB",
+    "rps": 183177,
+    "avg_latency": "21.55ms",
+    "p99_latency": "21.55ms",
+    "cpu": "6552.0%",
+    "memory": "8.6GiB",
     "connections": 4096,
     "threads": 64,
     "duration": "5s",
     "pipeline": 1,
-    "bandwidth": "12.00GB",
+    "bandwidth": "10.86GB",
+    "input_bw": "",
     "reconnects": 0,
-    "status_2xx": 1032998,
+    "status_2xx": 935378,
     "status_3xx": 0,
     "status_4xx": 0,
     "status_5xx": 0
diff --git a/site/data/static-6800.json b/site/data/static-6800.json
