fix(uring): review fixups for eclipse-zenoh/zenoh#2332#31
Merged
Conversation
- Remove debug sleep(100ms) from z_ping warmup and measurement loops - Revert unrelated liveliness test weakening: restore order-specific assert_eq! checks, remove HashSet indirection, #[ignore] attrs, debug println!s, and commented-out code - Delete orphaned linux/memory/ directory (never compiled, duplicate of reader/ left over from the split-into-files refactor)
- Degrade gracefully when io_uring reactor init fails (Option<Uring> in TransportManagerState, warn + fallback to tokio instead of error) - Enforce lease timeout on the uring RX task via TimeoutTracker; reset on each received fragment, bail on expiry (was TODO/unimplemented) - Restrict get_fd() to Connected UDP only; unconnected sockets are shared across peers and cannot be demuxed by io_uring RecvMulti - Fix BatchHeader::new() called without transport_compression feature; use tuple constructor BatchHeader(h) which is always available
Strip the unused thread-priority/realtime scheduling block, commented //ring.submit(), //let len, alternate enter() calls, and the no-op //bail! match arms from api/reader/mod.rs. Remove the commented log! macro from window.rs. Remove commented writer field and constructor from uring.rs. Fix "Urng" typo in reactor thread log message.
The io_uring TX writer is not wired into the transport layer in this PR. Remove linux/writer/ and linux/api/writer/ rather than shipping unused public API. Remove thread-priority from Cargo.toml; its only consumer was the commented-out realtime scheduling block already deleted.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Review fixups for eclipse-zenoh#2332 ("Support io_uring"), applied on top of the contributor's branch.
Key Changes
sleep(100ms)calls fromz_pingwarmup and measurement loops that corrupted the latency benchmark#[ignore]annotations andHashSet-based assertion relaxations) that were out of scope for an io_uring feature PRlinux/memory/directory (near-duplicate oflinux/reader/, never compiled)TransportManagerState::uringis nowOption<Uring>; amlock/io_uringfailure logs a warning and falls back to the tokio RX path instead of failing manager constructionTimeoutTracker; previously the uring path had aTODOand a dead peer would never be detectedget_fd()toConnectedUDP only; unconnected sockets are shared across peers and cannot be demultiplexed byRecvMultiBatchHeader::new(h)used withouttransport_compressionfeature; replaced with the tuple constructorBatchHeader(h)which is always available//ring.submit(), alternateenter()calls, commented writer field/ctor,log!macro inwindow.rs; fix "Urng" typolinux/writer/andlinux/api/writer/modules (~200 LoC); the TX writer is not wired into the transport in this PR and should be a follow-upthread-prioritydependency fromzenoh-uring/Cargo.tomlBreaking Changes
None