RubyGems - raptor - Versions diffs - 0.24.0 → 0.25.0 - Mend

raptor 0.24.0 → 0.25.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (11) hide show

checksums.yaml +4 -4
data/CHANGELOG.md +4 -0
data/README.md +56 -56
data/docs/raptor-vs-puma.md +4 -2
data/docs/talk.md +1 -1
data/lib/raptor/reactor.rb +102 -72
data/lib/raptor/version.rb +1 -1
data/lib/raptor.rb +1 -1
data/sig/generated/raptor/reactor.rbs +31 -16
data/sig/generated/raptor.rbs +1 -1
metadata +2 -2

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8c3462777a399cad50b6131c497c98ab519850ff1d88d062b681cc05c9d540b
-  data.tar.gz: 878a2629b500d8873836cda4bd463f0dcb727a33bd301fc5a246cd860a3f0957
+  metadata.gz: 59fe5e87d01266b5c1c95e08e24339fc1bae9748c9ed814d4694903a2bbce8c5
+  data.tar.gz: 53cb18d26ad63f298a7a94496c536b561de3c7be29113df8ee77736d20c9019e
 SHA512:
-  metadata.gz: 0d9b05f416a7024c91dc2861d6f748eadb1c20e01224c3e82a1202247f48220e56f81742fa600f41f1885c60587464b9506c0e2855d9392767016f5199bb0d94
-  data.tar.gz: 93403bcdbfaef05e6a011cc795ef66b7713dc2ed4266c157afb3f5eb1b53ae60c8f7610e60d2caee75e8b82716e58cac6b771543d6f9d43823cb03e5eed87dd8
+  metadata.gz: e8a0997c88a5f7962cf9ae1d1a7e5ceb18830a321fc722cd88e87e848e998a68f0d2aa6bb091b5f6c0a7a074666a580150038d8ea52820f0518ff9f14e745ca7
+  data.tar.gz: 67178c0c92dca4d419f2127185c0df981f67e9e5e561b05d2f0c67fdb953db5db1d5866ae35d2b2a48b8a2bfe02439d7a41305da7fa691c04d3057edfbce73a0

data/CHANGELOG.md CHANGED Viewed

@@ -1,5 +1,9 @@
 ## [Unreleased]
+## [0.25.0] - 2026-11-08
+- Replace nio4r with io-event for reactor I/O readiness without changing application threading
 ## [0.24.0] - 2026-11-08
 - Honour `connection.max_body_size` for HTTP/2 request bodies without closing other streams

data/README.md CHANGED Viewed

@@ -1,7 +1,7 @@
 # Raptor
 Raptor is a high-performance, preloading, pre-forking, multi-threaded Ruby 4+ web server implementing Rack 3.2+, using
-NIO for non-blocking I/O and Ractors for parallel HTTP/1.1 and HTTP/2 parsing via native C extensions, which also
+io-event for non-blocking I/O and Ractors for parallel HTTP/1.1 and HTTP/2 parsing via native C extensions, which also
 implement HPACK compression.
 > [!NOTE]
@@ -250,7 +250,7 @@ Set `control_url` to a Unix socket URL such as `unix:///tmp/raptor-control.sock`
 ## (Micro) Benchmarks
-Raptor 0.24.0 vs Puma 8.0.2 vs Falcon 0.57.0. Each case has 3 fresh-process samples, interleaved in seeded shuffled
+Raptor 0.25.0 vs Puma 8.0.2 vs Falcon 0.57.0. Each case has 3 fresh-process samples, interleaved in seeded shuffled
 rounds. Each sample warms up for 3s and measures for 15s. Metrics are independent medians. ± is (max − min) / 2 /
 median, not a confidence interval. Failure counts below each table sum all samples, so a failed run cannot disappear in
 a median. Throughput counts successful ordinary requests only.
@@ -278,92 +278,92 @@ accounting for shared pages instead of counting them fully in every worker.
 | Server | Mode           | Raptor baseline | req/s        | vs Raptor req/s | p95 ms | vs Raptor p95 | CPU ms/req | PSS MiB |
 | ------ | -------------- | --------------- | ------------ | --------------- | ------ | ------------- | ---------- | ------- |
-| Raptor | Fixed (3)      | -               | 3.32k ±0.2%  | -               | 50.10  | -             | 2.387      | 364.0   |
-| Raptor | Scaling (3–16) | -               | 8.10k ±0.3%  | -               | 22.45  | -             | 0.514      | 340.8   |
-| Puma   | Fixed (3)      | Fixed (3)       | 1.55k ±0.9%  | 53.4% lower     | 121.78 | 143.1% higher | 0.737      | 283.8   |
-| Puma   | Scaling (3–16) | Scaling (3–16)  | 8.13k ±0.7%  | 0.4% higher     | 22.41  | 0.1% lower    | 0.481      | 341.2   |
-| Falcon | Fibers         | Fixed (3)       | 10.65k ±4.1% | 220.8% higher   | 16.18  | 67.7% lower   | 0.450      | 425.5   |
-| Falcon | Fibers         | Scaling (3–16)  | 10.65k ±4.1% | 31.5% higher    | 16.18  | 27.9% lower   | 0.450      | 425.5   |
+| Raptor | Fixed (3)      | -               | 3.41k ±0.9%  | -               | 44.85  | -             | 2.438      | 363.9   |
+| Raptor | Scaling (3–16) | -               | 8.12k ±0.8%  | -               | 22.30  | -             | 0.495      | 332.2   |
+| Puma   | Fixed (3)      | Fixed (3)       | 1.53k ±1.3%  | 55.0% lower     | 118.30 | 163.8% higher | 0.950      | 289.8   |
+| Puma   | Scaling (3–16) | Scaling (3–16)  | 8.22k ±0.3%  | 1.3% higher     | 22.02  | 1.3% lower    | 0.484      | 337.6   |
+| Falcon | Fibers         | Fixed (3)       | 10.87k ±0.4% | 218.7% higher   | 15.63  | 65.1% lower   | 0.468      | 437.3   |
+| Falcon | Fibers         | Scaling (3–16)  | 10.87k ±0.4% | 34.0% higher    | 15.63  | 29.9% lower   | 0.468      | 437.3   |
 ### IO over HTTP/1.1 keep-alive
 | Server | Mode           | Raptor baseline | req/s       | vs Raptor req/s | p95 ms | vs Raptor p95 | CPU ms/req | PSS MiB |
 | ------ | -------------- | --------------- | ----------- | --------------- | ------ | ------------- | ---------- | ------- |
-| Raptor | Fixed (3)      | -               | 3.01k ±8.2% | -               | 56.38  | -             | 2.306      | 365.0   |
-| Raptor | Scaling (3–16) | -               | 7.55k ±0.6% | -               | 24.18  | -             | 0.500      | 363.7   |
-| Raptor | Fixed (16)     | -               | 7.56k ±0.7% | -               | 24.16  | -             | 0.468      | 367.8   |
-| Puma   | Fixed (3)      | Fixed (3)       | 1.49k ±0.2% | 50.4% lower     | 105.33 | 86.8% higher  | 0.784      | 290.7   |
-| Puma   | Scaling (3–16) | Scaling (3–16)  | 7.63k ±0.9% | 1.1% higher     | 23.89  | 1.2% lower    | 0.466      | 329.9   |
-| Puma   | Fixed (16)     | Fixed (16)      | 7.73k ±0.5% | 2.2% higher     | 23.55  | 2.5% lower    | 0.461      | 332.3   |
-| Falcon | Fibers         | Fixed (3)       | 7.54k ±1.8% | 150.8% higher   | 24.40  | 56.7% lower   | 0.373      | 357.4   |
-| Falcon | Fibers         | Scaling (3–16)  | 7.54k ±1.8% | 0.1% lower      | 24.40  | 0.9% higher   | 0.373      | 357.4   |
-| Falcon | Fibers         | Fixed (16)      | 7.54k ±1.8% | 0.2% lower      | 24.40  | 1.0% higher   | 0.373      | 357.4   |
+| Raptor | Fixed (3)      | -               | 3.40k ±3.1% | -               | 38.77  | -             | 2.440      | 369.9   |
+| Raptor | Scaling (3–16) | -               | 7.44k ±0.4% | -               | 24.43  | -             | 0.494      | 356.2   |
+| Raptor | Fixed (16)     | -               | 7.55k ±2.0% | -               | 24.11  | -             | 0.475      | 358.0   |
+| Puma   | Fixed (3)      | Fixed (3)       | 1.50k ±0.8% | 56.0% lower     | 104.07 | 168.5% higher | 1.038      | 299.3   |
+| Puma   | Scaling (3–16) | Scaling (3–16)  | 7.44k ±0.3% | 0.1% higher     | 24.44  | 0.1% higher   | 0.441      | 341.3   |
+| Puma   | Fixed (16)     | Fixed (16)      | 7.59k ±1.2% | 0.5% higher     | 23.94  | 0.7% lower    | 0.442      | 345.2   |
+| Falcon | Fibers         | Fixed (3)       | 7.58k ±4.3% | 123.1% higher   | 23.89  | 38.4% lower   | 0.408      | 365.3   |
+| Falcon | Fibers         | Scaling (3–16)  | 7.58k ±4.3% | 1.9% higher     | 23.89  | 2.2% lower    | 0.408      | 365.3   |
+| Falcon | Fibers         | Fixed (16)      | 7.58k ±4.3% | 0.4% higher     | 23.89  | 0.9% lower    | 0.408      | 365.3   |
 ### IO over HTTP/2
-| Server | Mode           | Raptor baseline | req/s       | vs Raptor req/s | p95 ms | vs Raptor p95 | CPU ms/req | PSS MiB |
-| ------ | -------------- | --------------- | ----------- | --------------- | ------ | ------------- | ---------- | ------- |
-| Raptor | Fixed (3)      | -               | 1.60k ±6.4% | -               | 119.04 | -             | 0.779      | 418.0   |
-| Raptor | Scaling (3–16) | -               | 7.98k ±9.9% | -               | 23.38  | -             | 0.565      | 894.4   |
-| Falcon | Fibers         | Fixed (3)       | 7.18k ±1.3% | 348.7% higher   | 26.29  | 77.9% lower   | 0.438      | 515.8   |
-| Falcon | Fibers         | Scaling (3–16)  | 7.18k ±1.3% | 10.0% lower     | 26.29  | 12.4% higher  | 0.438      | 515.8   |
+| Server | Mode           | Raptor baseline | req/s        | vs Raptor req/s | p95 ms | vs Raptor p95 | CPU ms/req | PSS MiB |
+| ------ | -------------- | --------------- | ------------ | --------------- | ------ | ------------- | ---------- | ------- |
+| Raptor | Fixed (3)      | -               | 1.60k ±0.3%  | -               | 130.95 | -             | 0.937      | 474.6   |
+| Raptor | Scaling (3–16) | -               | 8.03k ±5.7%  | -               | 23.92  | -             | 0.573      | 905.4   |
+| Falcon | Fibers         | Fixed (3)       | 7.55k ±10.7% | 370.7% higher   | 25.90  | 80.2% lower   | 0.462      | 497.3   |
+| Falcon | Fibers         | Scaling (3–16)  | 7.55k ±10.7% | 5.9% lower      | 25.90  | 8.3% higher   | 0.462      | 497.3   |
 ### CPU over HTTP/1.1
 | Server | Mode           | Raptor baseline | req/s       | vs Raptor req/s | p95 ms | vs Raptor p95 | CPU ms/req | PSS MiB |
 | ------ | -------------- | --------------- | ----------- | --------------- | ------ | ------------- | ---------- | ------- |
-| Raptor | Fixed (3)      | -               | 3.13k ±0.3% | -               | 72.60  | -             | 2.673      | 526.0   |
-| Raptor | Scaling (3–16) | -               | 3.22k ±2.0% | -               | 68.49  | -             | 2.546      | 520.0   |
-| Puma   | Fixed (3)      | Fixed (3)       | 2.98k ±0.7% | 4.8% lower      | 62.70  | 13.6% lower   | 2.615      | 474.7   |
-| Puma   | Scaling (3–16) | Scaling (3–16)  | 2.64k ±3.2% | 17.9% lower     | 59.81  | 12.7% lower   | 2.522      | 567.4   |
-| Falcon | Fibers         | Fixed (3)       | 3.65k ±7.0% | 16.4% higher    | 46.10  | 36.5% lower   | 2.311      | 389.2   |
-| Falcon | Fibers         | Scaling (3–16)  | 3.65k ±7.0% | 13.3% higher    | 46.10  | 32.7% lower   | 2.311      | 389.2   |
+| Raptor | Fixed (3)      | -               | 3.38k ±1.4% | -               | 68.70  | -             | 2.546      | 506.9   |
+| Raptor | Scaling (3–16) | -               | 3.37k ±2.4% | -               | 63.69  | -             | 2.482      | 532.6   |
+| Puma   | Fixed (3)      | Fixed (3)       | 3.17k ±1.2% | 6.2% lower      | 56.91  | 17.2% lower   | 2.521      | 451.2   |
+| Puma   | Scaling (3–16) | Scaling (3–16)  | 3.20k ±3.9% | 5.1% lower      | 50.38  | 20.9% lower   | 2.236      | 460.7   |
+| Falcon | Fibers         | Fixed (3)       | 3.40k ±1.0% | 0.7% higher     | 47.88  | 30.3% lower   | 2.533      | 428.3   |
+| Falcon | Fibers         | Scaling (3–16)  | 3.40k ±1.0% | 0.9% higher     | 47.88  | 24.8% lower   | 2.533      | 428.3   |
 ### CPU over HTTP/1.1 keep-alive
 | Server | Mode           | Raptor baseline | req/s       | vs Raptor req/s | p95 ms | vs Raptor p95 | CPU ms/req | PSS MiB |
 | ------ | -------------- | --------------- | ----------- | --------------- | ------ | ------------- | ---------- | ------- |
-| Raptor | Fixed (3)      | -               | 2.88k ±1.6% | -               | 57.40  | -             | 2.721      | 515.4   |
-| Raptor | Scaling (3–16) | -               | 2.81k ±3.8% | -               | 56.14  | -             | 2.721      | 528.2   |
-| Puma   | Fixed (3)      | Fixed (3)       | 3.24k ±0.7% | 12.3% higher    | 60.73  | 5.8% higher   | 2.449      | 406.4   |
-| Puma   | Scaling (3–16) | Scaling (3–16)  | 2.71k ±3.6% | 3.3% lower      | 70.56  | 25.7% higher  | 2.459      | 487.6   |
-| Falcon | Fibers         | Fixed (3)       | 3.62k ±1.0% | 25.8% higher    | 62.03  | 8.1% higher   | 2.369      | 542.0   |
-| Falcon | Fibers         | Scaling (3–16)  | 3.62k ±1.0% | 29.1% higher    | 62.03  | 10.5% higher  | 2.369      | 542.0   |
+| Raptor | Fixed (3)      | -               | 3.09k ±3.7% | -               | 59.42  | -             | 2.732      | 503.7   |
+| Raptor | Scaling (3–16) | -               | 2.93k ±2.0% | -               | 50.46  | -             | 2.645      | 518.6   |
+| Puma   | Fixed (3)      | Fixed (3)       | 3.41k ±6.7% | 10.7% higher    | 57.91  | 2.5% lower    | 2.423      | 406.4   |
+| Puma   | Scaling (3–16) | Scaling (3–16)  | 2.79k ±1.6% | 4.9% lower      | 66.33  | 31.5% higher  | 2.291      | 497.1   |
+| Falcon | Fibers         | Fixed (3)       | 3.01k ±6.2% | 2.5% lower      | 73.18  | 23.1% higher  | 2.920      | 563.1   |
+| Falcon | Fibers         | Scaling (3–16)  | 3.01k ±6.2% | 2.6% higher     | 73.18  | 45.0% higher  | 2.920      | 563.1   |
 ### CPU over HTTP/2
 | Server | Mode           | Raptor baseline | req/s        | vs Raptor req/s | p95 ms | vs Raptor p95 | CPU ms/req | PSS MiB |
 | ------ | -------------- | --------------- | ------------ | --------------- | ------ | ------------- | ---------- | ------- |
-| Raptor | Fixed (3)      | -               | 3.12k ±1.3%  | -               | 65.66  | -             | 2.439      | 587.6   |
-| Raptor | Scaling (3–16) | -               | 3.15k ±0.4%  | -               | 74.95  | -             | 2.344      | 609.0   |
-| Falcon | Fibers         | Fixed (3)       | 3.49k ±20.7% | 11.7% higher    | 120.58 | 83.6% higher  | 2.309      | 536.3   |
-| Falcon | Fibers         | Scaling (3–16)  | 3.49k ±20.7% | 10.7% higher    | 120.58 | 60.9% higher  | 2.309      | 536.3   |
+| Raptor | Fixed (3)      | -               | 3.20k ±2.9%  | -               | 72.40  | -             | 2.401      | 621.4   |
+| Raptor | Scaling (3–16) | -               | 3.11k ±1.4%  | -               | 75.04  | -             | 2.403      | 597.8   |
+| Falcon | Fibers         | Fixed (3)       | 2.45k ±20.8% | 23.4% lower     | 147.43 | 103.6% higher | 2.616      | 567.1   |
+| Falcon | Fibers         | Scaling (3–16)  | 2.45k ±20.8% | 21.2% lower     | 147.43 | 96.5% higher  | 2.616      | 567.1   |
 ### 64 KiB body over HTTP/1.1 keep-alive
-| Server | Mode           | Raptor baseline | req/s        | vs Raptor req/s | p95 ms | vs Raptor p95 | CPU ms/req | PSS MiB |
-| ------ | -------------- | --------------- | ------------ | --------------- | ------ | ------------- | ---------- | ------- |
-| Raptor | Scaling (3–16) | -               | 96.13k ±0.8% | -               | 3.68   | -             | 0.048      | 512.3   |
-| Puma   | Scaling (3–16) | Scaling (3–16)  | 83.26k ±0.0% | 13.4% lower     | 3.94   | 7.3% higher   | 0.055      | 1344.6  |
-| Falcon | Fibers         | Scaling (3–16)  | 98.30k ±0.5% | 2.3% higher     | 3.89   | 5.7% higher   | 0.051      | 471.5   |
+| Server | Mode           | Raptor baseline | req/s         | vs Raptor req/s | p95 ms | vs Raptor p95 | CPU ms/req | PSS MiB |
+| ------ | -------------- | --------------- | ------------- | --------------- | ------ | ------------- | ---------- | ------- |
+| Raptor | Scaling (3–16) | -               | 96.95k ±0.5%  | -               | 3.59   | -             | 0.051      | 554.2   |
+| Puma   | Scaling (3–16) | Scaling (3–16)  | 90.31k ±0.5%  | 6.8% lower      | 3.56   | 0.9% lower    | 0.052      | 1447.0  |
+| Falcon | Fibers         | Scaling (3–16)  | 106.79k ±0.8% | 10.2% higher    | 3.70   | 3.0% higher   | 0.050      | 642.1   |
 ### IO + SSE (native) over HTTP/1.1 keep-alive
-| Server        | Mode           | Raptor baseline | req/s        | vs Raptor req/s | p95 ms | vs Raptor p95 | CPU ms/req | PSS MiB |
-| ------------- | -------------- | --------------- | ------------ | --------------- | ------ | ------------- | ---------- | ------- |
-| Raptor        | Fixed (3)      | -               | 3.01k ±4.9%  | -               | 51.22  | -             | 2.286      | 369.6   |
-| Raptor        | Scaling (3–16) | -               | 7.49k ±0.8%  | -               | 24.39  | -             | 0.488      | 372.7   |
-| Puma          | Fixed (3)      | Fixed (3)       | 0.39k ±13.8% | 87.0% lower     | 314.80 | 514.6% higher | 1.250      | 282.9   |
-| Puma          | Scaling (3–16) | Scaling (3–16)  | 7.51k ±0.4%  | 0.4% higher     | 24.23  | 0.6% lower    | 0.464      | 336.3   |
-| Falcon        | Fibers         | Fixed (3)       | 7.57k ±4.4%  | 151.9% higher   | 24.04  | 53.1% lower   | 0.375      | 355.5   |
-| Falcon        | Fibers         | Scaling (3–16)  | 7.57k ±4.4%  | 1.2% higher     | 24.04  | 1.4% lower    | 0.375      | 355.5   |
-| Raptor (enum) | Fixed (3)      | -               | 0.88k ±0.3%  | -               | 63.76  | -             | 7.972      | 362.6   |
+| Server        | Mode           | Raptor baseline | req/s       | vs Raptor req/s | p95 ms | vs Raptor p95 | CPU ms/req | PSS MiB |
+| ------------- | -------------- | --------------- | ----------- | --------------- | ------ | ------------- | ---------- | ------- |
+| Raptor        | Fixed (3)      | -               | 3.43k ±8.5% | -               | 35.14  | -             | 2.448      | 378.5   |
+| Raptor        | Scaling (3–16) | -               | 7.58k ±1.5% | -               | 23.79  | -             | 0.485      | 373.3   |
+| Puma          | Fixed (3)      | Fixed (3)       | 0.34k ±6.3% | 90.0% lower     | 327.51 | 832.1% higher | 1.744      | 281.0   |
+| Puma          | Scaling (3–16) | Scaling (3–16)  | 7.38k ±1.4% | 2.6% lower      | 24.55  | 3.2% higher   | 0.443      | 339.9   |
+| Falcon        | Fibers         | Fixed (3)       | 7.51k ±4.0% | 118.8% higher   | 24.31  | 30.8% lower   | 0.413      | 371.0   |
+| Falcon        | Fibers         | Scaling (3–16)  | 7.51k ±4.0% | 1.0% lower      | 24.31  | 2.2% higher   | 0.413      | 371.0   |
+| Raptor (enum) | Fixed (3)      | -               | 0.89k ±3.3% | -               | 58.38  | -             | 8.363      | 356.0   |
-Puma, Fixed (3) had 28 timeouts, 1 stalled stream across all samples.
+Puma, Fixed (3) had 34 timeouts, 1 stalled stream across all samples.
-Raptor (enum), Fixed (3) had 29 timeouts across all samples.
+Raptor (enum), Fixed (3) had 24 timeouts across all samples.
-> ruby 4.1.0dev (2026-10-27T15:28:18Z HEAD 33ac6afea7) +YJIT +PRISM [aarch64-linux]
+> ruby 4.1.0dev (2026-11-07T16:07:23Z HEAD e67e4a6960) +YJIT +PRISM [aarch64-linux]
 > 10 workers, 120 HTTP/1.1 client connections, 40 HTTP/2 connections × 3 streams.
 Run [bin/benchmark](bin/benchmark) to reproduce.

data/docs/raptor-vs-puma.md CHANGED Viewed

@@ -16,7 +16,7 @@ This guide compares their architecture and relates it to the [current README ben
 | Protocol processing | App threads and reactor share the worker's GVL | Eager parsing inline, separate protocol Ractors on the pipeline path |
 | Pool coordination | Mutex and condition variables | Lock-free work queue with idle-thread parking |
 | Pool growth | Adds threads when queued work exceeds waiting capacity | Adds threads when queued work and blocking time justify growth |
-| Idle and partial connections | `nio4r` reactor | `nio4r` reactor |
+| Idle and partial connections | `nio4r` reactor | `io-event` reactor |
 | Cluster dispatch | Shared listeners with load-sensitive accept delay | Shared listeners, plus load-aware BPF dispatch on supported Linux TCP bindings |
 | HTTP/2 | Not implemented | Native parsing, HPACK and stream flow control |
 | Worker monitoring | Pipe messages | Shared-memory stats |
@@ -129,7 +129,7 @@ flowchart TB
     subgraph Worker["Raptor worker process, one of N"]
         SRV["Server thread<br/>IO.select + accept_nonblock<br/>polls for pool capacity"]
-        RCT["Reactor thread<br/>NIO::Selector<br/>read_nonblock 64KB<br/>Red-Black-Tree timeouts"]
+        RCT["Reactor thread<br/>io-event selector<br/>read_nonblock 64KB<br/>Red-Black-Tree timeouts"]
         subgraph RP1["HTTP/1.1 RactorPool"]
             RW1["Pipeline Ractor 1<br/>HTTP/1.x parser<br/>chunked decode"]
@@ -211,6 +211,8 @@ Puma's cluster accept delay backs off according to worker load. On supported Lin
 Both reactors keep idle and partial connections off application threads. Puma tracks deadlines in a sorted array. Raptor uses a red-black tree for logarithmic insertion and removal of individual deadlines. Updating a connection's deadline does not require scanning the other connections.
+Raptor uses `io-event` readiness fibers only on its reactor thread. It does not install a Fiber scheduler or change how the application runs.
 ### Responses and streaming
 Ordinary HTTP/1.1 response writing runs on app threads in both servers. Raptor can gather headers and array-body buffers with `writev` and reuse per-thread response buffers. Puma uses its own buffered writes and Linux TCP corking. Both support file bodies and enumerable streaming bodies.

data/docs/talk.md CHANGED Viewed

@@ -640,7 +640,7 @@ with no hard maximum. You don't have to choose one fixed thread count.</big>
 Slow clients, half-sent requests, and idle keep-alive connections aren't ready to be read yet. The reactor watches all of them at once.
-<big>Like Puma, it uses [`nio4r`](https://github.com/socketry/nio4r), backed by `epoll` on Linux
+<big>It uses [`io-event`](https://github.com/socketry/io-event), backed by `epoll` on Linux
 and `kqueue` on macOS.</big>
 <big>The HTTP/1.1 defaults are 30 seconds for the first bytes,

data/lib/raptor/reactor.rb CHANGED Viewed

@@ -9,7 +9,7 @@ require "atomic-ruby/atomic_boolean"
 require "atomic-ruby/atomic_condition_variable"
 require "atomic-ruby/atomic_queue"
 require "atomic-ruby/atomic_thread_pool"
-require "nio"
+require "io/event"
 require "red-black-tree"
 require_relative "detached_body"
@@ -76,7 +76,6 @@ module Raptor
       attr_accessor :wait #: Symbol?
       attr_accessor :reading #: bool
       attr_accessor :closing #: bool
-      attr_accessor :monitor #: NIO::Monitor?
       attr_accessor :timeout #: TimeoutClient?
       attr_reader :output #: Array[String]
@@ -91,7 +90,6 @@ module Raptor
         @wait = nil
         @reading = false
         @closing = false
-        @monitor = nil
         @timeout = nil
       end
@@ -182,7 +180,10 @@ module Raptor
     # @rbs @persistent_data_timeout: Integer
     # @rbs @http2_keepalive_interval: Integer
     # @rbs @http2_keepalive_timeout: Integer
-    # @rbs @selector: NIO::Selector
+    # @rbs @selector: untyped
+    # @rbs @wakeup: Fiber?
+    # @rbs @waiters: Hash[TCPSocket, [Fiber, Integer]]
+    # @rbs @ready: Array[[TCPSocket, Integer]]
     # @rbs @queue: Queue[TCPSocket]
     # @rbs @io_queue: AtomicQueue
     # @rbs @io_applied: AtomicConditionVariable
@@ -231,7 +232,10 @@ module Raptor
       @http2_keepalive_interval = http2_options[:keepalive_interval]
       @http2_keepalive_timeout = http2_options[:keepalive_timeout]
-      @selector = NIO::Selector.new
+      @selector = nil
+      @wakeup = nil
+      @waiters = {}
+      @ready = []
       @queue = Queue.new
       @io_queue = AtomicQueue.new
       @io_applied = AtomicConditionVariable.new
@@ -262,13 +266,19 @@ module Raptor
       Thread.new do
         Thread.current.name = "Reactor"
         @thread = Thread.current
+        selector = IO::Event::Selector.new(Fiber.current)
+        @wakeup = Fiber.new { loop { selector.transfer } }
+        @selector = selector
         until stopped?
           begin
             now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
             timeout = @timeouts.min&.timeout(now)
-            @selector.select(timeout) do |monitor|
-              handle_monitor(monitor)
+            timeout = 0 unless @ready.empty? && @queue.empty? && @io_queue.empty?
+            @selector.select(timeout)
+            until @ready.empty?
+              socket, events = @ready.shift
+              handle_ready(socket, events)
             end
             now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -283,6 +293,8 @@ module Raptor
           end
         end
+        @waiters.keys.each { |socket| deregister(socket) }
+        @ready.clear
         @id_to_flow_control.each_value(&:close)
         @id_to_socket.each_value { |socket| socket.close rescue nil }
         @id_to_socket.clear
@@ -330,7 +342,7 @@ module Raptor
       @socket_to_state[socket] = state
       @queue << socket
-      @selector.wakeup
+      wakeup
     rescue ClosedQueueError
       socket.close
     end
@@ -372,7 +384,7 @@ module Raptor
       @id_to_socket[id] = socket
       @socket_to_state[socket] = state
       @queue << socket
-      @selector.wakeup
+      wakeup
     rescue ClosedQueueError
       socket.close
     end
@@ -422,7 +434,7 @@ module Raptor
     def attach_http1_body(socket, id, body, state, finished)
       attached = AtomicBoolean.new(false)
       @io_queue << [:attach_http1, id, socket, body, attached, finished, state]
-      @selector.wakeup rescue nil
+      wakeup rescue nil
       @io_applied.wait { attached.true? }
       return false if body.closed?
@@ -430,7 +442,7 @@ module Raptor
       true
     rescue
       @io_queue << [:cancel_http1, id]
-      @selector.wakeup rescue nil
+      wakeup rescue nil
       raise
     end
@@ -490,7 +502,7 @@ module Raptor
         flush_output(id, io) if io && !io.wait
       else
         @io_queue << [:write, id, data]
-        @selector.wakeup rescue nil
+        wakeup rescue nil
       end
     end
@@ -506,7 +518,7 @@ module Raptor
     def attach_http2_body(id, stream_id, body, finished)
       attached = AtomicBoolean.new(false)
       @io_queue << [:attach_http2, id, stream_id, body, attached, finished]
-      @selector.wakeup rescue nil
+      wakeup rescue nil
       @io_applied.wait { attached.true? }
       return false if body.closed?
@@ -527,7 +539,7 @@ module Raptor
       return if @detached_count.value.zero?
       @io_queue << [:resume_http2, id]
-      @selector.wakeup rescue nil
+      wakeup rescue nil
     end
     # Cancels a detached response stream.
@@ -541,7 +553,7 @@ module Raptor
       return if @detached_count.value.zero?
       @io_queue << [:cancel_http2, id, stream_id]
-      @selector.wakeup rescue nil
+      wakeup rescue nil
     end
     # Waits for detached responses to finish, then cancels any that outlive
@@ -554,7 +566,7 @@ module Raptor
     def drain_detached_bodies(timeout)
       barrier = AtomicBoolean.new(false)
       @io_queue << [:barrier, nil, barrier]
-      @selector.wakeup rescue nil
+      wakeup rescue nil
       @io_applied.wait { barrier.true? }
       Timeout.timeout(timeout) do
@@ -562,7 +574,7 @@ module Raptor
       end
     rescue Timeout::Error
       @io_queue << [:cancel_all]
-      @selector.wakeup rescue nil
+      wakeup rescue nil
       @detached_drained.wait { @detached_count.value.zero? }
     end
@@ -617,7 +629,7 @@ module Raptor
       return unless socket
       @queue << socket
-      @selector.wakeup
+      wakeup
     rescue ClosedQueueError
       socket.close
     end
@@ -630,7 +642,7 @@ module Raptor
     # @rbs (Integer id) -> void
     def close_connection(id)
       @io_queue << [:close, id]
-      @selector.wakeup rescue nil
+      wakeup rescue nil
     end
     # Closes the registration queue and wakes the selector so the
@@ -641,7 +653,7 @@ module Raptor
     # @rbs () -> void
     def shutdown
       @queue.close
-      @selector.wakeup
+      wakeup
     end
     # Returns the number of complete requests either being processed
@@ -656,6 +668,17 @@ module Raptor
     private
+    # Wakes the event loop, including work queued before it starts waiting.
+    #
+    # @rbs () -> void
+    def wakeup
+      selector = @selector
+      return unless selector
+      selector.push(@wakeup)
+      selector.wakeup
+    end
     # Returns whether shutdown has no registrations or writes left to drain.
     #
     # @return [Boolean]
@@ -760,7 +783,7 @@ module Raptor
       dispatch = proc { |callback| @thread_pool << callback }
       wake = proc do
         @io_queue << [:ready_http1, id]
-        @selector.wakeup rescue nil
+        wakeup rescue nil
       end
       unless body.attach([io.budget, @detached_budget], wake, dispatch, finished)
         socket.close rescue nil
@@ -771,7 +794,7 @@ module Raptor
       @socket_to_state[socket] = { id: id, protocol: :http1, detached: true }
       @id_to_io[id] = io
       @detached_count.swap { |count| count + 1 }
-      update_monitor(id, io)
+      update_interests(id, io)
     end
     # Writes buffered HTTP/1.x body chunks without blocking.
@@ -803,7 +826,7 @@ module Raptor
       if !io.finishing && !io.wait && io.body&.next_size
         @io_queue << [:ready_http1, id]
-        @selector.wakeup rescue nil
+        wakeup rescue nil
       end
     end
@@ -823,7 +846,7 @@ module Raptor
       body.finish(:closed)
       detached_body_removed
       @id_to_io.delete(id)
-      deregister(socket, io)
+      deregister(socket)
       clear_write_timeout(io)
       if io.state[:keep_alive]
@@ -887,7 +910,7 @@ module Raptor
       wake = proc do
         @io_queue << [:ready_http2, id, stream_id]
-        @selector.wakeup rescue nil
+        wakeup rescue nil
       end
       return unless body.attach([io.budget, @detached_budget], wake, dispatch, finished)
@@ -967,7 +990,7 @@ module Raptor
       if !io.wait && io.output.empty? && !io.ready.empty?
         @io_queue << [:flush_http2, id]
-        @selector.wakeup rescue nil
+        wakeup rescue nil
       end
     end
@@ -1133,7 +1156,7 @@ module Raptor
       elsif io.closing
         remove_connection(id)
       else
-        update_monitor(id, io)
+        update_interests(id, io)
       end
     end
@@ -1148,7 +1171,7 @@ module Raptor
     def wait_for_write(id, io, readiness)
       io.wait = readiness
       track_write_timeout(id, io)
-      update_monitor(id, io)
+      update_interests(id, io)
     end
     # Updates selector interest for one reactor-owned connection.
@@ -1158,26 +1181,34 @@ module Raptor
     # @return [void]
     #
     # @rbs (Integer id, ConnectionIO io) -> void
-    def update_monitor(id, io)
+    def update_interests(id, io)
       socket = @id_to_socket[id]
       return unless socket && io
-      read = io.reading || io.wait == :read
-      write = io.wait == :write
-      interests = if read && write
-        :rw
-      elsif read
-        :r
-      elsif write
-        :w
-      end
+      events = 0
+      events |= IO::READABLE if io.reading || io.wait == :read
+      events |= IO::WRITABLE if io.wait == :write
+      wait_for_io(socket, events)
+    end
-      if io.monitor
-        io.monitor.interests = interests
-      elsif interests
-        io.monitor = @selector.register(socket, interests)
-        io.monitor.value = socket
+    # Waits for a connection's next readable or writable event.
+    #
+    # @rbs (TCPSocket socket, Integer events) -> void
+    def wait_for_io(socket, events)
+      waiter = @waiters[socket]
+      return if waiter && waiter[1] == events
+      deregister(socket)
+      return if events.zero?
+      fiber = Fiber.new do
+        readiness = @selector.io_wait(Fiber.current, socket, events)
+        @ready << [socket, readiness] if readiness
+      ensure
+        @waiters.delete(socket)
       end
+      @waiters[socket] = [fiber, events]
+      fiber.transfer
     end
     # Starts or refreshes one connection's non-blocking write deadline.
@@ -1210,19 +1241,15 @@ module Raptor
     # Removes a socket from selector tracking.
     #
     # @param socket [TCPSocket] socket to deregister
-    # @param io [ConnectionIO, nil] connection I/O state
     # @return [void]
     #
-    # @rbs (TCPSocket socket, ConnectionIO? io) -> void
-    def deregister(socket, io)
-      return unless io&.monitor || @selector.registered?(socket)
-      @selector.deregister(socket)
-      io.monitor = nil if io
-    rescue IOError
+    # @rbs (TCPSocket socket) -> void
+    def deregister(socket)
+      waiter = @waiters.delete(socket)
+      waiter[0].transfer if waiter
     end
-    # Registers a socket with the NIO selector and sets up timeout tracking.
+    # Registers a socket for readiness and sets up timeout tracking.
     #
     # @param socket [TCPSocket] the socket to register
     # @return [void]
@@ -1235,9 +1262,9 @@ module Raptor
       if state[:protocol] == :http2
         io = @id_to_io[state[:id]]
         io.reading = true
-        update_monitor(state[:id], io)
+        update_interests(state[:id], io)
       else
-        @selector.register(socket, :r).value = socket
+        wait_for_io(socket, IO::READABLE)
       end
       now = Process.clock_gettime(Process::CLOCK_MONOTONIC)
@@ -1301,17 +1328,17 @@ module Raptor
     # Dispatches readable and writable events without allowing application
     # threads to take ownership of HTTP/2 sockets.
     #
-    # @param monitor [NIO::Monitor] ready selector monitor
+    # @param socket [TCPSocket] ready client socket
+    # @param events [Integer] readiness events
     # @return [void]
     #
-    # @rbs (NIO::Monitor monitor) -> void
-    def handle_monitor(monitor)
-      socket = monitor.value
+    # @rbs (TCPSocket socket, Integer events) -> void
+    def handle_ready(socket, events)
       state = @socket_to_state[socket]
       return unless state
       if state[:detached]
-        handle_http1_detached_monitor(monitor, state[:id])
+        handle_http1_detached_ready(socket, events, state[:id])
         return
       end
@@ -1325,7 +1352,7 @@ module Raptor
       return unless io
       wait = io.wait
-      if (wait == :read && monitor.readable?) || (wait == :write && monitor.writable?)
+      if (wait == :read && events.anybits?(IO::READABLE)) || (wait == :write && events.anybits?(IO::WRITABLE))
         flush_output(id, io)
         return unless @id_to_socket.key?(id)
         return if io.wait == :read
@@ -1333,40 +1360,43 @@ module Raptor
         flush_http2_detached_bodies(id) unless io.detached.empty?
       end
-      return unless io.reading && monitor.readable?
+      return unless io.reading && events.anybits?(IO::READABLE)
       io.reading = false
-      update_monitor(id, io)
+      update_interests(id, io)
       client = @id_to_timeout.delete(id)
       @timeouts.delete!(client) if client
       read_and_queue_for_parse(socket, state)
+    ensure
+      io = @id_to_io[state[:id]] if state
+      update_interests(state[:id], io) if io
     end
     # Handles readiness for an HTTP/1.x detached response.
     #
-    # @param monitor [NIO::Monitor] ready selector monitor
+    # @param socket [TCPSocket] ready client socket
+    # @param events [Integer] readiness events
     # @param id [Integer] unique connection identifier
     # @return [void]
     #
-    # @rbs (NIO::Monitor monitor, Integer id) -> void
-    def handle_http1_detached_monitor(monitor, id)
-      socket = monitor.value
+    # @rbs (TCPSocket socket, Integer events, Integer id) -> void
+    def handle_http1_detached_ready(socket, events, id)
       io = @id_to_io[id]
       return unless io.is_a?(Http1IO)
       wait = io.wait
-      if (wait == :read && monitor.readable?) || (wait == :write && monitor.writable?)
+      if (wait == :read && events.anybits?(IO::READABLE)) || (wait == :write && events.anybits?(IO::WRITABLE))
         flush_output(id, io)
         return unless @id_to_io.key?(id)
         flush_http1_detached_body(id) unless io.wait
       end
-      return unless io.reading && monitor.readable?
+      return unless io.reading && events.anybits?(IO::READABLE)
       io.input << socket.read_nonblock(CHUNK_SIZE)
       io.reading = false
-      update_monitor(id, io)
+      update_interests(id, io)
     rescue IO::WaitReadable
     rescue IO::WaitWritable
       wait_for_write(id, io, :write)
@@ -1382,7 +1412,7 @@ module Raptor
     #
     # @rbs (TCPSocket socket) -> void
     def wakeup!(socket)
-      @selector.deregister(socket)
+      deregister(socket)
       state = @socket_to_state[socket]
       client = @id_to_timeout.delete(state[:id])
       @timeouts.delete!(client) if client
@@ -1433,7 +1463,7 @@ module Raptor
         socket.read_nonblock(CHUNK_SIZE)
       rescue IO::WaitReadable
         @queue << socket
-        @selector.wakeup
+        wakeup
         return
       rescue EOFError, IOError, SystemCallError, OpenSSL::SSL::SSLError
         cleanup(socket)
@@ -1461,7 +1491,7 @@ module Raptor
     def cleanup(socket)
       state = @socket_to_state.delete(socket)
       io = @id_to_io.delete(state[:id])
-      deregister(socket, io)
+      deregister(socket)
       @id_to_socket.delete(state[:id])
       @id_to_writer.delete(state[:id])
       @id_to_flow_control.delete(state[:id])&.close

data/lib/raptor/version.rb CHANGED Viewed

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 module Raptor
-  VERSION = "0.24.0"
+  VERSION = "0.25.0"
 end

data/lib/raptor.rb CHANGED Viewed

@@ -8,7 +8,7 @@ require_relative "raptor/detached_body"
 #
 # Raptor is a high-performance, preloading, multi-process, multi-threaded Ruby 4+ web server
 # implementing Rack 3+, leveraging Ractors for parallel HTTP/1.1 and HTTP/2 request processing,
-# native C extensions for HTTP parsing and HPACK compression, and NIO for non-blocking I/O.
+# native C extensions for HTTP parsing and HPACK compression, and io-event for non-blocking I/O.
 #
 module Raptor
 end

data/sig/generated/raptor/reactor.rbs CHANGED Viewed

@@ -56,8 +56,6 @@ module Raptor
       attr_accessor closing: bool
-      attr_accessor monitor: NIO::Monitor?
       attr_accessor timeout: TimeoutClient?
       attr_reader output: Array[String]
@@ -131,13 +129,17 @@ module Raptor
       def empty?: () -> bool
     end
-    @io_applied: AtomicConditionVariable
     @io_queue: AtomicQueue
     @queue: Queue[TCPSocket]
-    @selector: NIO::Selector
+    @ready: Array[[ TCPSocket, Integer ]]
+    @waiters: Hash[TCPSocket, [ Fiber, Integer ]]
+    @wakeup: Fiber?
+    @selector: untyped
     @http2_keepalive_timeout: Integer
@@ -159,6 +161,8 @@ module Raptor
     @http1: Http1
+    @io_applied: AtomicConditionVariable
     @timeouts: RedBlackTree[TimeoutClient]
     @id_to_socket: Hash[Integer, TCPSocket]
@@ -422,6 +426,11 @@ module Raptor
     private
+    # Wakes the event loop, including work queued before it starts waiting.
+    #
+    # @rbs () -> void
+    def wakeup: () -> void
     # Returns whether shutdown has no registrations or writes left to drain.
     #
     # @return [Boolean]
@@ -603,7 +612,12 @@ module Raptor
     # @return [void]
     #
     # @rbs (Integer id, ConnectionIO io) -> void
-    def update_monitor: (Integer id, ConnectionIO io) -> void
+    def update_interests: (Integer id, ConnectionIO io) -> void
+    # Waits for a connection's next readable or writable event.
+    #
+    # @rbs (TCPSocket socket, Integer events) -> void
+    def wait_for_io: (TCPSocket socket, Integer events) -> void
     # Starts or refreshes one connection's non-blocking write deadline.
     #
@@ -625,13 +639,12 @@ module Raptor
     # Removes a socket from selector tracking.
     #
     # @param socket [TCPSocket] socket to deregister
-    # @param io [ConnectionIO, nil] connection I/O state
     # @return [void]
     #
-    # @rbs (TCPSocket socket, ConnectionIO? io) -> void
-    def deregister: (TCPSocket socket, ConnectionIO? io) -> void
+    # @rbs (TCPSocket socket) -> void
+    def deregister: (TCPSocket socket) -> void
-    # Registers a socket with the NIO selector and sets up timeout tracking.
+    # Registers a socket for readiness and sets up timeout tracking.
     #
     # @param socket [TCPSocket] the socket to register
     # @return [void]
@@ -661,20 +674,22 @@ module Raptor
     # Dispatches readable and writable events without allowing application
     # threads to take ownership of HTTP/2 sockets.
     #
-    # @param monitor [NIO::Monitor] ready selector monitor
+    # @param socket [TCPSocket] ready client socket
+    # @param events [Integer] readiness events
     # @return [void]
     #
-    # @rbs (NIO::Monitor monitor) -> void
-    def handle_monitor: (NIO::Monitor monitor) -> void
+    # @rbs (TCPSocket socket, Integer events) -> void
+    def handle_ready: (TCPSocket socket, Integer events) -> void
     # Handles readiness for an HTTP/1.x detached response.
     #
-    # @param monitor [NIO::Monitor] ready selector monitor
+    # @param socket [TCPSocket] ready client socket
+    # @param events [Integer] readiness events
     # @param id [Integer] unique connection identifier
     # @return [void]
     #
-    # @rbs (NIO::Monitor monitor, Integer id) -> void
-    def handle_http1_detached_monitor: (NIO::Monitor monitor, Integer id) -> void
+    # @rbs (TCPSocket socket, Integer events, Integer id) -> void
+    def handle_http1_detached_ready: (TCPSocket socket, Integer events, Integer id) -> void
     # Deregisters a readable socket and resumes its idle keep-alive
     # connection or queues its bytes for parsing.

data/sig/generated/raptor.rbs CHANGED Viewed

@@ -4,6 +4,6 @@
 #
 # Raptor is a high-performance, preloading, multi-process, multi-threaded Ruby 4+ web server
 # implementing Rack 3+, leveraging Ractors for parallel HTTP/1.1 and HTTP/2 request processing,
-# native C extensions for HTTP parsing and HPACK compression, and NIO for non-blocking I/O.
+# native C extensions for HTTP parsing and HPACK compression, and io-event for non-blocking I/O.
 module Raptor
 end

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: raptor
 version: !ruby/object:Gem::Version
-  version: 0.24.0
+  version: 0.25.0
 platform: ruby
 authors:
 - Joshua Young
@@ -24,7 +24,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.2.0
 - !ruby/object:Gem::Dependency
-  name: nio4r
+  name: io-event
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="