Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
edc0498
chore(quest): claim quest/m1/quic-api/waits.md
kixelated Nov 1, 2026
7d974d1
feat(quic): poll_handshake_data and Connection::error
kixelated Nov 1, 2026
75c34d7
feat(quic): recv::Stream::poll_received_reset
kixelated Nov 1, 2026
19594e6
refactor(quic): the drivers and qmux wait through moq-quic's poll forms
kixelated Nov 1, 2026
3ea2d42
test(quic): count wakes instead of matching events
kixelated Nov 1, 2026
f21a51f
refactor(quic)!: delete StreamEvent and the waiting Event variants
kixelated Nov 1, 2026
3c554aa
feat(quic)!: poll_transmit is the driver's wait
kixelated Nov 1, 2026
2815f6b
refactor(quic): the drivers wait on poll_transmit instead of kicks
kixelated Nov 1, 2026
004bce8
Merge remote-tracking branch 'origin/main' into worktree-agent-a330aa…
kixelated Nov 1, 2026
d8ba73e
quest: finish quest/m1/quic-api/waits.md
kixelated Nov 1, 2026
03ccfb4
bench(tokio): a driver fanout bench swept over streams per connection
kixelated Nov 1, 2026
e1a5ef1
fix(tokio): a driver blocked on the socket still hears a local close
kixelated Nov 1, 2026
472527e
Merge remote-tracking branch 'origin/main' into worktree-agent-a330aa…
kixelated Nov 1, 2026
4d71425
fix(tokio): kio is no longer optional, so the driver feature stops na…
kixelated Nov 1, 2026
a554d53
Merge origin/main into quest/m1/quic-api/waits
kixelated Nov 1, 2026
803ded3
docs(moq-uring, qmux): say why each keeps its local-close latch
kixelated Nov 1, 2026
b423b27
Merge origin/main into quest/m1/quic-api/waits
kixelated Nov 1, 2026
4718586
fix(quic): a local address change wakes the parked driver
kixelated Nov 1, 2026
a7d747e
Merge origin/main into quest/m1/quic-api/waits
kixelated Nov 2, 2026
ddb0c04
fix(qmux): the driver hears a close while its batch is held back
kixelated Nov 2, 2026
c1f9f84
Merge origin/main into quest/m1/quic-api/waits
kixelated Nov 3, 2026
590f1be
Merge base and preserve token test API updates
Nov 3, 2026
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 1 addition & 2 deletions quest/m1/quic-api/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ Decided with the maintainer:
WebTransport into m1 from m2, and deleted 0-RTT entirely: MoQ cannot use
it, since CONNECT and authorization need the finished handshake.
- 2026-10-25: moq-quic owns every wait as a `poll_*` on `&kio::Waiter`
([waits](/quest/m1/quic-api/waits.md)), and moq-net's `transport::poll`
(landed as the waits quest), and moq-net's `transport::poll`
traits join the epic so all
three layers share the `&self, &kio::Waiter` shape.

Expand All @@ -46,7 +46,6 @@ side by side and fix any name or signature that still differs, and check

## Required

- [Waits](/quest/m1/quic-api/waits.md) - moq-quic owns every wait as a `poll_*` on `&kio::Waiter`, deleting `StreamEvent` and the drivers' and qmux's waiter tables
- [Poll forms](/quest/m1/quic-api/poll.md) - both drivers' waits poll as `&self, &kio::Waiter` forwards to moq-quic, the async forms wrap them, and `send::Finished` is a future
- [Native WebTransport](/quest/m1/quic-api/native-web.md) - `quic::web` in both crates implements moq-net's poll traits, deleting the generic `web_transport_trait` adapters and the dependency on it

Expand Down
8 changes: 2 additions & 6 deletions quest/m1/quic-api/poll.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ primary surface. [Native WebTransport](/quest/m1/quic-api/native-web.md) and

Decided 2026-10-25 (maintainer), replacing the 2026-10-23 shape:

- **moq-quic owns the waits** ([waits](/quest/m1/quic-api/waits.md)). Each
- **moq-quic owns the waits** (landed: `connection/waits.rs`). Each
connection and stream form here takes the lock and forwards to moq-quic's
`poll_*` in one line; the driver keeps no waiter table of its own. Only
`Endpoint::poll_accept` waits on driver state, the queue of handshaken
Expand Down Expand Up @@ -69,7 +69,7 @@ async forms unchanged.

Added 2026-11-01 (maintainer, follow-up planning after the 2026-11-01
/quest-afk run), from [moq-dev/moq#7490](https://github.com/moq-dev/moq/pull/7490),
which finishes [waits](/quest/m1/quic-api/waits.md):
which finishes the waits quest:

- **Remove `ShouldTransmit`.** Once moq-quic wakes the transmit waiter itself,
the `ShouldTransmit` that `Chunks::finalize` and the send lease methods
Expand All @@ -86,10 +86,6 @@ which finishes [waits](/quest/m1/quic-api/waits.md):
a test that a close behind it is still bounded, mirroring qmux's
`a_close_behind_a_stalled_peer_is_bounded`.

## Required

- [Waits](/quest/m1/quic-api/waits.md) - moq-quic's `poll_*` forms these forward to

## Related

- [Native WebTransport](/quest/m1/quic-api/native-web.md) - its native QUIC `poll::Session` calls these
Expand Down
100 changes: 0 additions & 100 deletions quest/m1/quic-api/waits.md

This file was deleted.

5 changes: 2 additions & 3 deletions quest/m2/perf/quic-lock-contention.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,8 @@ Levers, only where the profile shows a cost:
with [the I/O boundary redesign](/quest/m2/quic-io-boundary.md), whose
"one `handle` call takes a whole GRO batch" is the state-machine half.
- Stream handles that carry a slab key instead of a `StreamId`, removing
moq-quic's per-stream lookups (the driver's own maps go with
[waits](/quest/m1/quic-api/waits.md)). FxHash is cheap, so this is last
moq-quic's per-stream lookups (the driver's own maps are already gone,
now that moq-quic owns its waits). FxHash is cheap, so this is last
and only on evidence.

The maintainer wants the connection state free of runtime borrow checks
Expand All @@ -65,7 +65,6 @@ staging queue and batch dispatch should need none.
## Required

- [Native WebTransport](/quest/m1/quic-api/native-web.md) - removes the adapter's per-operation boxing, which would otherwise dominate the profile
- [Waits](/quest/m1/quic-api/waits.md) - moves the waiter tables under the lock this profiles

## Related

Expand Down
5 changes: 2 additions & 3 deletions quest/m2/quic-ack-hook.md
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,8 @@ The same pair goes on `send::Finished`, the handle `finish(self)` returns
([moq-dev/moq#6950](https://github.com/moq-dev/moq/pull/6950)), and the methods take its opaque `send::Offset`, which only
`offset()` mints, instead of a `u64`. The `send::Error` says why the bytes will
never be acknowledged: a reset, the peer's STOP_SENDING, or the connection's
loss. Both drivers forward to `moq-quic`'s own `poll_acked` wait, which
[waits](/quest/m1/quic-api/waits.md) makes of today's `acked(offset)` and
`StreamEvent::Acked`. Four traps, each settled in moq-quic where the wait
loss. Both drivers forward to `moq-quic`'s own `send::Stream::poll_acked`
wait, which replaced `StreamEvent::Acked`. Four traps, each settled in moq-quic where the wait
lives:

- A finished stream whose every byte was acknowledged must not look like a
Expand Down
3 changes: 1 addition & 2 deletions quest/m2/quic-sansio-driver.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ whose C, C++, and Kotlin bindings drive it from their own loops
Decided with the maintainer on 2026-10-28, from
[moq-dev/rust2#215](https://github.com/moq-dev/rust2/pull/215):

- **After [waits](/quest/m1/quic-api/waits.md) and [poll](/quest/m1/quic-api/poll.md).**
- **After the waits (landed) and [poll](/quest/m1/quic-api/poll.md).**
Once moq-quic owns its waits, a driver is I/O, timers, and a lock. This one is the
timers and the lock, with the caller doing the I/O. Built earlier, it would carry the
waiter tables that waits deletes.
Expand Down Expand Up @@ -49,5 +49,4 @@ impl.

## Required

- [Waits](/quest/m1/quic-api/waits.md) - moq-quic owns every wait, so the driver keeps no waiter table
- [Poll forms](/quest/m1/quic-api/poll.md) - the drivers' poll shape this one mirrors
28 changes: 27 additions & 1 deletion rs/moq-quic/MIGRATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,32 @@ How to update your code for each breaking change, newest first.

## Unreleased

### Waits replace stream and connection events

Every wait is a `poll_*` taking the caller's `&kio::Waiter`, which moq-quic registers and wakes itself, so a driver keeps no waiter tables.
`StreamEvent` is gone, and so are the `Event` variants a handle waited on; `Event` keeps only `PathUpdated`, and `mux::Event` and `mux::Connection::poll` are gone.

| Before | After |
| --- | --- |
| `Event::HandshakeDataReady` | `Connection::poll_handshake_data` |
| `Event::Connected` | `Connection::poll_connected` |
| `Event::HandshakeConfirmed` | `Connection::poll_handshake_confirmed` |
| `Event::ConnectionLost { reason }` | `Connection::poll_closed`, or `Connection::error` |
| `Event::DatagramReceived` | `Datagrams::poll_recv` |
| `StreamEvent::Opened { dir }` | `Streams::poll_accept` |
| `StreamEvent::Available { dir }` | `Streams::poll_open` |
| `StreamEvent::Readable { id }` | `recv::Chunks::poll_next`, `recv::Stream::poll_lease`, or `recv::Stream::poll_received_reset` |
| `StreamEvent::Writable { id }` | `send::Stream::poll_write` |
| `StreamEvent::Finished { id }`, `StreamEvent::Stopped { id, .. }` | `send::Stream::poll_end` |
| `StreamEvent::Acked { id, .. }` | `send::Stream::poll_acked` |
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

`poll_transmit` is the driver's wait, so a handle no longer kicks its driver after a call.
`Connection::poll_transmit(now, max_datagrams, buf) -> Option<Transmit>` becomes `poll_transmit(waiter, now, max_datagrams, buf) -> Poll<Transmit>`, and `mux::Connection::poll_transmit(now) -> Option<Bytes>` becomes `poll_transmit(waiter, now) -> Poll<Bytes>`.
With nothing to send it registers `waiter`, which the next call that queues something wakes; keep waiting on `poll_timeout` for pacing and loss recovery.

A wake only schedules: moq-quic wakes under whatever lock guards the connection, so the woken task polls again under it.
Stream waits fail with `send::Error::ConnectionLost` or `recv::Error::ConnectionLost` once the connection is lost, after accepted streams, readable bytes, and received datagrams drain.

### Crypto is sealed to rustls ([#7028](https://github.com/moq-dev/moq/pull/7028))

Build configs with `client::Config::new(Arc::new(rustls_client))` and `server::Config::new(Arc::new(rustls_server))`; both are infallible.
Expand All @@ -24,7 +50,7 @@ Treat it as a failed read and stop the stream: a reader that watches for a reset

### Early data is removed

Wait for `Event::Connected` before opening streams or sending application data.
Wait for `Connection::poll_connected` before opening streams or sending application data.
`Connection::has_0rtt`, `accepted_0rtt`, and the `crypto::Session::early_crypto` and `early_data_accepted` hooks are gone.
Custom crypto sessions no longer implement those hooks.
Rustls configs disable early data, including caller-supplied configs, while session tickets still resume 1-RTT handshakes.
Expand Down
Loading
Loading